From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini                                                   |    3 
 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs                                        | 10729 ++++++++++++++++++++++++-----------------------
 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs                                    |    5 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs                      |    4 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs                  |   11 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlHttpLogic.cs                            |   89 
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll                                                       |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs                        |  184 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj                                                  |   12 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs                           |    2 
 ZigbeeApp/Shared/Common/CommonPage.cs                                                         |    7 
 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs                            |   34 
 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs                                           |   11 
 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs                                             |  103 
 ZigbeeApp/GateWay.Droid/Application.cs                                                        |   24 
 ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll                                       |    0 
 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs                                           |   11 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs   |    4 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs                    |    4 
 ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs                                    |    6 
 ZigbeeApp/Shared/Phone/UserView/UserPage.cs                                                   |    5 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs                        |   13 
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml                                        |    2 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs                        |   12 
 ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs                                                |   28 
 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs                                         |   32 
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll                                                   |    0 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs                            |  241 +
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs                        |   38 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ReplaceIconSelected.png                             |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs                     |  108 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs                         |  185 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs                              |    4 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs                       |   12 
 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs                                           |  190 
 ZigbeeApp/Home.Ios/Resources/Language.ini                                                     |    3 
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs                          |    9 
 ZigbeeApp/Shared/R.cs                                                                         |   12 
 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs                              |   16 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs   |    4 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs               |    7 
 ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll                                                 |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs                                        |   18 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs                            |    2 
 ZigbeeApp/GateWay.Droid/packages.config                                                       |    1 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs                                 |    4 
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml                                                       |   31 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs                                |   14 
 ZigbeeApp/Shared/Common/Device.cs                                                             |  186 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs                         |    6 
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs                                           |   97 
 ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs                                            |    8 
 ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml                                                 |   42 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs                   |   82 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs                   |   15 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs                         |   12 
 ZigbeeApp/Shared/Shared.projitems                                                             |    3 
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs                    |    1 
 /dev/null                                                                                     |    0 
 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs                                        |    4 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs                    |   19 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGpsLocationConvertLogic.cs              |  693 +++
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs                      |   12 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs                       |    4 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs |   14 
 65 files changed, 7,462 insertions(+), 5,970 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 7858c42..163796e 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -20,7 +20,6 @@
 
 namespace com.hdl.home
 {
-
     [Activity(Name = "com.hdl.home.wxapi.WXEntryActivity", Exported = true, Theme = "@android:style/Theme.Translucent", LaunchMode = Android.Content.PM.LaunchMode.SingleTask)]
     class WXEntryActivity : Android.App.Activity, IWXAPIEventHandler
     {
@@ -83,6 +82,12 @@
     public class Application : Android.App.Application
     {
         public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
+
+        /// <summary>
+        /// 妫�娴嬪唴瀛樻硠闇茬殑涓滆タ
+        /// </summary>
+        ///private Square.LeakCanary.RefWatcher _refWatcher;
+
         public override void OnCreate()
         {
             //濡傛灉涓嶆槸App鐨勪富杩涚▼,鍒欎笉闇�瑕佸鐞�
@@ -101,9 +106,16 @@
                 //璋冭瘯:璁板綍绯荤粺寮傚父
                 Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.SystemLogFile, ex.Message + "\r\n" + ex.StackTrace, true, false);
             }
-            base.OnCreate();
-            // 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚�
-            //api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", true);
+            base.OnCreate();
+            // 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚�
+            //api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", true);
+
+            //妫�娴嬪唴瀛樻硠闇茬殑涓滆タ
+            //if (Square.LeakCanary.LeakCanaryXamarin.IsInAnalyzerProcess(this) == false)
+            //{
+            //    _refWatcher = Square.LeakCanary.LeakCanaryXamarin.Install(this);
+            //    _refWatcher.Watch(this);
+            //}
 
             // 灏嗗簲鐢ㄧ殑appId娉ㄥ唽鍒板井淇�
             api?.RegisterApp("wx2ec8f53f6fa36e82");
@@ -136,12 +148,14 @@
             var req = new SendAuth.Req { Scope = "snsapi_userinfo", State = "ZigbeeApp" };
             api?.SendReq(req);
         }
+
         /// <summary>
 		/// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜�
 		/// </summary>
 		void initAll()
         {
-            Shared.Application.IsGpsEnable = System.IO.File.Exists(Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
+            //鍙栨秷灞忓箷甯镐寒
+            BaseActivity.KeepScreenON = false;
             //闅愯棌搴曢儴杞寜閿�
             BaseActivity.IsHideVirualButtons = true;
 
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index cd650b2..5f85200 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -2040,6 +2040,9 @@
 16165=杩囨埛澶辫触
 16166=鎭枩{0}鎴愪负銆寋1}銆嶇鐞嗗憳
 16167=妫�娴嬪埌杩樻病鏈夊浠�,璇峰厛澶囦唤
+16168=鏇挎崲
+16169=鏇挎崲缃戝叧
+16170=璇烽�夋嫨琚浛鎹㈢殑缃戝叧
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ReplaceIconSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ReplaceIconSelected.png
new file mode 100644
index 0000000..f6e8f36
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ReplaceIconSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index eda3112..d2bb5d6 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -72,6 +72,15 @@
     <Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
     </Reference>
+    <Reference Include="LeakCanary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.dll</HintPath>
+    </Reference>
+    <Reference Include="LeakCanary.Analyzer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Analyzer.dll</HintPath>
+    </Reference>
+    <Reference Include="LeakCanary.Watcher, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Watcher.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
     </Reference>
@@ -2532,6 +2541,9 @@
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\SmartSound\Sibici.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\Item\ReplaceIconSelected.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 0d6359c..928d15c 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.evoyo.home" android:versionCode="0120101001" android:installLocation="auto" android:versionName="1.1.0120101001">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120111601" android:installLocation="auto" android:versionName="1.1.0120111601">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
 	<permission android:name="com.evoyo.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 64b15fe..58ec111 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//     杩愯鏃剁増鏈�:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
+//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -34,233 +34,233 @@
 		public partial class Animation
 		{
 			
-			// aapt resource value: 0x7F010000
-			public const int abc_fade_in = 2130771968;
+			// aapt resource value: 0x7f050000
+			public const int abc_fade_in = 2131034112;
 			
-			// aapt resource value: 0x7F010001
-			public const int abc_fade_out = 2130771969;
+			// aapt resource value: 0x7f050001
+			public const int abc_fade_out = 2131034113;
 			
-			// aapt resource value: 0x7F010002
-			public const int abc_grow_fade_in_from_bottom = 2130771970;
+			// aapt resource value: 0x7f050002
+			public const int abc_grow_fade_in_from_bottom = 2131034114;
 			
-			// aapt resource value: 0x7F010003
-			public const int abc_popup_enter = 2130771971;
+			// aapt resource value: 0x7f050003
+			public const int abc_popup_enter = 2131034115;
 			
-			// aapt resource value: 0x7F010004
-			public const int abc_popup_exit = 2130771972;
+			// aapt resource value: 0x7f050004
+			public const int abc_popup_exit = 2131034116;
 			
-			// aapt resource value: 0x7F010005
-			public const int abc_shrink_fade_out_from_bottom = 2130771973;
+			// aapt resource value: 0x7f050005
+			public const int abc_shrink_fade_out_from_bottom = 2131034117;
 			
-			// aapt resource value: 0x7F010006
-			public const int abc_slide_in_bottom = 2130771974;
+			// aapt resource value: 0x7f050006
+			public const int abc_slide_in_bottom = 2131034118;
 			
-			// aapt resource value: 0x7F010007
-			public const int abc_slide_in_top = 2130771975;
+			// aapt resource value: 0x7f050007
+			public const int abc_slide_in_top = 2131034119;
 			
-			// aapt resource value: 0x7F010008
-			public const int abc_slide_out_bottom = 2130771976;
+			// aapt resource value: 0x7f050008
+			public const int abc_slide_out_bottom = 2131034120;
 			
-			// aapt resource value: 0x7F010009
-			public const int abc_slide_out_top = 2130771977;
+			// aapt resource value: 0x7f050009
+			public const int abc_slide_out_top = 2131034121;
 			
-			// aapt resource value: 0x7F01000A
-			public const int design_bottom_sheet_slide_in = 2130771978;
+			// aapt resource value: 0x7f05000a
+			public const int design_bottom_sheet_slide_in = 2131034122;
 			
-			// aapt resource value: 0x7F01000B
-			public const int design_bottom_sheet_slide_out = 2130771979;
+			// aapt resource value: 0x7f05000b
+			public const int design_bottom_sheet_slide_out = 2131034123;
 			
-			// aapt resource value: 0x7F01000C
-			public const int design_snackbar_in = 2130771980;
+			// aapt resource value: 0x7f05000c
+			public const int design_snackbar_in = 2131034124;
 			
-			// aapt resource value: 0x7F01000D
-			public const int design_snackbar_out = 2130771981;
+			// aapt resource value: 0x7f05000d
+			public const int design_snackbar_out = 2131034125;
 			
-			// aapt resource value: 0x7F01000E
-			public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
+			// aapt resource value: 0x7f05000e
+			public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
 			
-			// aapt resource value: 0x7F01000F
-			public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
+			// aapt resource value: 0x7f05000f
+			public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
 			
-			// aapt resource value: 0x7F010010
-			public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
+			// aapt resource value: 0x7f050010
+			public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
 			
-			// aapt resource value: 0x7F010011
-			public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
+			// aapt resource value: 0x7f050011
+			public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
 			
-			// aapt resource value: 0x7F010012
-			public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
+			// aapt resource value: 0x7f050012
+			public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
 			
-			// aapt resource value: 0x7F010013
-			public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
+			// aapt resource value: 0x7f050013
+			public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
 			
-			// aapt resource value: 0x7F010014
-			public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
+			// aapt resource value: 0x7f050014
+			public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
 			
-			// aapt resource value: 0x7F010015
-			public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
+			// aapt resource value: 0x7f050015
+			public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
 			
-			// aapt resource value: 0x7F010016
-			public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
+			// aapt resource value: 0x7f050016
+			public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
 			
-			// aapt resource value: 0x7F010017
-			public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
+			// aapt resource value: 0x7f050017
+			public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
 			
-			// aapt resource value: 0x7F010018
-			public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
+			// aapt resource value: 0x7f050018
+			public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
 			
-			// aapt resource value: 0x7F010019
-			public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
+			// aapt resource value: 0x7f050019
+			public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
 			
-			// aapt resource value: 0x7F01001A
-			public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
+			// aapt resource value: 0x7f05001a
+			public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
 			
-			// aapt resource value: 0x7F01001B
-			public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
+			// aapt resource value: 0x7f05001b
+			public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
 			
-			// aapt resource value: 0x7F01001C
-			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
+			// aapt resource value: 0x7f05001c
+			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
 			
-			// aapt resource value: 0x7F01001D
-			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
+			// aapt resource value: 0x7f05001d
+			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
 			
-			// aapt resource value: 0x7F01001E
-			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
+			// aapt resource value: 0x7f05001e
+			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
 			
-			// aapt resource value: 0x7F01001F
-			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
+			// aapt resource value: 0x7f05001f
+			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
 			
-			// aapt resource value: 0x7F010020
-			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
+			// aapt resource value: 0x7f050020
+			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
 			
-			// aapt resource value: 0x7F010021
-			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
+			// aapt resource value: 0x7f050021
+			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
 			
-			// aapt resource value: 0x7F010022
-			public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
+			// aapt resource value: 0x7f050022
+			public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
 			
-			// aapt resource value: 0x7F010023
-			public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
+			// aapt resource value: 0x7f050023
+			public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
 			
-			// aapt resource value: 0x7F010024
-			public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
+			// aapt resource value: 0x7f050024
+			public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
 			
-			// aapt resource value: 0x7F010025
-			public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
+			// aapt resource value: 0x7f050025
+			public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
 			
-			// aapt resource value: 0x7F010026
-			public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
+			// aapt resource value: 0x7f050026
+			public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
 			
-			// aapt resource value: 0x7F010027
-			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
+			// aapt resource value: 0x7f050027
+			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
 			
-			// aapt resource value: 0x7F010028
-			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
+			// aapt resource value: 0x7f050028
+			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
 			
-			// aapt resource value: 0x7F010029
-			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
+			// aapt resource value: 0x7f050029
+			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
 			
-			// aapt resource value: 0x7F01002A
-			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
+			// aapt resource value: 0x7f05002a
+			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
 			
-			// aapt resource value: 0x7F01002B
-			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
+			// aapt resource value: 0x7f05002b
+			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
 			
-			// aapt resource value: 0x7F01002C
-			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
+			// aapt resource value: 0x7f05002c
+			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
 			
-			// aapt resource value: 0x7F01002D
-			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
+			// aapt resource value: 0x7f05002d
+			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
 			
-			// aapt resource value: 0x7F01002E
-			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
+			// aapt resource value: 0x7f05002e
+			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
 			
-			// aapt resource value: 0x7F01002F
-			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
+			// aapt resource value: 0x7f05002f
+			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
 			
-			// aapt resource value: 0x7F010030
-			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
+			// aapt resource value: 0x7f050030
+			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
 			
-			// aapt resource value: 0x7F010031
-			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
+			// aapt resource value: 0x7f050031
+			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
 			
-			// aapt resource value: 0x7F010032
-			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
+			// aapt resource value: 0x7f050032
+			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
 			
-			// aapt resource value: 0x7F010033
-			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
+			// aapt resource value: 0x7f050033
+			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
 			
-			// aapt resource value: 0x7F010034
-			public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
+			// aapt resource value: 0x7f050034
+			public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
 			
-			// aapt resource value: 0x7F010035
-			public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
+			// aapt resource value: 0x7f050035
+			public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
 			
-			// aapt resource value: 0x7F010036
-			public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
+			// aapt resource value: 0x7f050036
+			public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
 			
-			// aapt resource value: 0x7F010037
-			public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
+			// aapt resource value: 0x7f050037
+			public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
 			
-			// aapt resource value: 0x7F010038
-			public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
+			// aapt resource value: 0x7f050038
+			public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
 			
-			// aapt resource value: 0x7F010039
-			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
+			// aapt resource value: 0x7f050039
+			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
 			
-			// aapt resource value: 0x7F01003A
-			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
+			// aapt resource value: 0x7f05003a
+			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
 			
-			// aapt resource value: 0x7F01003B
-			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
+			// aapt resource value: 0x7f05003b
+			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
 			
-			// aapt resource value: 0x7F01003C
-			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
+			// aapt resource value: 0x7f05003c
+			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
 			
-			// aapt resource value: 0x7F01003D
-			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
+			// aapt resource value: 0x7f05003d
+			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
 			
-			// aapt resource value: 0x7F01003E
-			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
+			// aapt resource value: 0x7f05003e
+			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
 			
-			// aapt resource value: 0x7F01003F
-			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
+			// aapt resource value: 0x7f05003f
+			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
 			
-			// aapt resource value: 0x7F010040
-			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
+			// aapt resource value: 0x7f050040
+			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
 			
-			// aapt resource value: 0x7F010041
-			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
+			// aapt resource value: 0x7f050041
+			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
 			
-			// aapt resource value: 0x7F010042
-			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
+			// aapt resource value: 0x7f050042
+			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
 			
-			// aapt resource value: 0x7F010043
-			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
+			// aapt resource value: 0x7f050043
+			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
 			
-			// aapt resource value: 0x7F010044
-			public const int move_in = 2130772036;
+			// aapt resource value: 0x7f050044
+			public const int move_in = 2131034180;
 			
-			// aapt resource value: 0x7F010045
-			public const int move_out = 2130772037;
+			// aapt resource value: 0x7f050045
+			public const int move_out = 2131034181;
 			
-			// aapt resource value: 0x7F010046
-			public const int pickerview_dialog_scale_in = 2130772038;
+			// aapt resource value: 0x7f050046
+			public const int pickerview_dialog_scale_in = 2131034182;
 			
-			// aapt resource value: 0x7F010047
-			public const int pickerview_dialog_scale_out = 2130772039;
+			// aapt resource value: 0x7f050047
+			public const int pickerview_dialog_scale_out = 2131034183;
 			
-			// aapt resource value: 0x7F010048
-			public const int pickerview_slide_in_bottom = 2130772040;
+			// aapt resource value: 0x7f050048
+			public const int pickerview_slide_in_bottom = 2131034184;
 			
-			// aapt resource value: 0x7F010049
-			public const int pickerview_slide_out_bottom = 2130772041;
+			// aapt resource value: 0x7f050049
+			public const int pickerview_slide_out_bottom = 2131034185;
 			
-			// aapt resource value: 0x7F01004A
-			public const int tooltip_enter = 2130772042;
+			// aapt resource value: 0x7f05004a
+			public const int tooltip_enter = 2131034186;
 			
-			// aapt resource value: 0x7F01004B
-			public const int tooltip_exit = 2130772043;
+			// aapt resource value: 0x7f05004b
+			public const int tooltip_exit = 2131034187;
 			
 			static Animation()
 			{
@@ -275,8 +275,8 @@
 		public partial class Animator
 		{
 			
-			// aapt resource value: 0x7F020000
-			public const int design_appbar_state_list_animator = 2130837504;
+			// aapt resource value: 0x7f060000
+			public const int design_appbar_state_list_animator = 2131099648;
 			
 			static Animator()
 			{
@@ -291,8 +291,8 @@
 		public partial class Array
 		{
 			
-			// aapt resource value: 0x7F030000
-			public const int arc_colors_default = 2130903040;
+			// aapt resource value: 0x7f0f0000
+			public const int arc_colors_default = 2131689472;
 			
 			static Array()
 			{
@@ -307,1355 +307,1355 @@
 		public partial class Attribute
 		{
 			
-			// aapt resource value: 0x7F040000
-			public const int actionBarDivider = 2130968576;
+			// aapt resource value: 0x7f010052
+			public const int actionBarDivider = 2130772050;
 			
-			// aapt resource value: 0x7F040001
-			public const int actionBarItemBackground = 2130968577;
+			// aapt resource value: 0x7f010053
+			public const int actionBarItemBackground = 2130772051;
 			
-			// aapt resource value: 0x7F040002
-			public const int actionBarPopupTheme = 2130968578;
+			// aapt resource value: 0x7f01004c
+			public const int actionBarPopupTheme = 2130772044;
 			
-			// aapt resource value: 0x7F040003
-			public const int actionBarSize = 2130968579;
+			// aapt resource value: 0x7f010051
+			public const int actionBarSize = 2130772049;
 			
-			// aapt resource value: 0x7F040004
-			public const int actionBarSplitStyle = 2130968580;
+			// aapt resource value: 0x7f01004e
+			public const int actionBarSplitStyle = 2130772046;
 			
-			// aapt resource value: 0x7F040005
-			public const int actionBarStyle = 2130968581;
+			// aapt resource value: 0x7f01004d
+			public const int actionBarStyle = 2130772045;
 			
-			// aapt resource value: 0x7F040006
-			public const int actionBarTabBarStyle = 2130968582;
+			// aapt resource value: 0x7f010048
+			public const int actionBarTabBarStyle = 2130772040;
 			
-			// aapt resource value: 0x7F040007
-			public const int actionBarTabStyle = 2130968583;
+			// aapt resource value: 0x7f010047
+			public const int actionBarTabStyle = 2130772039;
 			
-			// aapt resource value: 0x7F040008
-			public const int actionBarTabTextStyle = 2130968584;
+			// aapt resource value: 0x7f010049
+			public const int actionBarTabTextStyle = 2130772041;
 			
-			// aapt resource value: 0x7F040009
-			public const int actionBarTheme = 2130968585;
+			// aapt resource value: 0x7f01004f
+			public const int actionBarTheme = 2130772047;
 			
-			// aapt resource value: 0x7F04000A
-			public const int actionBarWidgetTheme = 2130968586;
+			// aapt resource value: 0x7f010050
+			public const int actionBarWidgetTheme = 2130772048;
 			
-			// aapt resource value: 0x7F04000B
-			public const int actionButtonStyle = 2130968587;
+			// aapt resource value: 0x7f01006d
+			public const int actionButtonStyle = 2130772077;
 			
-			// aapt resource value: 0x7F04000C
-			public const int actionDropDownStyle = 2130968588;
+			// aapt resource value: 0x7f010069
+			public const int actionDropDownStyle = 2130772073;
 			
-			// aapt resource value: 0x7F04000D
-			public const int actionLayout = 2130968589;
+			// aapt resource value: 0x7f0100c4
+			public const int actionLayout = 2130772164;
 			
-			// aapt resource value: 0x7F04000E
-			public const int actionMenuTextAppearance = 2130968590;
+			// aapt resource value: 0x7f010054
+			public const int actionMenuTextAppearance = 2130772052;
 			
-			// aapt resource value: 0x7F04000F
-			public const int actionMenuTextColor = 2130968591;
+			// aapt resource value: 0x7f010055
+			public const int actionMenuTextColor = 2130772053;
 			
-			// aapt resource value: 0x7F040010
-			public const int actionModeBackground = 2130968592;
+			// aapt resource value: 0x7f010058
+			public const int actionModeBackground = 2130772056;
 			
-			// aapt resource value: 0x7F040011
-			public const int actionModeCloseButtonStyle = 2130968593;
+			// aapt resource value: 0x7f010057
+			public const int actionModeCloseButtonStyle = 2130772055;
 			
-			// aapt resource value: 0x7F040012
-			public const int actionModeCloseDrawable = 2130968594;
+			// aapt resource value: 0x7f01005a
+			public const int actionModeCloseDrawable = 2130772058;
 			
-			// aapt resource value: 0x7F040013
-			public const int actionModeCopyDrawable = 2130968595;
+			// aapt resource value: 0x7f01005c
+			public const int actionModeCopyDrawable = 2130772060;
 			
-			// aapt resource value: 0x7F040014
-			public const int actionModeCutDrawable = 2130968596;
+			// aapt resource value: 0x7f01005b
+			public const int actionModeCutDrawable = 2130772059;
 			
-			// aapt resource value: 0x7F040015
-			public const int actionModeFindDrawable = 2130968597;
+			// aapt resource value: 0x7f010060
+			public const int actionModeFindDrawable = 2130772064;
 			
-			// aapt resource value: 0x7F040016
-			public const int actionModePasteDrawable = 2130968598;
+			// aapt resource value: 0x7f01005d
+			public const int actionModePasteDrawable = 2130772061;
 			
-			// aapt resource value: 0x7F040017
-			public const int actionModePopupWindowStyle = 2130968599;
+			// aapt resource value: 0x7f010062
+			public const int actionModePopupWindowStyle = 2130772066;
 			
-			// aapt resource value: 0x7F040018
-			public const int actionModeSelectAllDrawable = 2130968600;
+			// aapt resource value: 0x7f01005e
+			public const int actionModeSelectAllDrawable = 2130772062;
 			
-			// aapt resource value: 0x7F040019
-			public const int actionModeShareDrawable = 2130968601;
+			// aapt resource value: 0x7f01005f
+			public const int actionModeShareDrawable = 2130772063;
 			
-			// aapt resource value: 0x7F04001A
-			public const int actionModeSplitBackground = 2130968602;
+			// aapt resource value: 0x7f010059
+			public const int actionModeSplitBackground = 2130772057;
 			
-			// aapt resource value: 0x7F04001B
-			public const int actionModeStyle = 2130968603;
+			// aapt resource value: 0x7f010056
+			public const int actionModeStyle = 2130772054;
 			
-			// aapt resource value: 0x7F04001C
-			public const int actionModeWebSearchDrawable = 2130968604;
+			// aapt resource value: 0x7f010061
+			public const int actionModeWebSearchDrawable = 2130772065;
 			
-			// aapt resource value: 0x7F04001D
-			public const int actionOverflowButtonStyle = 2130968605;
+			// aapt resource value: 0x7f01004a
+			public const int actionOverflowButtonStyle = 2130772042;
 			
-			// aapt resource value: 0x7F04001E
-			public const int actionOverflowMenuStyle = 2130968606;
+			// aapt resource value: 0x7f01004b
+			public const int actionOverflowMenuStyle = 2130772043;
 			
-			// aapt resource value: 0x7F04001F
-			public const int actionProviderClass = 2130968607;
+			// aapt resource value: 0x7f0100c6
+			public const int actionProviderClass = 2130772166;
 			
-			// aapt resource value: 0x7F040020
-			public const int actionViewClass = 2130968608;
+			// aapt resource value: 0x7f0100c5
+			public const int actionViewClass = 2130772165;
 			
-			// aapt resource value: 0x7F040021
-			public const int activityChooserViewStyle = 2130968609;
+			// aapt resource value: 0x7f010075
+			public const int activityChooserViewStyle = 2130772085;
 			
-			// aapt resource value: 0x7F040022
-			public const int alertDialogButtonGroupStyle = 2130968610;
+			// aapt resource value: 0x7f01009a
+			public const int alertDialogButtonGroupStyle = 2130772122;
 			
-			// aapt resource value: 0x7F040023
-			public const int alertDialogCenterButtons = 2130968611;
+			// aapt resource value: 0x7f01009b
+			public const int alertDialogCenterButtons = 2130772123;
 			
-			// aapt resource value: 0x7F040024
-			public const int alertDialogStyle = 2130968612;
+			// aapt resource value: 0x7f010099
+			public const int alertDialogStyle = 2130772121;
 			
-			// aapt resource value: 0x7F040025
-			public const int alertDialogTheme = 2130968613;
+			// aapt resource value: 0x7f01009c
+			public const int alertDialogTheme = 2130772124;
 			
-			// aapt resource value: 0x7F040026
-			public const int allowStacking = 2130968614;
+			// aapt resource value: 0x7f0100b2
+			public const int allowStacking = 2130772146;
 			
-			// aapt resource value: 0x7F040027
-			public const int alpha = 2130968615;
+			// aapt resource value: 0x7f0100b3
+			public const int alpha = 2130772147;
 			
-			// aapt resource value: 0x7F040028
-			public const int alphabeticModifiers = 2130968616;
+			// aapt resource value: 0x7f0100c1
+			public const int alphabeticModifiers = 2130772161;
 			
-			// aapt resource value: 0x7F040029
-			public const int arc_border_color = 2130968617;
+			// aapt resource value: 0x7f0101a3
+			public const int arc_border_color = 2130772387;
 			
-			// aapt resource value: 0x7F04002A
-			public const int arc_border_width = 2130968618;
+			// aapt resource value: 0x7f0101a2
+			public const int arc_border_width = 2130772386;
 			
-			// aapt resource value: 0x7F04002B
-			public const int arc_colors = 2130968619;
+			// aapt resource value: 0x7f0101a1
+			public const int arc_colors = 2130772385;
 			
-			// aapt resource value: 0x7F04002C
-			public const int arc_max = 2130968620;
+			// aapt resource value: 0x7f0101a4
+			public const int arc_max = 2130772388;
 			
-			// aapt resource value: 0x7F04002D
-			public const int arc_min = 2130968621;
+			// aapt resource value: 0x7f0101a5
+			public const int arc_min = 2130772389;
 			
-			// aapt resource value: 0x7F04002E
-			public const int arc_open_angle = 2130968622;
+			// aapt resource value: 0x7f01019f
+			public const int arc_open_angle = 2130772383;
 			
-			// aapt resource value: 0x7F04002F
-			public const int arc_progress = 2130968623;
+			// aapt resource value: 0x7f0101a6
+			public const int arc_progress = 2130772390;
 			
-			// aapt resource value: 0x7F040030
-			public const int arc_progress_bar_color = 2130968624;
+			// aapt resource value: 0x7f0101ae
+			public const int arc_progress_bar_color = 2130772398;
 			
-			// aapt resource value: 0x7F040031
-			public const int arc_progress_bar_text_unit = 2130968625;
+			// aapt resource value: 0x7f0101af
+			public const int arc_progress_bar_text_unit = 2130772399;
 			
-			// aapt resource value: 0x7F040032
-			public const int arc_rotate_angle = 2130968626;
+			// aapt resource value: 0x7f0101a0
+			public const int arc_rotate_angle = 2130772384;
 			
-			// aapt resource value: 0x7F040033
-			public const int arc_shadow_radius = 2130968627;
+			// aapt resource value: 0x7f0101ad
+			public const int arc_shadow_radius = 2130772397;
 			
-			// aapt resource value: 0x7F040034
-			public const int arc_thumb_color = 2130968628;
+			// aapt resource value: 0x7f0101a8
+			public const int arc_thumb_color = 2130772392;
 			
-			// aapt resource value: 0x7F040035
-			public const int arc_thumb_radius = 2130968629;
+			// aapt resource value: 0x7f0101a9
+			public const int arc_thumb_radius = 2130772393;
 			
-			// aapt resource value: 0x7F040036
-			public const int arc_thumb_shadow_color = 2130968630;
+			// aapt resource value: 0x7f0101ab
+			public const int arc_thumb_shadow_color = 2130772395;
 			
-			// aapt resource value: 0x7F040037
-			public const int arc_thumb_shadow_radius = 2130968631;
+			// aapt resource value: 0x7f0101aa
+			public const int arc_thumb_shadow_radius = 2130772394;
 			
-			// aapt resource value: 0x7F040038
-			public const int arc_thumb_width = 2130968632;
+			// aapt resource value: 0x7f0101a7
+			public const int arc_thumb_width = 2130772391;
 			
-			// aapt resource value: 0x7F040039
-			public const int arc_width = 2130968633;
+			// aapt resource value: 0x7f01019e
+			public const int arc_width = 2130772382;
 			
-			// aapt resource value: 0x7F04003A
-			public const int arrowHeadLength = 2130968634;
+			// aapt resource value: 0x7f0100ba
+			public const int arrowHeadLength = 2130772154;
 			
-			// aapt resource value: 0x7F04003B
-			public const int arrowShaftLength = 2130968635;
+			// aapt resource value: 0x7f0100bb
+			public const int arrowShaftLength = 2130772155;
 			
-			// aapt resource value: 0x7F04003C
-			public const int autoCompleteTextViewStyle = 2130968636;
+			// aapt resource value: 0x7f0100a1
+			public const int autoCompleteTextViewStyle = 2130772129;
 			
-			// aapt resource value: 0x7F04003D
-			public const int autoSizeMaxTextSize = 2130968637;
+			// aapt resource value: 0x7f01003b
+			public const int autoSizeMaxTextSize = 2130772027;
 			
-			// aapt resource value: 0x7F04003E
-			public const int autoSizeMinTextSize = 2130968638;
+			// aapt resource value: 0x7f01003a
+			public const int autoSizeMinTextSize = 2130772026;
 			
-			// aapt resource value: 0x7F04003F
-			public const int autoSizePresetSizes = 2130968639;
+			// aapt resource value: 0x7f010039
+			public const int autoSizePresetSizes = 2130772025;
 			
-			// aapt resource value: 0x7F040040
-			public const int autoSizeStepGranularity = 2130968640;
+			// aapt resource value: 0x7f010038
+			public const int autoSizeStepGranularity = 2130772024;
 			
-			// aapt resource value: 0x7F040041
-			public const int autoSizeTextType = 2130968641;
+			// aapt resource value: 0x7f010037
+			public const int autoSizeTextType = 2130772023;
 			
-			// aapt resource value: 0x7F040042
-			public const int background = 2130968642;
+			// aapt resource value: 0x7f010015
+			public const int background = 2130771989;
 			
-			// aapt resource value: 0x7F040043
-			public const int backgroundSplit = 2130968643;
+			// aapt resource value: 0x7f010017
+			public const int backgroundSplit = 2130771991;
 			
-			// aapt resource value: 0x7F040044
-			public const int backgroundStacked = 2130968644;
+			// aapt resource value: 0x7f010016
+			public const int backgroundStacked = 2130771990;
 			
-			// aapt resource value: 0x7F040045
-			public const int backgroundTint = 2130968645;
+			// aapt resource value: 0x7f0100fd
+			public const int backgroundTint = 2130772221;
 			
-			// aapt resource value: 0x7F040046
-			public const int backgroundTintMode = 2130968646;
+			// aapt resource value: 0x7f0100fe
+			public const int backgroundTintMode = 2130772222;
 			
-			// aapt resource value: 0x7F040047
-			public const int barLength = 2130968647;
+			// aapt resource value: 0x7f0100bc
+			public const int barLength = 2130772156;
 			
-			// aapt resource value: 0x7F040048
-			public const int behavior_autoHide = 2130968648;
+			// aapt resource value: 0x7f010128
+			public const int behavior_autoHide = 2130772264;
 			
-			// aapt resource value: 0x7F040049
-			public const int behavior_hideable = 2130968649;
+			// aapt resource value: 0x7f010105
+			public const int behavior_hideable = 2130772229;
 			
-			// aapt resource value: 0x7F04004A
-			public const int behavior_overlapTop = 2130968650;
+			// aapt resource value: 0x7f010131
+			public const int behavior_overlapTop = 2130772273;
 			
-			// aapt resource value: 0x7F04004B
-			public const int behavior_peekHeight = 2130968651;
+			// aapt resource value: 0x7f010104
+			public const int behavior_peekHeight = 2130772228;
 			
-			// aapt resource value: 0x7F04004C
-			public const int behavior_skipCollapsed = 2130968652;
+			// aapt resource value: 0x7f010106
+			public const int behavior_skipCollapsed = 2130772230;
 			
-			// aapt resource value: 0x7F04004D
-			public const int biometricPromptDialogTheme = 2130968653;
+			// aapt resource value: 0x7f01015a
+			public const int biometricPromptDialogTheme = 2130772314;
 			
-			// aapt resource value: 0x7F04004F
-			public const int borderlessButtonStyle = 2130968655;
+			// aapt resource value: 0x7f010126
+			public const int borderWidth = 2130772262;
 			
-			// aapt resource value: 0x7F04004E
-			public const int borderWidth = 2130968654;
+			// aapt resource value: 0x7f010072
+			public const int borderlessButtonStyle = 2130772082;
 			
-			// aapt resource value: 0x7F040050
-			public const int bottomSheetDialogTheme = 2130968656;
+			// aapt resource value: 0x7f010120
+			public const int bottomSheetDialogTheme = 2130772256;
 			
-			// aapt resource value: 0x7F040051
-			public const int bottomSheetStyle = 2130968657;
+			// aapt resource value: 0x7f010121
+			public const int bottomSheetStyle = 2130772257;
 			
-			// aapt resource value: 0x7F040052
-			public const int buttonBarButtonStyle = 2130968658;
+			// aapt resource value: 0x7f01006f
+			public const int buttonBarButtonStyle = 2130772079;
 			
-			// aapt resource value: 0x7F040053
-			public const int buttonBarNegativeButtonStyle = 2130968659;
+			// aapt resource value: 0x7f01009f
+			public const int buttonBarNegativeButtonStyle = 2130772127;
 			
-			// aapt resource value: 0x7F040054
-			public const int buttonBarNeutralButtonStyle = 2130968660;
+			// aapt resource value: 0x7f0100a0
+			public const int buttonBarNeutralButtonStyle = 2130772128;
 			
-			// aapt resource value: 0x7F040055
-			public const int buttonBarPositiveButtonStyle = 2130968661;
+			// aapt resource value: 0x7f01009e
+			public const int buttonBarPositiveButtonStyle = 2130772126;
 			
-			// aapt resource value: 0x7F040056
-			public const int buttonBarStyle = 2130968662;
+			// aapt resource value: 0x7f01006e
+			public const int buttonBarStyle = 2130772078;
 			
-			// aapt resource value: 0x7F040057
-			public const int buttonGravity = 2130968663;
+			// aapt resource value: 0x7f0100f2
+			public const int buttonGravity = 2130772210;
 			
-			// aapt resource value: 0x7F040058
-			public const int buttonPanelSideLayout = 2130968664;
+			// aapt resource value: 0x7f01002a
+			public const int buttonPanelSideLayout = 2130772010;
 			
-			// aapt resource value: 0x7F040059
-			public const int buttonStyle = 2130968665;
+			// aapt resource value: 0x7f0100a2
+			public const int buttonStyle = 2130772130;
 			
-			// aapt resource value: 0x7F04005A
-			public const int buttonStyleSmall = 2130968666;
+			// aapt resource value: 0x7f0100a3
+			public const int buttonStyleSmall = 2130772131;
 			
-			// aapt resource value: 0x7F04005B
-			public const int buttonTint = 2130968667;
+			// aapt resource value: 0x7f0100b4
+			public const int buttonTint = 2130772148;
 			
-			// aapt resource value: 0x7F04005C
-			public const int buttonTintMode = 2130968668;
+			// aapt resource value: 0x7f0100b5
+			public const int buttonTintMode = 2130772149;
 			
-			// aapt resource value: 0x7F04005D
-			public const int checkboxStyle = 2130968669;
+			// aapt resource value: 0x7f0100a4
+			public const int checkboxStyle = 2130772132;
 			
-			// aapt resource value: 0x7F04005E
-			public const int checkedTextViewStyle = 2130968670;
+			// aapt resource value: 0x7f0100a5
+			public const int checkedTextViewStyle = 2130772133;
 			
-			// aapt resource value: 0x7F04005F
-			public const int closeIcon = 2130968671;
+			// aapt resource value: 0x7f0100d5
+			public const int closeIcon = 2130772181;
 			
-			// aapt resource value: 0x7F040060
-			public const int closeItemLayout = 2130968672;
+			// aapt resource value: 0x7f010027
+			public const int closeItemLayout = 2130772007;
 			
-			// aapt resource value: 0x7F040061
-			public const int collapseContentDescription = 2130968673;
+			// aapt resource value: 0x7f0100f4
+			public const int collapseContentDescription = 2130772212;
 			
-			// aapt resource value: 0x7F040063
-			public const int collapsedTitleGravity = 2130968675;
+			// aapt resource value: 0x7f0100f3
+			public const int collapseIcon = 2130772211;
 			
-			// aapt resource value: 0x7F040064
-			public const int collapsedTitleTextAppearance = 2130968676;
+			// aapt resource value: 0x7f010113
+			public const int collapsedTitleGravity = 2130772243;
 			
-			// aapt resource value: 0x7F040062
-			public const int collapseIcon = 2130968674;
+			// aapt resource value: 0x7f01010d
+			public const int collapsedTitleTextAppearance = 2130772237;
 			
-			// aapt resource value: 0x7F040065
-			public const int color = 2130968677;
+			// aapt resource value: 0x7f0100b6
+			public const int color = 2130772150;
 			
-			// aapt resource value: 0x7F040066
-			public const int colorAccent = 2130968678;
+			// aapt resource value: 0x7f010091
+			public const int colorAccent = 2130772113;
 			
-			// aapt resource value: 0x7F040067
-			public const int colorBackgroundFloating = 2130968679;
+			// aapt resource value: 0x7f010098
+			public const int colorBackgroundFloating = 2130772120;
 			
-			// aapt resource value: 0x7F040068
-			public const int colorButtonNormal = 2130968680;
+			// aapt resource value: 0x7f010095
+			public const int colorButtonNormal = 2130772117;
 			
-			// aapt resource value: 0x7F040069
-			public const int colorControlActivated = 2130968681;
+			// aapt resource value: 0x7f010093
+			public const int colorControlActivated = 2130772115;
 			
-			// aapt resource value: 0x7F04006A
-			public const int colorControlHighlight = 2130968682;
+			// aapt resource value: 0x7f010094
+			public const int colorControlHighlight = 2130772116;
 			
-			// aapt resource value: 0x7F04006B
-			public const int colorControlNormal = 2130968683;
+			// aapt resource value: 0x7f010092
+			public const int colorControlNormal = 2130772114;
 			
-			// aapt resource value: 0x7F04006C
-			public const int colorError = 2130968684;
+			// aapt resource value: 0x7f0100b1
+			public const int colorError = 2130772145;
 			
-			// aapt resource value: 0x7F04006D
-			public const int colorPrimary = 2130968685;
+			// aapt resource value: 0x7f01008f
+			public const int colorPrimary = 2130772111;
 			
-			// aapt resource value: 0x7F04006E
-			public const int colorPrimaryDark = 2130968686;
+			// aapt resource value: 0x7f010090
+			public const int colorPrimaryDark = 2130772112;
 			
-			// aapt resource value: 0x7F04006F
-			public const int colorSwitchThumbNormal = 2130968687;
+			// aapt resource value: 0x7f010096
+			public const int colorSwitchThumbNormal = 2130772118;
 			
-			// aapt resource value: 0x7F040070
-			public const int commitIcon = 2130968688;
+			// aapt resource value: 0x7f0100da
+			public const int commitIcon = 2130772186;
 			
-			// aapt resource value: 0x7F040071
-			public const int contentDescription = 2130968689;
+			// aapt resource value: 0x7f0100c7
+			public const int contentDescription = 2130772167;
 			
-			// aapt resource value: 0x7F040072
-			public const int contentInsetEnd = 2130968690;
+			// aapt resource value: 0x7f010020
+			public const int contentInsetEnd = 2130772000;
 			
-			// aapt resource value: 0x7F040073
-			public const int contentInsetEndWithActions = 2130968691;
+			// aapt resource value: 0x7f010024
+			public const int contentInsetEndWithActions = 2130772004;
 			
-			// aapt resource value: 0x7F040074
-			public const int contentInsetLeft = 2130968692;
+			// aapt resource value: 0x7f010021
+			public const int contentInsetLeft = 2130772001;
 			
-			// aapt resource value: 0x7F040075
-			public const int contentInsetRight = 2130968693;
+			// aapt resource value: 0x7f010022
+			public const int contentInsetRight = 2130772002;
 			
-			// aapt resource value: 0x7F040076
-			public const int contentInsetStart = 2130968694;
+			// aapt resource value: 0x7f01001f
+			public const int contentInsetStart = 2130771999;
 			
-			// aapt resource value: 0x7F040077
-			public const int contentInsetStartWithNavigation = 2130968695;
+			// aapt resource value: 0x7f010023
+			public const int contentInsetStartWithNavigation = 2130772003;
 			
-			// aapt resource value: 0x7F040078
-			public const int contentScrim = 2130968696;
+			// aapt resource value: 0x7f01010e
+			public const int contentScrim = 2130772238;
 			
-			// aapt resource value: 0x7F040079
-			public const int controlBackground = 2130968697;
+			// aapt resource value: 0x7f010097
+			public const int controlBackground = 2130772119;
 			
-			// aapt resource value: 0x7F04007A
-			public const int counterEnabled = 2130968698;
+			// aapt resource value: 0x7f010147
+			public const int counterEnabled = 2130772295;
 			
-			// aapt resource value: 0x7F04007B
-			public const int counterMaxLength = 2130968699;
+			// aapt resource value: 0x7f010148
+			public const int counterMaxLength = 2130772296;
 			
-			// aapt resource value: 0x7F04007C
-			public const int counterOverflowTextAppearance = 2130968700;
+			// aapt resource value: 0x7f01014a
+			public const int counterOverflowTextAppearance = 2130772298;
 			
-			// aapt resource value: 0x7F04007D
-			public const int counterTextAppearance = 2130968701;
+			// aapt resource value: 0x7f010149
+			public const int counterTextAppearance = 2130772297;
 			
-			// aapt resource value: 0x7F04007E
-			public const int curtain_bar_bg_color = 2130968702;
+			// aapt resource value: 0x7f0101b2
+			public const int curtain_bar_bg_color = 2130772402;
 			
-			// aapt resource value: 0x7F04007F
-			public const int curtain_bar_border_color = 2130968703;
+			// aapt resource value: 0x7f0101b3
+			public const int curtain_bar_border_color = 2130772403;
 			
-			// aapt resource value: 0x7F040080
-			public const int curtain_bar_color = 2130968704;
+			// aapt resource value: 0x7f0101b0
+			public const int curtain_bar_color = 2130772400;
 			
-			// aapt resource value: 0x7F040081
-			public const int curtain_bar_height = 2130968705;
+			// aapt resource value: 0x7f0101b5
+			public const int curtain_bar_height = 2130772405;
 			
-			// aapt resource value: 0x7F040082
-			public const int curtain_bar_width = 2130968706;
+			// aapt resource value: 0x7f0101b4
+			public const int curtain_bar_width = 2130772404;
 			
-			// aapt resource value: 0x7F040083
-			public const int customNavigationLayout = 2130968707;
+			// aapt resource value: 0x7f010018
+			public const int customNavigationLayout = 2130771992;
 			
-			// aapt resource value: 0x7F040084
-			public const int defaultQueryHint = 2130968708;
+			// aapt resource value: 0x7f0100d4
+			public const int defaultQueryHint = 2130772180;
 			
-			// aapt resource value: 0x7F040085
-			public const int dialogPreferredPadding = 2130968709;
+			// aapt resource value: 0x7f010067
+			public const int dialogPreferredPadding = 2130772071;
 			
-			// aapt resource value: 0x7F040086
-			public const int dialogTheme = 2130968710;
+			// aapt resource value: 0x7f010066
+			public const int dialogTheme = 2130772070;
 			
-			// aapt resource value: 0x7F040087
-			public const int displayOptions = 2130968711;
+			// aapt resource value: 0x7f01000e
+			public const int displayOptions = 2130771982;
 			
-			// aapt resource value: 0x7F040088
-			public const int divider = 2130968712;
+			// aapt resource value: 0x7f010014
+			public const int divider = 2130771988;
 			
-			// aapt resource value: 0x7F040089
-			public const int dividerHorizontal = 2130968713;
+			// aapt resource value: 0x7f010074
+			public const int dividerHorizontal = 2130772084;
 			
-			// aapt resource value: 0x7F04008A
-			public const int dividerPadding = 2130968714;
+			// aapt resource value: 0x7f0100c0
+			public const int dividerPadding = 2130772160;
 			
-			// aapt resource value: 0x7F04008B
-			public const int dividerVertical = 2130968715;
+			// aapt resource value: 0x7f010073
+			public const int dividerVertical = 2130772083;
 			
-			// aapt resource value: 0x7F04008C
-			public const int drawableSize = 2130968716;
+			// aapt resource value: 0x7f0100b8
+			public const int drawableSize = 2130772152;
 			
-			// aapt resource value: 0x7F04008D
-			public const int drawerArrowStyle = 2130968717;
+			// aapt resource value: 0x7f010009
+			public const int drawerArrowStyle = 2130771977;
 			
-			// aapt resource value: 0x7F04008F
-			public const int dropdownListPreferredItemHeight = 2130968719;
+			// aapt resource value: 0x7f010086
+			public const int dropDownListViewStyle = 2130772102;
 			
-			// aapt resource value: 0x7F04008E
-			public const int dropDownListViewStyle = 2130968718;
+			// aapt resource value: 0x7f01006a
+			public const int dropdownListPreferredItemHeight = 2130772074;
 			
-			// aapt resource value: 0x7F040090
-			public const int editTextBackground = 2130968720;
+			// aapt resource value: 0x7f01007b
+			public const int editTextBackground = 2130772091;
 			
-			// aapt resource value: 0x7F040091
-			public const int editTextColor = 2130968721;
+			// aapt resource value: 0x7f01007a
+			public const int editTextColor = 2130772090;
 			
-			// aapt resource value: 0x7F040092
-			public const int editTextStyle = 2130968722;
+			// aapt resource value: 0x7f0100a6
+			public const int editTextStyle = 2130772134;
 			
-			// aapt resource value: 0x7F040093
-			public const int elevation = 2130968723;
+			// aapt resource value: 0x7f010025
+			public const int elevation = 2130772005;
 			
-			// aapt resource value: 0x7F040094
-			public const int errorEnabled = 2130968724;
+			// aapt resource value: 0x7f010145
+			public const int errorEnabled = 2130772293;
 			
-			// aapt resource value: 0x7F040095
-			public const int errorTextAppearance = 2130968725;
+			// aapt resource value: 0x7f010146
+			public const int errorTextAppearance = 2130772294;
 			
-			// aapt resource value: 0x7F040096
-			public const int expandActivityOverflowButtonDrawable = 2130968726;
+			// aapt resource value: 0x7f010029
+			public const int expandActivityOverflowButtonDrawable = 2130772009;
 			
-			// aapt resource value: 0x7F040097
-			public const int expanded = 2130968727;
+			// aapt resource value: 0x7f0100ff
+			public const int expanded = 2130772223;
 			
-			// aapt resource value: 0x7F040098
-			public const int expandedTitleGravity = 2130968728;
+			// aapt resource value: 0x7f010114
+			public const int expandedTitleGravity = 2130772244;
 			
-			// aapt resource value: 0x7F040099
-			public const int expandedTitleMargin = 2130968729;
+			// aapt resource value: 0x7f010107
+			public const int expandedTitleMargin = 2130772231;
 			
-			// aapt resource value: 0x7F04009A
-			public const int expandedTitleMarginBottom = 2130968730;
+			// aapt resource value: 0x7f01010b
+			public const int expandedTitleMarginBottom = 2130772235;
 			
-			// aapt resource value: 0x7F04009B
-			public const int expandedTitleMarginEnd = 2130968731;
+			// aapt resource value: 0x7f01010a
+			public const int expandedTitleMarginEnd = 2130772234;
 			
-			// aapt resource value: 0x7F04009C
-			public const int expandedTitleMarginStart = 2130968732;
+			// aapt resource value: 0x7f010108
+			public const int expandedTitleMarginStart = 2130772232;
 			
-			// aapt resource value: 0x7F04009D
-			public const int expandedTitleMarginTop = 2130968733;
+			// aapt resource value: 0x7f010109
+			public const int expandedTitleMarginTop = 2130772233;
 			
-			// aapt resource value: 0x7F04009E
-			public const int expandedTitleTextAppearance = 2130968734;
+			// aapt resource value: 0x7f01010c
+			public const int expandedTitleTextAppearance = 2130772236;
 			
-			// aapt resource value: 0x7F04009F
-			public const int fabSize = 2130968735;
+			// aapt resource value: 0x7f010124
+			public const int fabSize = 2130772260;
 			
-			// aapt resource value: 0x7F0400A0
-			public const int fastScrollEnabled = 2130968736;
+			// aapt resource value: 0x7f010004
+			public const int fastScrollEnabled = 2130771972;
 			
-			// aapt resource value: 0x7F0400A1
-			public const int fastScrollHorizontalThumbDrawable = 2130968737;
+			// aapt resource value: 0x7f010007
+			public const int fastScrollHorizontalThumbDrawable = 2130771975;
 			
-			// aapt resource value: 0x7F0400A2
-			public const int fastScrollHorizontalTrackDrawable = 2130968738;
+			// aapt resource value: 0x7f010008
+			public const int fastScrollHorizontalTrackDrawable = 2130771976;
 			
-			// aapt resource value: 0x7F0400A3
-			public const int fastScrollVerticalThumbDrawable = 2130968739;
+			// aapt resource value: 0x7f010005
+			public const int fastScrollVerticalThumbDrawable = 2130771973;
 			
-			// aapt resource value: 0x7F0400A4
-			public const int fastScrollVerticalTrackDrawable = 2130968740;
+			// aapt resource value: 0x7f010006
+			public const int fastScrollVerticalTrackDrawable = 2130771974;
 			
-			// aapt resource value: 0x7F0400A5
-			public const int font = 2130968741;
+			// aapt resource value: 0x7f010158
+			public const int font = 2130772312;
 			
-			// aapt resource value: 0x7F0400A6
-			public const int fontFamily = 2130968742;
+			// aapt resource value: 0x7f01003c
+			public const int fontFamily = 2130772028;
 			
-			// aapt resource value: 0x7F0400A7
-			public const int fontProviderAuthority = 2130968743;
+			// aapt resource value: 0x7f010151
+			public const int fontProviderAuthority = 2130772305;
 			
-			// aapt resource value: 0x7F0400A8
-			public const int fontProviderCerts = 2130968744;
+			// aapt resource value: 0x7f010154
+			public const int fontProviderCerts = 2130772308;
 			
-			// aapt resource value: 0x7F0400A9
-			public const int fontProviderFetchStrategy = 2130968745;
+			// aapt resource value: 0x7f010155
+			public const int fontProviderFetchStrategy = 2130772309;
 			
-			// aapt resource value: 0x7F0400AA
-			public const int fontProviderFetchTimeout = 2130968746;
+			// aapt resource value: 0x7f010156
+			public const int fontProviderFetchTimeout = 2130772310;
 			
-			// aapt resource value: 0x7F0400AB
-			public const int fontProviderPackage = 2130968747;
+			// aapt resource value: 0x7f010152
+			public const int fontProviderPackage = 2130772306;
 			
-			// aapt resource value: 0x7F0400AC
-			public const int fontProviderQuery = 2130968748;
+			// aapt resource value: 0x7f010153
+			public const int fontProviderQuery = 2130772307;
 			
-			// aapt resource value: 0x7F0400AD
-			public const int fontStyle = 2130968749;
+			// aapt resource value: 0x7f010157
+			public const int fontStyle = 2130772311;
 			
-			// aapt resource value: 0x7F0400AE
-			public const int fontWeight = 2130968750;
+			// aapt resource value: 0x7f010159
+			public const int fontWeight = 2130772313;
 			
-			// aapt resource value: 0x7F0400AF
-			public const int foregroundInsidePadding = 2130968751;
+			// aapt resource value: 0x7f010129
+			public const int foregroundInsidePadding = 2130772265;
 			
-			// aapt resource value: 0x7F0400B0
-			public const int gapBetweenBars = 2130968752;
+			// aapt resource value: 0x7f0100b9
+			public const int gapBetweenBars = 2130772153;
 			
-			// aapt resource value: 0x7F0400B1
-			public const int goIcon = 2130968753;
+			// aapt resource value: 0x7f0100d6
+			public const int goIcon = 2130772182;
 			
-			// aapt resource value: 0x7F0400B2
-			public const int hdl_arc_thumb_mode = 2130968754;
+			// aapt resource value: 0x7f0101ac
+			public const int hdl_arc_thumb_mode = 2130772396;
 			
-			// aapt resource value: 0x7F0400B3
-			public const int headerLayout = 2130968755;
+			// aapt resource value: 0x7f01012f
+			public const int headerLayout = 2130772271;
 			
-			// aapt resource value: 0x7F0400B4
-			public const int height = 2130968756;
+			// aapt resource value: 0x7f01000a
+			public const int height = 2130771978;
 			
-			// aapt resource value: 0x7F0400B5
-			public const int hideOnContentScroll = 2130968757;
+			// aapt resource value: 0x7f01001e
+			public const int hideOnContentScroll = 2130771998;
 			
-			// aapt resource value: 0x7F0400B6
-			public const int hintAnimationEnabled = 2130968758;
+			// aapt resource value: 0x7f01014b
+			public const int hintAnimationEnabled = 2130772299;
 			
-			// aapt resource value: 0x7F0400B7
-			public const int hintEnabled = 2130968759;
+			// aapt resource value: 0x7f010144
+			public const int hintEnabled = 2130772292;
 			
-			// aapt resource value: 0x7F0400B8
-			public const int hintTextAppearance = 2130968760;
+			// aapt resource value: 0x7f010143
+			public const int hintTextAppearance = 2130772291;
 			
-			// aapt resource value: 0x7F0400B9
-			public const int homeAsUpIndicator = 2130968761;
+			// aapt resource value: 0x7f01006c
+			public const int homeAsUpIndicator = 2130772076;
 			
-			// aapt resource value: 0x7F0400BA
-			public const int homeLayout = 2130968762;
+			// aapt resource value: 0x7f010019
+			public const int homeLayout = 2130771993;
 			
-			// aapt resource value: 0x7F0400BB
-			public const int icon = 2130968763;
+			// aapt resource value: 0x7f010012
+			public const int icon = 2130771986;
 			
-			// aapt resource value: 0x7F0400BE
-			public const int iconifiedByDefault = 2130968766;
+			// aapt resource value: 0x7f0100c9
+			public const int iconTint = 2130772169;
 			
-			// aapt resource value: 0x7F0400BC
-			public const int iconTint = 2130968764;
+			// aapt resource value: 0x7f0100ca
+			public const int iconTintMode = 2130772170;
 			
-			// aapt resource value: 0x7F0400BD
-			public const int iconTintMode = 2130968765;
+			// aapt resource value: 0x7f0100d2
+			public const int iconifiedByDefault = 2130772178;
 			
-			// aapt resource value: 0x7F0400BF
-			public const int imageButtonStyle = 2130968767;
+			// aapt resource value: 0x7f01007c
+			public const int imageButtonStyle = 2130772092;
 			
-			// aapt resource value: 0x7F0400C0
-			public const int indeterminateProgressStyle = 2130968768;
+			// aapt resource value: 0x7f01001b
+			public const int indeterminateProgressStyle = 2130771995;
 			
-			// aapt resource value: 0x7F0400C1
-			public const int initialActivityCount = 2130968769;
+			// aapt resource value: 0x7f010028
+			public const int initialActivityCount = 2130772008;
 			
-			// aapt resource value: 0x7F0400C2
-			public const int insetForeground = 2130968770;
+			// aapt resource value: 0x7f010130
+			public const int insetForeground = 2130772272;
 			
-			// aapt resource value: 0x7F0400C3
-			public const int isLightTheme = 2130968771;
+			// aapt resource value: 0x7f01000b
+			public const int isLightTheme = 2130771979;
 			
-			// aapt resource value: 0x7F0400C4
-			public const int itemBackground = 2130968772;
+			// aapt resource value: 0x7f01012d
+			public const int itemBackground = 2130772269;
 			
-			// aapt resource value: 0x7F0400C5
-			public const int itemIconTint = 2130968773;
+			// aapt resource value: 0x7f01012b
+			public const int itemIconTint = 2130772267;
 			
-			// aapt resource value: 0x7F0400C6
-			public const int itemPadding = 2130968774;
+			// aapt resource value: 0x7f01001d
+			public const int itemPadding = 2130771997;
 			
-			// aapt resource value: 0x7F0400C7
-			public const int itemTextAppearance = 2130968775;
+			// aapt resource value: 0x7f01012e
+			public const int itemTextAppearance = 2130772270;
 			
-			// aapt resource value: 0x7F0400C8
-			public const int itemTextColor = 2130968776;
+			// aapt resource value: 0x7f01012c
+			public const int itemTextColor = 2130772268;
 			
-			// aapt resource value: 0x7F0400C9
-			public const int keylines = 2130968777;
+			// aapt resource value: 0x7f010118
+			public const int keylines = 2130772248;
 			
-			// aapt resource value: 0x7F0400CA
-			public const int layout = 2130968778;
+			// aapt resource value: 0x7f0100d1
+			public const int layout = 2130772177;
 			
-			// aapt resource value: 0x7F0400CB
-			public const int layoutManager = 2130968779;
+			// aapt resource value: 0x7f010000
+			public const int layoutManager = 2130771968;
 			
-			// aapt resource value: 0x7F0400CC
-			public const int layout_anchor = 2130968780;
+			// aapt resource value: 0x7f01011b
+			public const int layout_anchor = 2130772251;
 			
-			// aapt resource value: 0x7F0400CD
-			public const int layout_anchorGravity = 2130968781;
+			// aapt resource value: 0x7f01011d
+			public const int layout_anchorGravity = 2130772253;
 			
-			// aapt resource value: 0x7F0400CE
-			public const int layout_behavior = 2130968782;
+			// aapt resource value: 0x7f01011a
+			public const int layout_behavior = 2130772250;
 			
-			// aapt resource value: 0x7F0400CF
-			public const int layout_collapseMode = 2130968783;
+			// aapt resource value: 0x7f010116
+			public const int layout_collapseMode = 2130772246;
 			
-			// aapt resource value: 0x7F0400D0
-			public const int layout_collapseParallaxMultiplier = 2130968784;
+			// aapt resource value: 0x7f010117
+			public const int layout_collapseParallaxMultiplier = 2130772247;
 			
-			// aapt resource value: 0x7F0400D1
-			public const int layout_dodgeInsetEdges = 2130968785;
+			// aapt resource value: 0x7f01011f
+			public const int layout_dodgeInsetEdges = 2130772255;
 			
-			// aapt resource value: 0x7F0400D2
-			public const int layout_insetEdge = 2130968786;
+			// aapt resource value: 0x7f01011e
+			public const int layout_insetEdge = 2130772254;
 			
-			// aapt resource value: 0x7F0400D3
-			public const int layout_keyline = 2130968787;
+			// aapt resource value: 0x7f01011c
+			public const int layout_keyline = 2130772252;
 			
-			// aapt resource value: 0x7F0400D4
-			public const int layout_scrollFlags = 2130968788;
+			// aapt resource value: 0x7f010102
+			public const int layout_scrollFlags = 2130772226;
 			
-			// aapt resource value: 0x7F0400D5
-			public const int layout_scrollInterpolator = 2130968789;
+			// aapt resource value: 0x7f010103
+			public const int layout_scrollInterpolator = 2130772227;
 			
-			// aapt resource value: 0x7F0400D6
-			public const int layout_srlBackgroundColor = 2130968790;
+			// aapt resource value: 0x7f010197
+			public const int layout_srlBackgroundColor = 2130772375;
 			
-			// aapt resource value: 0x7F0400D7
-			public const int layout_srlSpinnerStyle = 2130968791;
+			// aapt resource value: 0x7f01015b
+			public const int layout_srlSpinnerStyle = 2130772315;
 			
-			// aapt resource value: 0x7F0400D8
-			public const int listChoiceBackgroundIndicator = 2130968792;
+			// aapt resource value: 0x7f01008e
+			public const int listChoiceBackgroundIndicator = 2130772110;
 			
-			// aapt resource value: 0x7F0400D9
-			public const int listDividerAlertDialog = 2130968793;
+			// aapt resource value: 0x7f010068
+			public const int listDividerAlertDialog = 2130772072;
 			
-			// aapt resource value: 0x7F0400DA
-			public const int listItemLayout = 2130968794;
+			// aapt resource value: 0x7f01002e
+			public const int listItemLayout = 2130772014;
 			
-			// aapt resource value: 0x7F0400DB
-			public const int listLayout = 2130968795;
+			// aapt resource value: 0x7f01002b
+			public const int listLayout = 2130772011;
 			
-			// aapt resource value: 0x7F0400DC
-			public const int listMenuViewStyle = 2130968796;
+			// aapt resource value: 0x7f0100ae
+			public const int listMenuViewStyle = 2130772142;
 			
-			// aapt resource value: 0x7F0400DD
-			public const int listPopupWindowStyle = 2130968797;
+			// aapt resource value: 0x7f010087
+			public const int listPopupWindowStyle = 2130772103;
 			
-			// aapt resource value: 0x7F0400DE
-			public const int listPreferredItemHeight = 2130968798;
+			// aapt resource value: 0x7f010081
+			public const int listPreferredItemHeight = 2130772097;
 			
-			// aapt resource value: 0x7F0400DF
-			public const int listPreferredItemHeightLarge = 2130968799;
+			// aapt resource value: 0x7f010083
+			public const int listPreferredItemHeightLarge = 2130772099;
 			
-			// aapt resource value: 0x7F0400E0
-			public const int listPreferredItemHeightSmall = 2130968800;
+			// aapt resource value: 0x7f010082
+			public const int listPreferredItemHeightSmall = 2130772098;
 			
-			// aapt resource value: 0x7F0400E1
-			public const int listPreferredItemPaddingLeft = 2130968801;
+			// aapt resource value: 0x7f010084
+			public const int listPreferredItemPaddingLeft = 2130772100;
 			
-			// aapt resource value: 0x7F0400E2
-			public const int listPreferredItemPaddingRight = 2130968802;
+			// aapt resource value: 0x7f010085
+			public const int listPreferredItemPaddingRight = 2130772101;
 			
-			// aapt resource value: 0x7F0400E3
-			public const int logo = 2130968803;
+			// aapt resource value: 0x7f010013
+			public const int logo = 2130771987;
 			
-			// aapt resource value: 0x7F0400E4
-			public const int logoDescription = 2130968804;
+			// aapt resource value: 0x7f0100f7
+			public const int logoDescription = 2130772215;
 			
-			// aapt resource value: 0x7F0400E5
-			public const int maxActionInlineWidth = 2130968805;
+			// aapt resource value: 0x7f010132
+			public const int maxActionInlineWidth = 2130772274;
 			
-			// aapt resource value: 0x7F0400E6
-			public const int maxButtonHeight = 2130968806;
+			// aapt resource value: 0x7f0100f1
+			public const int maxButtonHeight = 2130772209;
 			
-			// aapt resource value: 0x7F0400E7
-			public const int measureWithLargestChild = 2130968807;
+			// aapt resource value: 0x7f0100be
+			public const int measureWithLargestChild = 2130772158;
 			
-			// aapt resource value: 0x7F0400E8
-			public const int menu = 2130968808;
+			// aapt resource value: 0x7f01012a
+			public const int menu = 2130772266;
 			
-			// aapt resource value: 0x7F0400E9
-			public const int multiChoiceItemLayout = 2130968809;
+			// aapt resource value: 0x7f01002c
+			public const int multiChoiceItemLayout = 2130772012;
 			
-			// aapt resource value: 0x7F0400EA
-			public const int navigationContentDescription = 2130968810;
+			// aapt resource value: 0x7f0100f6
+			public const int navigationContentDescription = 2130772214;
 			
-			// aapt resource value: 0x7F0400EB
-			public const int navigationIcon = 2130968811;
+			// aapt resource value: 0x7f0100f5
+			public const int navigationIcon = 2130772213;
 			
-			// aapt resource value: 0x7F0400EC
-			public const int navigationMode = 2130968812;
+			// aapt resource value: 0x7f01000d
+			public const int navigationMode = 2130771981;
 			
-			// aapt resource value: 0x7F0400ED
-			public const int numericModifiers = 2130968813;
+			// aapt resource value: 0x7f0100c2
+			public const int numericModifiers = 2130772162;
 			
-			// aapt resource value: 0x7F0400EE
-			public const int overlapAnchor = 2130968814;
+			// aapt resource value: 0x7f0100cd
+			public const int overlapAnchor = 2130772173;
 			
-			// aapt resource value: 0x7F0400EF
-			public const int paddingBottomNoButtons = 2130968815;
+			// aapt resource value: 0x7f0100cf
+			public const int paddingBottomNoButtons = 2130772175;
 			
-			// aapt resource value: 0x7F0400F0
-			public const int paddingEnd = 2130968816;
+			// aapt resource value: 0x7f0100fb
+			public const int paddingEnd = 2130772219;
 			
-			// aapt resource value: 0x7F0400F1
-			public const int paddingStart = 2130968817;
+			// aapt resource value: 0x7f0100fa
+			public const int paddingStart = 2130772218;
 			
-			// aapt resource value: 0x7F0400F2
-			public const int paddingTopNoTitle = 2130968818;
+			// aapt resource value: 0x7f0100d0
+			public const int paddingTopNoTitle = 2130772176;
 			
-			// aapt resource value: 0x7F0400F3
-			public const int panelBackground = 2130968819;
+			// aapt resource value: 0x7f01008b
+			public const int panelBackground = 2130772107;
 			
-			// aapt resource value: 0x7F0400F4
-			public const int panelMenuListTheme = 2130968820;
+			// aapt resource value: 0x7f01008d
+			public const int panelMenuListTheme = 2130772109;
 			
-			// aapt resource value: 0x7F0400F5
-			public const int panelMenuListWidth = 2130968821;
+			// aapt resource value: 0x7f01008c
+			public const int panelMenuListWidth = 2130772108;
 			
-			// aapt resource value: 0x7F0400F6
-			public const int passwordToggleContentDescription = 2130968822;
+			// aapt resource value: 0x7f01014e
+			public const int passwordToggleContentDescription = 2130772302;
 			
-			// aapt resource value: 0x7F0400F7
-			public const int passwordToggleDrawable = 2130968823;
+			// aapt resource value: 0x7f01014d
+			public const int passwordToggleDrawable = 2130772301;
 			
-			// aapt resource value: 0x7F0400F8
-			public const int passwordToggleEnabled = 2130968824;
+			// aapt resource value: 0x7f01014c
+			public const int passwordToggleEnabled = 2130772300;
 			
-			// aapt resource value: 0x7F0400F9
-			public const int passwordToggleTint = 2130968825;
+			// aapt resource value: 0x7f01014f
+			public const int passwordToggleTint = 2130772303;
 			
-			// aapt resource value: 0x7F0400FA
-			public const int passwordToggleTintMode = 2130968826;
+			// aapt resource value: 0x7f010150
+			public const int passwordToggleTintMode = 2130772304;
 			
-			// aapt resource value: 0x7F0400FB
-			public const int popupMenuStyle = 2130968827;
+			// aapt resource value: 0x7f010078
+			public const int popupMenuStyle = 2130772088;
 			
-			// aapt resource value: 0x7F0400FC
-			public const int popupTheme = 2130968828;
+			// aapt resource value: 0x7f010026
+			public const int popupTheme = 2130772006;
 			
-			// aapt resource value: 0x7F0400FD
-			public const int popupWindowStyle = 2130968829;
+			// aapt resource value: 0x7f010079
+			public const int popupWindowStyle = 2130772089;
 			
-			// aapt resource value: 0x7F0400FE
-			public const int preserveIconSpacing = 2130968830;
+			// aapt resource value: 0x7f0100cb
+			public const int preserveIconSpacing = 2130772171;
 			
-			// aapt resource value: 0x7F0400FF
-			public const int pressedTranslationZ = 2130968831;
+			// aapt resource value: 0x7f010125
+			public const int pressedTranslationZ = 2130772261;
 			
-			// aapt resource value: 0x7F040100
-			public const int progressBarPadding = 2130968832;
+			// aapt resource value: 0x7f01001c
+			public const int progressBarPadding = 2130771996;
 			
-			// aapt resource value: 0x7F040101
-			public const int progressBarStyle = 2130968833;
+			// aapt resource value: 0x7f01001a
+			public const int progressBarStyle = 2130771994;
 			
-			// aapt resource value: 0x7F040102
-			public const int queryBackground = 2130968834;
+			// aapt resource value: 0x7f0100dc
+			public const int queryBackground = 2130772188;
 			
-			// aapt resource value: 0x7F040103
-			public const int queryHint = 2130968835;
+			// aapt resource value: 0x7f0100d3
+			public const int queryHint = 2130772179;
 			
-			// aapt resource value: 0x7F040104
-			public const int radioButtonStyle = 2130968836;
+			// aapt resource value: 0x7f0100a7
+			public const int radioButtonStyle = 2130772135;
 			
-			// aapt resource value: 0x7F040105
-			public const int ratingBarStyle = 2130968837;
+			// aapt resource value: 0x7f0100a8
+			public const int ratingBarStyle = 2130772136;
 			
-			// aapt resource value: 0x7F040106
-			public const int ratingBarStyleIndicator = 2130968838;
+			// aapt resource value: 0x7f0100a9
+			public const int ratingBarStyleIndicator = 2130772137;
 			
-			// aapt resource value: 0x7F040107
-			public const int ratingBarStyleSmall = 2130968839;
+			// aapt resource value: 0x7f0100aa
+			public const int ratingBarStyleSmall = 2130772138;
 			
-			// aapt resource value: 0x7F040108
-			public const int reverseLayout = 2130968840;
+			// aapt resource value: 0x7f010002
+			public const int reverseLayout = 2130771970;
 			
-			// aapt resource value: 0x7F040109
-			public const int rippleColor = 2130968841;
+			// aapt resource value: 0x7f010123
+			public const int rippleColor = 2130772259;
 			
-			// aapt resource value: 0x7F04010A
-			public const int scrimAnimationDuration = 2130968842;
+			// aapt resource value: 0x7f010112
+			public const int scrimAnimationDuration = 2130772242;
 			
-			// aapt resource value: 0x7F04010B
-			public const int scrimVisibleHeightTrigger = 2130968843;
+			// aapt resource value: 0x7f010111
+			public const int scrimVisibleHeightTrigger = 2130772241;
 			
-			// aapt resource value: 0x7F04010C
-			public const int searchHintIcon = 2130968844;
+			// aapt resource value: 0x7f0100d8
+			public const int searchHintIcon = 2130772184;
 			
-			// aapt resource value: 0x7F04010D
-			public const int searchIcon = 2130968845;
+			// aapt resource value: 0x7f0100d7
+			public const int searchIcon = 2130772183;
 			
-			// aapt resource value: 0x7F04010E
-			public const int searchViewStyle = 2130968846;
+			// aapt resource value: 0x7f010080
+			public const int searchViewStyle = 2130772096;
 			
-			// aapt resource value: 0x7F04010F
-			public const int second_curtain_bar_color = 2130968847;
+			// aapt resource value: 0x7f0101b1
+			public const int second_curtain_bar_color = 2130772401;
 			
-			// aapt resource value: 0x7F040110
-			public const int second_wave_color = 2130968848;
+			// aapt resource value: 0x7f0101b7
+			public const int second_wave_color = 2130772407;
 			
-			// aapt resource value: 0x7F040111
-			public const int seekBarStyle = 2130968849;
+			// aapt resource value: 0x7f0100ab
+			public const int seekBarStyle = 2130772139;
 			
-			// aapt resource value: 0x7F040112
-			public const int selectableItemBackground = 2130968850;
+			// aapt resource value: 0x7f010070
+			public const int selectableItemBackground = 2130772080;
 			
-			// aapt resource value: 0x7F040113
-			public const int selectableItemBackgroundBorderless = 2130968851;
+			// aapt resource value: 0x7f010071
+			public const int selectableItemBackgroundBorderless = 2130772081;
 			
-			// aapt resource value: 0x7F040114
-			public const int showAsAction = 2130968852;
+			// aapt resource value: 0x7f0100c3
+			public const int showAsAction = 2130772163;
 			
-			// aapt resource value: 0x7F040115
-			public const int showDividers = 2130968853;
+			// aapt resource value: 0x7f0100bf
+			public const int showDividers = 2130772159;
 			
-			// aapt resource value: 0x7F040116
-			public const int showText = 2130968854;
+			// aapt resource value: 0x7f0100e8
+			public const int showText = 2130772200;
 			
-			// aapt resource value: 0x7F040117
-			public const int showTitle = 2130968855;
+			// aapt resource value: 0x7f01002f
+			public const int showTitle = 2130772015;
 			
-			// aapt resource value: 0x7F040118
-			public const int singleChoiceItemLayout = 2130968856;
+			// aapt resource value: 0x7f01002d
+			public const int singleChoiceItemLayout = 2130772013;
 			
-			// aapt resource value: 0x7F040119
-			public const int spanCount = 2130968857;
+			// aapt resource value: 0x7f010001
+			public const int spanCount = 2130771969;
 			
-			// aapt resource value: 0x7F04011A
-			public const int spinBars = 2130968858;
+			// aapt resource value: 0x7f0100b7
+			public const int spinBars = 2130772151;
 			
-			// aapt resource value: 0x7F04011B
-			public const int spinnerDropDownItemStyle = 2130968859;
+			// aapt resource value: 0x7f01006b
+			public const int spinnerDropDownItemStyle = 2130772075;
 			
-			// aapt resource value: 0x7F04011C
-			public const int spinnerStyle = 2130968860;
+			// aapt resource value: 0x7f0100ac
+			public const int spinnerStyle = 2130772140;
 			
-			// aapt resource value: 0x7F04011D
-			public const int splitTrack = 2130968861;
+			// aapt resource value: 0x7f0100e7
+			public const int splitTrack = 2130772199;
 			
-			// aapt resource value: 0x7F04011E
-			public const int srcCompat = 2130968862;
+			// aapt resource value: 0x7f010030
+			public const int srcCompat = 2130772016;
 			
-			// aapt resource value: 0x7F04011F
-			public const int srlAccentColor = 2130968863;
+			// aapt resource value: 0x7f01015c
+			public const int srlAccentColor = 2130772316;
 			
-			// aapt resource value: 0x7F040120
-			public const int srlAnimatingColor = 2130968864;
+			// aapt resource value: 0x7f010172
+			public const int srlAnimatingColor = 2130772338;
 			
-			// aapt resource value: 0x7F040121
-			public const int srlClassicsSpinnerStyle = 2130968865;
+			// aapt resource value: 0x7f01015d
+			public const int srlClassicsSpinnerStyle = 2130772317;
 			
-			// aapt resource value: 0x7F040122
-			public const int srlDisableContentWhenLoading = 2130968866;
+			// aapt resource value: 0x7f010194
+			public const int srlDisableContentWhenLoading = 2130772372;
 			
-			// aapt resource value: 0x7F040123
-			public const int srlDisableContentWhenRefresh = 2130968867;
+			// aapt resource value: 0x7f010193
+			public const int srlDisableContentWhenRefresh = 2130772371;
 			
-			// aapt resource value: 0x7F040124
-			public const int srlDragRate = 2130968868;
+			// aapt resource value: 0x7f01017b
+			public const int srlDragRate = 2130772347;
 			
-			// aapt resource value: 0x7F040125
-			public const int srlDrawableArrow = 2130968869;
+			// aapt resource value: 0x7f01015e
+			public const int srlDrawableArrow = 2130772318;
 			
-			// aapt resource value: 0x7F040126
-			public const int srlDrawableArrowSize = 2130968870;
+			// aapt resource value: 0x7f01015f
+			public const int srlDrawableArrowSize = 2130772319;
 			
-			// aapt resource value: 0x7F040127
-			public const int srlDrawableMarginRight = 2130968871;
+			// aapt resource value: 0x7f010160
+			public const int srlDrawableMarginRight = 2130772320;
 			
-			// aapt resource value: 0x7F040128
-			public const int srlDrawableProgress = 2130968872;
+			// aapt resource value: 0x7f010161
+			public const int srlDrawableProgress = 2130772321;
 			
-			// aapt resource value: 0x7F040129
-			public const int srlDrawableProgressSize = 2130968873;
+			// aapt resource value: 0x7f010162
+			public const int srlDrawableProgressSize = 2130772322;
 			
-			// aapt resource value: 0x7F04012A
-			public const int srlDrawableSize = 2130968874;
+			// aapt resource value: 0x7f010163
+			public const int srlDrawableSize = 2130772323;
 			
-			// aapt resource value: 0x7F04012B
-			public const int srlEnableAutoLoadMore = 2130968875;
+			// aapt resource value: 0x7f010187
+			public const int srlEnableAutoLoadMore = 2130772359;
 			
-			// aapt resource value: 0x7F04012C
-			public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
+			// aapt resource value: 0x7f010191
+			public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
 			
-			// aapt resource value: 0x7F04012D
-			public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
+			// aapt resource value: 0x7f010190
+			public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
 			
-			// aapt resource value: 0x7F04012E
-			public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
+			// aapt resource value: 0x7f01018e
+			public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
 			
-			// aapt resource value: 0x7F04012F
-			public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
+			// aapt resource value: 0x7f01018f
+			public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
 			
-			// aapt resource value: 0x7F040130
-			public const int srlEnableFooterTranslationContent = 2130968880;
+			// aapt resource value: 0x7f010183
+			public const int srlEnableFooterTranslationContent = 2130772355;
 			
-			// aapt resource value: 0x7F040131
-			public const int srlEnableHeaderTranslationContent = 2130968881;
+			// aapt resource value: 0x7f010182
+			public const int srlEnableHeaderTranslationContent = 2130772354;
 			
-			// aapt resource value: 0x7F040132
-			public const int srlEnableHorizontalDrag = 2130968882;
+			// aapt resource value: 0x7f010164
+			public const int srlEnableHorizontalDrag = 2130772324;
 			
-			// aapt resource value: 0x7F040133
-			public const int srlEnableLastTime = 2130968883;
+			// aapt resource value: 0x7f010175
+			public const int srlEnableLastTime = 2130772341;
 			
-			// aapt resource value: 0x7F040134
-			public const int srlEnableLoadMore = 2130968884;
+			// aapt resource value: 0x7f010181
+			public const int srlEnableLoadMore = 2130772353;
 			
-			// aapt resource value: 0x7F040135
-			public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
+			// aapt resource value: 0x7f01018d
+			public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
 			
-			// aapt resource value: 0x7F040136
-			public const int srlEnableNestedScrolling = 2130968886;
+			// aapt resource value: 0x7f01018a
+			public const int srlEnableNestedScrolling = 2130772362;
 			
-			// aapt resource value: 0x7F040137
-			public const int srlEnableOverScrollBounce = 2130968887;
+			// aapt resource value: 0x7f010188
+			public const int srlEnableOverScrollBounce = 2130772360;
 			
-			// aapt resource value: 0x7F040138
-			public const int srlEnableOverScrollDrag = 2130968888;
+			// aapt resource value: 0x7f010192
+			public const int srlEnableOverScrollDrag = 2130772370;
 			
-			// aapt resource value: 0x7F040139
-			public const int srlEnablePreviewInEditMode = 2130968889;
+			// aapt resource value: 0x7f010186
+			public const int srlEnablePreviewInEditMode = 2130772358;
 			
-			// aapt resource value: 0x7F04013A
-			public const int srlEnablePullToCloseTwoLevel = 2130968890;
+			// aapt resource value: 0x7f01019d
+			public const int srlEnablePullToCloseTwoLevel = 2130772381;
 			
-			// aapt resource value: 0x7F04013B
-			public const int srlEnablePureScrollMode = 2130968891;
+			// aapt resource value: 0x7f010189
+			public const int srlEnablePureScrollMode = 2130772361;
 			
-			// aapt resource value: 0x7F04013C
-			public const int srlEnableRefresh = 2130968892;
+			// aapt resource value: 0x7f010180
+			public const int srlEnableRefresh = 2130772352;
 			
-			// aapt resource value: 0x7F04013D
-			public const int srlEnableScrollContentWhenLoaded = 2130968893;
+			// aapt resource value: 0x7f01018b
+			public const int srlEnableScrollContentWhenLoaded = 2130772363;
 			
-			// aapt resource value: 0x7F04013E
-			public const int srlEnableScrollContentWhenRefreshed = 2130968894;
+			// aapt resource value: 0x7f01018c
+			public const int srlEnableScrollContentWhenRefreshed = 2130772364;
 			
-			// aapt resource value: 0x7F04013F
-			public const int srlEnableTwoLevel = 2130968895;
+			// aapt resource value: 0x7f01019c
+			public const int srlEnableTwoLevel = 2130772380;
 			
-			// aapt resource value: 0x7F040140
-			public const int srlFinishDuration = 2130968896;
+			// aapt resource value: 0x7f010165
+			public const int srlFinishDuration = 2130772325;
 			
-			// aapt resource value: 0x7F040141
-			public const int srlFixedFooterViewId = 2130968897;
+			// aapt resource value: 0x7f010196
+			public const int srlFixedFooterViewId = 2130772374;
 			
-			// aapt resource value: 0x7F040142
-			public const int srlFixedHeaderViewId = 2130968898;
+			// aapt resource value: 0x7f010195
+			public const int srlFixedHeaderViewId = 2130772373;
 			
-			// aapt resource value: 0x7F040143
-			public const int srlFloorDuration = 2130968899;
+			// aapt resource value: 0x7f01019b
+			public const int srlFloorDuration = 2130772379;
 			
-			// aapt resource value: 0x7F040144
-			public const int srlFloorRage = 2130968900;
+			// aapt resource value: 0x7f010199
+			public const int srlFloorRage = 2130772377;
 			
-			// aapt resource value: 0x7F040145
-			public const int srlFooterHeight = 2130968901;
+			// aapt resource value: 0x7f010178
+			public const int srlFooterHeight = 2130772344;
 			
-			// aapt resource value: 0x7F040146
-			public const int srlFooterInsetStart = 2130968902;
+			// aapt resource value: 0x7f01017a
+			public const int srlFooterInsetStart = 2130772346;
 			
-			// aapt resource value: 0x7F040147
-			public const int srlFooterMaxDragRate = 2130968903;
+			// aapt resource value: 0x7f01017d
+			public const int srlFooterMaxDragRate = 2130772349;
 			
-			// aapt resource value: 0x7F040148
-			public const int srlFooterTranslationViewId = 2130968904;
+			// aapt resource value: 0x7f010185
+			public const int srlFooterTranslationViewId = 2130772357;
 			
-			// aapt resource value: 0x7F040149
-			public const int srlFooterTriggerRate = 2130968905;
+			// aapt resource value: 0x7f01017f
+			public const int srlFooterTriggerRate = 2130772351;
 			
-			// aapt resource value: 0x7F04014A
-			public const int srlHeaderHeight = 2130968906;
+			// aapt resource value: 0x7f010177
+			public const int srlHeaderHeight = 2130772343;
 			
-			// aapt resource value: 0x7F04014B
-			public const int srlHeaderInsetStart = 2130968907;
+			// aapt resource value: 0x7f010179
+			public const int srlHeaderInsetStart = 2130772345;
 			
-			// aapt resource value: 0x7F04014C
-			public const int srlHeaderMaxDragRate = 2130968908;
+			// aapt resource value: 0x7f01017c
+			public const int srlHeaderMaxDragRate = 2130772348;
 			
-			// aapt resource value: 0x7F04014D
-			public const int srlHeaderTranslationViewId = 2130968909;
+			// aapt resource value: 0x7f010184
+			public const int srlHeaderTranslationViewId = 2130772356;
 			
-			// aapt resource value: 0x7F04014E
-			public const int srlHeaderTriggerRate = 2130968910;
+			// aapt resource value: 0x7f01017e
+			public const int srlHeaderTriggerRate = 2130772350;
 			
-			// aapt resource value: 0x7F04014F
-			public const int srlMaxRage = 2130968911;
+			// aapt resource value: 0x7f010198
+			public const int srlMaxRage = 2130772376;
 			
-			// aapt resource value: 0x7F040150
-			public const int srlNormalColor = 2130968912;
+			// aapt resource value: 0x7f010173
+			public const int srlNormalColor = 2130772339;
 			
-			// aapt resource value: 0x7F040151
-			public const int srlPrimaryColor = 2130968913;
+			// aapt resource value: 0x7f010166
+			public const int srlPrimaryColor = 2130772326;
 			
-			// aapt resource value: 0x7F040152
-			public const int srlReboundDuration = 2130968914;
+			// aapt resource value: 0x7f010176
+			public const int srlReboundDuration = 2130772342;
 			
-			// aapt resource value: 0x7F040153
-			public const int srlRefreshRage = 2130968915;
+			// aapt resource value: 0x7f01019a
+			public const int srlRefreshRage = 2130772378;
 			
-			// aapt resource value: 0x7F040154
-			public const int srlTextFailed = 2130968916;
+			// aapt resource value: 0x7f010167
+			public const int srlTextFailed = 2130772327;
 			
-			// aapt resource value: 0x7F040155
-			public const int srlTextFinish = 2130968917;
+			// aapt resource value: 0x7f010168
+			public const int srlTextFinish = 2130772328;
 			
-			// aapt resource value: 0x7F040156
-			public const int srlTextLoading = 2130968918;
+			// aapt resource value: 0x7f010169
+			public const int srlTextLoading = 2130772329;
 			
-			// aapt resource value: 0x7F040157
-			public const int srlTextNothing = 2130968919;
+			// aapt resource value: 0x7f01016a
+			public const int srlTextNothing = 2130772330;
 			
-			// aapt resource value: 0x7F040158
-			public const int srlTextPulling = 2130968920;
+			// aapt resource value: 0x7f01016b
+			public const int srlTextPulling = 2130772331;
 			
-			// aapt resource value: 0x7F040159
-			public const int srlTextRefreshing = 2130968921;
+			// aapt resource value: 0x7f01016c
+			public const int srlTextRefreshing = 2130772332;
 			
-			// aapt resource value: 0x7F04015A
-			public const int srlTextRelease = 2130968922;
+			// aapt resource value: 0x7f01016d
+			public const int srlTextRelease = 2130772333;
 			
-			// aapt resource value: 0x7F04015B
-			public const int srlTextSecondary = 2130968923;
+			// aapt resource value: 0x7f01016e
+			public const int srlTextSecondary = 2130772334;
 			
-			// aapt resource value: 0x7F04015C
-			public const int srlTextSizeTime = 2130968924;
+			// aapt resource value: 0x7f01016f
+			public const int srlTextSizeTime = 2130772335;
 			
-			// aapt resource value: 0x7F04015D
-			public const int srlTextSizeTitle = 2130968925;
+			// aapt resource value: 0x7f010170
+			public const int srlTextSizeTitle = 2130772336;
 			
-			// aapt resource value: 0x7F04015E
-			public const int srlTextTimeMarginTop = 2130968926;
+			// aapt resource value: 0x7f010174
+			public const int srlTextTimeMarginTop = 2130772340;
 			
-			// aapt resource value: 0x7F04015F
-			public const int srlTextUpdate = 2130968927;
+			// aapt resource value: 0x7f010171
+			public const int srlTextUpdate = 2130772337;
 			
-			// aapt resource value: 0x7F040160
-			public const int stackFromEnd = 2130968928;
+			// aapt resource value: 0x7f010003
+			public const int stackFromEnd = 2130771971;
 			
-			// aapt resource value: 0x7F040161
-			public const int state_above_anchor = 2130968929;
+			// aapt resource value: 0x7f0100ce
+			public const int state_above_anchor = 2130772174;
 			
-			// aapt resource value: 0x7F040162
-			public const int state_collapsed = 2130968930;
+			// aapt resource value: 0x7f010100
+			public const int state_collapsed = 2130772224;
 			
-			// aapt resource value: 0x7F040163
-			public const int state_collapsible = 2130968931;
+			// aapt resource value: 0x7f010101
+			public const int state_collapsible = 2130772225;
 			
-			// aapt resource value: 0x7F040164
-			public const int statusBarBackground = 2130968932;
+			// aapt resource value: 0x7f010119
+			public const int statusBarBackground = 2130772249;
 			
-			// aapt resource value: 0x7F040165
-			public const int statusBarScrim = 2130968933;
+			// aapt resource value: 0x7f01010f
+			public const int statusBarScrim = 2130772239;
 			
-			// aapt resource value: 0x7F040166
-			public const int subMenuArrow = 2130968934;
+			// aapt resource value: 0x7f0100cc
+			public const int subMenuArrow = 2130772172;
 			
-			// aapt resource value: 0x7F040167
-			public const int submitBackground = 2130968935;
+			// aapt resource value: 0x7f0100dd
+			public const int submitBackground = 2130772189;
 			
-			// aapt resource value: 0x7F040168
-			public const int subtitle = 2130968936;
+			// aapt resource value: 0x7f01000f
+			public const int subtitle = 2130771983;
 			
-			// aapt resource value: 0x7F040169
-			public const int subtitleTextAppearance = 2130968937;
+			// aapt resource value: 0x7f0100ea
+			public const int subtitleTextAppearance = 2130772202;
 			
-			// aapt resource value: 0x7F04016A
-			public const int subtitleTextColor = 2130968938;
+			// aapt resource value: 0x7f0100f9
+			public const int subtitleTextColor = 2130772217;
 			
-			// aapt resource value: 0x7F04016B
-			public const int subtitleTextStyle = 2130968939;
+			// aapt resource value: 0x7f010011
+			public const int subtitleTextStyle = 2130771985;
 			
-			// aapt resource value: 0x7F04016C
-			public const int suggestionRowLayout = 2130968940;
+			// aapt resource value: 0x7f0100db
+			public const int suggestionRowLayout = 2130772187;
 			
-			// aapt resource value: 0x7F04016D
-			public const int switchMinWidth = 2130968941;
+			// aapt resource value: 0x7f0100e5
+			public const int switchMinWidth = 2130772197;
 			
-			// aapt resource value: 0x7F04016E
-			public const int switchPadding = 2130968942;
+			// aapt resource value: 0x7f0100e6
+			public const int switchPadding = 2130772198;
 			
-			// aapt resource value: 0x7F04016F
-			public const int switchStyle = 2130968943;
+			// aapt resource value: 0x7f0100ad
+			public const int switchStyle = 2130772141;
 			
-			// aapt resource value: 0x7F040170
-			public const int switchTextAppearance = 2130968944;
+			// aapt resource value: 0x7f0100e4
+			public const int switchTextAppearance = 2130772196;
 			
-			// aapt resource value: 0x7F040171
-			public const int tabBackground = 2130968945;
+			// aapt resource value: 0x7f010136
+			public const int tabBackground = 2130772278;
 			
-			// aapt resource value: 0x7F040172
-			public const int tabContentStart = 2130968946;
+			// aapt resource value: 0x7f010135
+			public const int tabContentStart = 2130772277;
 			
-			// aapt resource value: 0x7F040173
-			public const int tabGravity = 2130968947;
+			// aapt resource value: 0x7f010138
+			public const int tabGravity = 2130772280;
 			
-			// aapt resource value: 0x7F040174
-			public const int tabIndicatorColor = 2130968948;
+			// aapt resource value: 0x7f010133
+			public const int tabIndicatorColor = 2130772275;
 			
-			// aapt resource value: 0x7F040175
-			public const int tabIndicatorHeight = 2130968949;
+			// aapt resource value: 0x7f010134
+			public const int tabIndicatorHeight = 2130772276;
 			
-			// aapt resource value: 0x7F040176
-			public const int tabMaxWidth = 2130968950;
+			// aapt resource value: 0x7f01013a
+			public const int tabMaxWidth = 2130772282;
 			
-			// aapt resource value: 0x7F040177
-			public const int tabMinWidth = 2130968951;
+			// aapt resource value: 0x7f010139
+			public const int tabMinWidth = 2130772281;
 			
-			// aapt resource value: 0x7F040178
-			public const int tabMode = 2130968952;
+			// aapt resource value: 0x7f010137
+			public const int tabMode = 2130772279;
 			
-			// aapt resource value: 0x7F040179
-			public const int tabPadding = 2130968953;
+			// aapt resource value: 0x7f010142
+			public const int tabPadding = 2130772290;
 			
-			// aapt resource value: 0x7F04017A
-			public const int tabPaddingBottom = 2130968954;
+			// aapt resource value: 0x7f010141
+			public const int tabPaddingBottom = 2130772289;
 			
-			// aapt resource value: 0x7F04017B
-			public const int tabPaddingEnd = 2130968955;
+			// aapt resource value: 0x7f010140
+			public const int tabPaddingEnd = 2130772288;
 			
-			// aapt resource value: 0x7F04017C
-			public const int tabPaddingStart = 2130968956;
+			// aapt resource value: 0x7f01013e
+			public const int tabPaddingStart = 2130772286;
 			
-			// aapt resource value: 0x7F04017D
-			public const int tabPaddingTop = 2130968957;
+			// aapt resource value: 0x7f01013f
+			public const int tabPaddingTop = 2130772287;
 			
-			// aapt resource value: 0x7F04017E
-			public const int tabSelectedTextColor = 2130968958;
+			// aapt resource value: 0x7f01013d
+			public const int tabSelectedTextColor = 2130772285;
 			
-			// aapt resource value: 0x7F04017F
-			public const int tabTextAppearance = 2130968959;
+			// aapt resource value: 0x7f01013b
+			public const int tabTextAppearance = 2130772283;
 			
-			// aapt resource value: 0x7F040180
-			public const int tabTextColor = 2130968960;
+			// aapt resource value: 0x7f01013c
+			public const int tabTextColor = 2130772284;
 			
-			// aapt resource value: 0x7F040181
-			public const int textAllCaps = 2130968961;
+			// aapt resource value: 0x7f010036
+			public const int textAllCaps = 2130772022;
 			
-			// aapt resource value: 0x7F040182
-			public const int textAppearanceLargePopupMenu = 2130968962;
+			// aapt resource value: 0x7f010063
+			public const int textAppearanceLargePopupMenu = 2130772067;
 			
-			// aapt resource value: 0x7F040183
-			public const int textAppearanceListItem = 2130968963;
+			// aapt resource value: 0x7f010088
+			public const int textAppearanceListItem = 2130772104;
 			
-			// aapt resource value: 0x7F040184
-			public const int textAppearanceListItemSecondary = 2130968964;
+			// aapt resource value: 0x7f010089
+			public const int textAppearanceListItemSecondary = 2130772105;
 			
-			// aapt resource value: 0x7F040185
-			public const int textAppearanceListItemSmall = 2130968965;
+			// aapt resource value: 0x7f01008a
+			public const int textAppearanceListItemSmall = 2130772106;
 			
-			// aapt resource value: 0x7F040186
-			public const int textAppearancePopupMenuHeader = 2130968966;
+			// aapt resource value: 0x7f010065
+			public const int textAppearancePopupMenuHeader = 2130772069;
 			
-			// aapt resource value: 0x7F040187
-			public const int textAppearanceSearchResultSubtitle = 2130968967;
+			// aapt resource value: 0x7f01007e
+			public const int textAppearanceSearchResultSubtitle = 2130772094;
 			
-			// aapt resource value: 0x7F040188
-			public const int textAppearanceSearchResultTitle = 2130968968;
+			// aapt resource value: 0x7f01007d
+			public const int textAppearanceSearchResultTitle = 2130772093;
 			
-			// aapt resource value: 0x7F040189
-			public const int textAppearanceSmallPopupMenu = 2130968969;
+			// aapt resource value: 0x7f010064
+			public const int textAppearanceSmallPopupMenu = 2130772068;
 			
-			// aapt resource value: 0x7F04018A
-			public const int textColorAlertDialogListItem = 2130968970;
+			// aapt resource value: 0x7f01009d
+			public const int textColorAlertDialogListItem = 2130772125;
 			
-			// aapt resource value: 0x7F04018B
-			public const int textColorError = 2130968971;
+			// aapt resource value: 0x7f010122
+			public const int textColorError = 2130772258;
 			
-			// aapt resource value: 0x7F04018C
-			public const int textColorSearchUrl = 2130968972;
+			// aapt resource value: 0x7f01007f
+			public const int textColorSearchUrl = 2130772095;
 			
-			// aapt resource value: 0x7F04018D
-			public const int theme = 2130968973;
+			// aapt resource value: 0x7f0100fc
+			public const int theme = 2130772220;
 			
-			// aapt resource value: 0x7F04018E
-			public const int thickness = 2130968974;
+			// aapt resource value: 0x7f0100bd
+			public const int thickness = 2130772157;
 			
-			// aapt resource value: 0x7F04018F
-			public const int thumbTextPadding = 2130968975;
+			// aapt resource value: 0x7f0100e3
+			public const int thumbTextPadding = 2130772195;
 			
-			// aapt resource value: 0x7F040190
-			public const int thumbTint = 2130968976;
+			// aapt resource value: 0x7f0100de
+			public const int thumbTint = 2130772190;
 			
-			// aapt resource value: 0x7F040191
-			public const int thumbTintMode = 2130968977;
+			// aapt resource value: 0x7f0100df
+			public const int thumbTintMode = 2130772191;
 			
-			// aapt resource value: 0x7F040192
-			public const int tickMark = 2130968978;
+			// aapt resource value: 0x7f010033
+			public const int tickMark = 2130772019;
 			
-			// aapt resource value: 0x7F040193
-			public const int tickMarkTint = 2130968979;
+			// aapt resource value: 0x7f010034
+			public const int tickMarkTint = 2130772020;
 			
-			// aapt resource value: 0x7F040194
-			public const int tickMarkTintMode = 2130968980;
+			// aapt resource value: 0x7f010035
+			public const int tickMarkTintMode = 2130772021;
 			
-			// aapt resource value: 0x7F040195
-			public const int tint = 2130968981;
+			// aapt resource value: 0x7f010031
+			public const int tint = 2130772017;
 			
-			// aapt resource value: 0x7F040196
-			public const int tintMode = 2130968982;
+			// aapt resource value: 0x7f010032
+			public const int tintMode = 2130772018;
 			
-			// aapt resource value: 0x7F040197
-			public const int title = 2130968983;
+			// aapt resource value: 0x7f01000c
+			public const int title = 2130771980;
 			
-			// aapt resource value: 0x7F040198
-			public const int titleEnabled = 2130968984;
+			// aapt resource value: 0x7f010115
+			public const int titleEnabled = 2130772245;
 			
-			// aapt resource value: 0x7F040199
-			public const int titleMargin = 2130968985;
+			// aapt resource value: 0x7f0100eb
+			public const int titleMargin = 2130772203;
 			
-			// aapt resource value: 0x7F04019A
-			public const int titleMarginBottom = 2130968986;
+			// aapt resource value: 0x7f0100ef
+			public const int titleMarginBottom = 2130772207;
 			
-			// aapt resource value: 0x7F04019B
-			public const int titleMarginEnd = 2130968987;
+			// aapt resource value: 0x7f0100ed
+			public const int titleMarginEnd = 2130772205;
 			
-			// aapt resource value: 0x7F04019E
-			public const int titleMargins = 2130968990;
+			// aapt resource value: 0x7f0100ec
+			public const int titleMarginStart = 2130772204;
 			
-			// aapt resource value: 0x7F04019C
-			public const int titleMarginStart = 2130968988;
+			// aapt resource value: 0x7f0100ee
+			public const int titleMarginTop = 2130772206;
 			
-			// aapt resource value: 0x7F04019D
-			public const int titleMarginTop = 2130968989;
+			// aapt resource value: 0x7f0100f0
+			public const int titleMargins = 2130772208;
 			
-			// aapt resource value: 0x7F04019F
-			public const int titleTextAppearance = 2130968991;
+			// aapt resource value: 0x7f0100e9
+			public const int titleTextAppearance = 2130772201;
 			
-			// aapt resource value: 0x7F0401A0
-			public const int titleTextColor = 2130968992;
+			// aapt resource value: 0x7f0100f8
+			public const int titleTextColor = 2130772216;
 			
-			// aapt resource value: 0x7F0401A1
-			public const int titleTextStyle = 2130968993;
+			// aapt resource value: 0x7f010010
+			public const int titleTextStyle = 2130771984;
 			
-			// aapt resource value: 0x7F0401A2
-			public const int toolbarId = 2130968994;
+			// aapt resource value: 0x7f010110
+			public const int toolbarId = 2130772240;
 			
-			// aapt resource value: 0x7F0401A3
-			public const int toolbarNavigationButtonStyle = 2130968995;
+			// aapt resource value: 0x7f010077
+			public const int toolbarNavigationButtonStyle = 2130772087;
 			
-			// aapt resource value: 0x7F0401A4
-			public const int toolbarStyle = 2130968996;
+			// aapt resource value: 0x7f010076
+			public const int toolbarStyle = 2130772086;
 			
-			// aapt resource value: 0x7F0401A5
-			public const int tooltipForegroundColor = 2130968997;
+			// aapt resource value: 0x7f0100b0
+			public const int tooltipForegroundColor = 2130772144;
 			
-			// aapt resource value: 0x7F0401A6
-			public const int tooltipFrameBackground = 2130968998;
+			// aapt resource value: 0x7f0100af
+			public const int tooltipFrameBackground = 2130772143;
 			
-			// aapt resource value: 0x7F0401A7
-			public const int tooltipText = 2130968999;
+			// aapt resource value: 0x7f0100c8
+			public const int tooltipText = 2130772168;
 			
-			// aapt resource value: 0x7F0401A8
-			public const int track = 2130969000;
+			// aapt resource value: 0x7f0100e0
+			public const int track = 2130772192;
 			
-			// aapt resource value: 0x7F0401A9
-			public const int trackTint = 2130969001;
+			// aapt resource value: 0x7f0100e1
+			public const int trackTint = 2130772193;
 			
-			// aapt resource value: 0x7F0401AA
-			public const int trackTintMode = 2130969002;
+			// aapt resource value: 0x7f0100e2
+			public const int trackTintMode = 2130772194;
 			
-			// aapt resource value: 0x7F0401AB
-			public const int useCompatPadding = 2130969003;
+			// aapt resource value: 0x7f010127
+			public const int useCompatPadding = 2130772263;
 			
-			// aapt resource value: 0x7F0401AC
-			public const int voiceIcon = 2130969004;
+			// aapt resource value: 0x7f0100d9
+			public const int voiceIcon = 2130772185;
 			
-			// aapt resource value: 0x7F0401AD
-			public const int wave_bg_color = 2130969005;
+			// aapt resource value: 0x7f0101b8
+			public const int wave_bg_color = 2130772408;
 			
-			// aapt resource value: 0x7F0401AE
-			public const int wave_border_color = 2130969006;
+			// aapt resource value: 0x7f0101b9
+			public const int wave_border_color = 2130772409;
 			
-			// aapt resource value: 0x7F0401AF
-			public const int wave_color = 2130969007;
+			// aapt resource value: 0x7f0101b6
+			public const int wave_color = 2130772406;
 			
-			// aapt resource value: 0x7F0401B0
-			public const int wave_height = 2130969008;
+			// aapt resource value: 0x7f0101bb
+			public const int wave_height = 2130772411;
 			
-			// aapt resource value: 0x7F0401B1
-			public const int wave_width = 2130969009;
+			// aapt resource value: 0x7f0101ba
+			public const int wave_width = 2130772410;
 			
-			// aapt resource value: 0x7F0401B2
-			public const int wheelview_dividerColor = 2130969010;
+			// aapt resource value: 0x7f0101c0
+			public const int wheelview_dividerColor = 2130772416;
 			
-			// aapt resource value: 0x7F0401B3
-			public const int wheelview_gravity = 2130969011;
+			// aapt resource value: 0x7f0101bc
+			public const int wheelview_gravity = 2130772412;
 			
-			// aapt resource value: 0x7F0401B4
-			public const int wheelview_lineSpacingMultiplier = 2130969012;
+			// aapt resource value: 0x7f0101c1
+			public const int wheelview_lineSpacingMultiplier = 2130772417;
 			
-			// aapt resource value: 0x7F0401B5
-			public const int wheelview_textColorCenter = 2130969013;
+			// aapt resource value: 0x7f0101bf
+			public const int wheelview_textColorCenter = 2130772415;
 			
-			// aapt resource value: 0x7F0401B6
-			public const int wheelview_textColorOut = 2130969014;
+			// aapt resource value: 0x7f0101be
+			public const int wheelview_textColorOut = 2130772414;
 			
-			// aapt resource value: 0x7F0401B7
-			public const int wheelview_textSize = 2130969015;
+			// aapt resource value: 0x7f0101bd
+			public const int wheelview_textSize = 2130772413;
 			
-			// aapt resource value: 0x7F0401B8
-			public const int windowActionBar = 2130969016;
+			// aapt resource value: 0x7f01003d
+			public const int windowActionBar = 2130772029;
 			
-			// aapt resource value: 0x7F0401B9
-			public const int windowActionBarOverlay = 2130969017;
+			// aapt resource value: 0x7f01003f
+			public const int windowActionBarOverlay = 2130772031;
 			
-			// aapt resource value: 0x7F0401BA
-			public const int windowActionModeOverlay = 2130969018;
+			// aapt resource value: 0x7f010040
+			public const int windowActionModeOverlay = 2130772032;
 			
-			// aapt resource value: 0x7F0401BB
-			public const int windowFixedHeightMajor = 2130969019;
+			// aapt resource value: 0x7f010044
+			public const int windowFixedHeightMajor = 2130772036;
 			
-			// aapt resource value: 0x7F0401BC
-			public const int windowFixedHeightMinor = 2130969020;
+			// aapt resource value: 0x7f010042
+			public const int windowFixedHeightMinor = 2130772034;
 			
-			// aapt resource value: 0x7F0401BD
-			public const int windowFixedWidthMajor = 2130969021;
+			// aapt resource value: 0x7f010041
+			public const int windowFixedWidthMajor = 2130772033;
 			
-			// aapt resource value: 0x7F0401BE
-			public const int windowFixedWidthMinor = 2130969022;
+			// aapt resource value: 0x7f010043
+			public const int windowFixedWidthMinor = 2130772035;
 			
-			// aapt resource value: 0x7F0401BF
-			public const int windowMinWidthMajor = 2130969023;
+			// aapt resource value: 0x7f010045
+			public const int windowMinWidthMajor = 2130772037;
 			
-			// aapt resource value: 0x7F0401C0
-			public const int windowMinWidthMinor = 2130969024;
+			// aapt resource value: 0x7f010046
+			public const int windowMinWidthMinor = 2130772038;
 			
-			// aapt resource value: 0x7F0401C1
-			public const int windowNoTitle = 2130969025;
+			// aapt resource value: 0x7f01003e
+			public const int windowNoTitle = 2130772030;
 			
 			static Attribute()
 			{
@@ -1670,20 +1670,20 @@
 		public partial class Boolean
 		{
 			
-			// aapt resource value: 0x7F050000
-			public const int abc_action_bar_embed_tabs = 2131034112;
+			// aapt resource value: 0x7f0c0000
+			public const int abc_action_bar_embed_tabs = 2131492864;
 			
-			// aapt resource value: 0x7F050001
-			public const int abc_allow_stacked_button_bar = 2131034113;
+			// aapt resource value: 0x7f0c0001
+			public const int abc_allow_stacked_button_bar = 2131492865;
 			
-			// aapt resource value: 0x7F050002
-			public const int abc_config_actionMenuItemAllCaps = 2131034114;
+			// aapt resource value: 0x7f0c0002
+			public const int abc_config_actionMenuItemAllCaps = 2131492866;
 			
-			// aapt resource value: 0x7F050003
-			public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
+			// aapt resource value: 0x7f0c0003
+			public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
 			
-			// aapt resource value: 0x7F050004
-			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
+			// aapt resource value: 0x7f0c0004
+			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
 			
 			static Boolean()
 			{
@@ -1698,347 +1698,347 @@
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7F060000
-			public const int abc_background_cache_hint_selector_material_dark = 2131099648;
+			// aapt resource value: 0x7f0d0059
+			public const int abc_background_cache_hint_selector_material_dark = 2131558489;
 			
-			// aapt resource value: 0x7F060001
-			public const int abc_background_cache_hint_selector_material_light = 2131099649;
+			// aapt resource value: 0x7f0d005a
+			public const int abc_background_cache_hint_selector_material_light = 2131558490;
 			
-			// aapt resource value: 0x7F060002
-			public const int abc_btn_colored_borderless_text_material = 2131099650;
+			// aapt resource value: 0x7f0d005b
+			public const int abc_btn_colored_borderless_text_material = 2131558491;
 			
-			// aapt resource value: 0x7F060003
-			public const int abc_btn_colored_text_material = 2131099651;
+			// aapt resource value: 0x7f0d005c
+			public const int abc_btn_colored_text_material = 2131558492;
 			
-			// aapt resource value: 0x7F060004
-			public const int abc_color_highlight_material = 2131099652;
+			// aapt resource value: 0x7f0d005d
+			public const int abc_color_highlight_material = 2131558493;
 			
-			// aapt resource value: 0x7F060005
-			public const int abc_hint_foreground_material_dark = 2131099653;
+			// aapt resource value: 0x7f0d005e
+			public const int abc_hint_foreground_material_dark = 2131558494;
 			
-			// aapt resource value: 0x7F060006
-			public const int abc_hint_foreground_material_light = 2131099654;
+			// aapt resource value: 0x7f0d005f
+			public const int abc_hint_foreground_material_light = 2131558495;
 			
-			// aapt resource value: 0x7F060007
-			public const int abc_input_method_navigation_guard = 2131099655;
+			// aapt resource value: 0x7f0d0000
+			public const int abc_input_method_navigation_guard = 2131558400;
 			
-			// aapt resource value: 0x7F060008
-			public const int abc_primary_text_disable_only_material_dark = 2131099656;
+			// aapt resource value: 0x7f0d0060
+			public const int abc_primary_text_disable_only_material_dark = 2131558496;
 			
-			// aapt resource value: 0x7F060009
-			public const int abc_primary_text_disable_only_material_light = 2131099657;
+			// aapt resource value: 0x7f0d0061
+			public const int abc_primary_text_disable_only_material_light = 2131558497;
 			
-			// aapt resource value: 0x7F06000A
-			public const int abc_primary_text_material_dark = 2131099658;
+			// aapt resource value: 0x7f0d0062
+			public const int abc_primary_text_material_dark = 2131558498;
 			
-			// aapt resource value: 0x7F06000B
-			public const int abc_primary_text_material_light = 2131099659;
+			// aapt resource value: 0x7f0d0063
+			public const int abc_primary_text_material_light = 2131558499;
 			
-			// aapt resource value: 0x7F06000C
-			public const int abc_search_url_text = 2131099660;
+			// aapt resource value: 0x7f0d0064
+			public const int abc_search_url_text = 2131558500;
 			
-			// aapt resource value: 0x7F06000D
-			public const int abc_search_url_text_normal = 2131099661;
+			// aapt resource value: 0x7f0d0001
+			public const int abc_search_url_text_normal = 2131558401;
 			
-			// aapt resource value: 0x7F06000E
-			public const int abc_search_url_text_pressed = 2131099662;
+			// aapt resource value: 0x7f0d0002
+			public const int abc_search_url_text_pressed = 2131558402;
 			
-			// aapt resource value: 0x7F06000F
-			public const int abc_search_url_text_selected = 2131099663;
+			// aapt resource value: 0x7f0d0003
+			public const int abc_search_url_text_selected = 2131558403;
 			
-			// aapt resource value: 0x7F060010
-			public const int abc_secondary_text_material_dark = 2131099664;
+			// aapt resource value: 0x7f0d0065
+			public const int abc_secondary_text_material_dark = 2131558501;
 			
-			// aapt resource value: 0x7F060011
-			public const int abc_secondary_text_material_light = 2131099665;
+			// aapt resource value: 0x7f0d0066
+			public const int abc_secondary_text_material_light = 2131558502;
 			
-			// aapt resource value: 0x7F060012
-			public const int abc_tint_btn_checkable = 2131099666;
+			// aapt resource value: 0x7f0d0067
+			public const int abc_tint_btn_checkable = 2131558503;
 			
-			// aapt resource value: 0x7F060013
-			public const int abc_tint_default = 2131099667;
+			// aapt resource value: 0x7f0d0068
+			public const int abc_tint_default = 2131558504;
 			
-			// aapt resource value: 0x7F060014
-			public const int abc_tint_edittext = 2131099668;
+			// aapt resource value: 0x7f0d0069
+			public const int abc_tint_edittext = 2131558505;
 			
-			// aapt resource value: 0x7F060015
-			public const int abc_tint_seek_thumb = 2131099669;
+			// aapt resource value: 0x7f0d006a
+			public const int abc_tint_seek_thumb = 2131558506;
 			
-			// aapt resource value: 0x7F060016
-			public const int abc_tint_spinner = 2131099670;
+			// aapt resource value: 0x7f0d006b
+			public const int abc_tint_spinner = 2131558507;
 			
-			// aapt resource value: 0x7F060017
-			public const int abc_tint_switch_track = 2131099671;
+			// aapt resource value: 0x7f0d006c
+			public const int abc_tint_switch_track = 2131558508;
 			
-			// aapt resource value: 0x7F060018
-			public const int accent_material_dark = 2131099672;
+			// aapt resource value: 0x7f0d0004
+			public const int accent_material_dark = 2131558404;
 			
-			// aapt resource value: 0x7F060019
-			public const int accent_material_light = 2131099673;
+			// aapt resource value: 0x7f0d0005
+			public const int accent_material_light = 2131558405;
 			
-			// aapt resource value: 0x7F06001A
-			public const int background_floating_material_dark = 2131099674;
+			// aapt resource value: 0x7f0d0006
+			public const int background_floating_material_dark = 2131558406;
 			
-			// aapt resource value: 0x7F06001B
-			public const int background_floating_material_light = 2131099675;
+			// aapt resource value: 0x7f0d0007
+			public const int background_floating_material_light = 2131558407;
 			
-			// aapt resource value: 0x7F06001C
-			public const int background_material_dark = 2131099676;
+			// aapt resource value: 0x7f0d0008
+			public const int background_material_dark = 2131558408;
 			
-			// aapt resource value: 0x7F06001D
-			public const int background_material_light = 2131099677;
+			// aapt resource value: 0x7f0d0009
+			public const int background_material_light = 2131558409;
 			
-			// aapt resource value: 0x7F06001E
-			public const int bright_foreground_disabled_material_dark = 2131099678;
+			// aapt resource value: 0x7f0d000a
+			public const int bright_foreground_disabled_material_dark = 2131558410;
 			
-			// aapt resource value: 0x7F06001F
-			public const int bright_foreground_disabled_material_light = 2131099679;
+			// aapt resource value: 0x7f0d000b
+			public const int bright_foreground_disabled_material_light = 2131558411;
 			
-			// aapt resource value: 0x7F060020
-			public const int bright_foreground_inverse_material_dark = 2131099680;
+			// aapt resource value: 0x7f0d000c
+			public const int bright_foreground_inverse_material_dark = 2131558412;
 			
-			// aapt resource value: 0x7F060021
-			public const int bright_foreground_inverse_material_light = 2131099681;
+			// aapt resource value: 0x7f0d000d
+			public const int bright_foreground_inverse_material_light = 2131558413;
 			
-			// aapt resource value: 0x7F060022
-			public const int bright_foreground_material_dark = 2131099682;
+			// aapt resource value: 0x7f0d000e
+			public const int bright_foreground_material_dark = 2131558414;
 			
-			// aapt resource value: 0x7F060023
-			public const int bright_foreground_material_light = 2131099683;
+			// aapt resource value: 0x7f0d000f
+			public const int bright_foreground_material_light = 2131558415;
 			
-			// aapt resource value: 0x7F060024
-			public const int button_material_dark = 2131099684;
+			// aapt resource value: 0x7f0d0010
+			public const int button_material_dark = 2131558416;
 			
-			// aapt resource value: 0x7F060025
-			public const int button_material_light = 2131099685;
+			// aapt resource value: 0x7f0d0011
+			public const int button_material_light = 2131558417;
 			
-			// aapt resource value: 0x7F060026
-			public const int colorAccent = 2131099686;
+			// aapt resource value: 0x7f0d0047
+			public const int colorAccent = 2131558471;
 			
-			// aapt resource value: 0x7F060027
-			public const int colorPrimary = 2131099687;
+			// aapt resource value: 0x7f0d0048
+			public const int colorPrimary = 2131558472;
 			
-			// aapt resource value: 0x7F060028
-			public const int colorPrimaryDark = 2131099688;
+			// aapt resource value: 0x7f0d0049
+			public const int colorPrimaryDark = 2131558473;
 			
-			// aapt resource value: 0x7F060029
-			public const int color_default = 2131099689;
+			// aapt resource value: 0x7f0d0058
+			public const int color_default = 2131558488;
 			
-			// aapt resource value: 0x7F06002A
-			public const int color_disable = 2131099690;
+			// aapt resource value: 0x7f0d0056
+			public const int color_disable = 2131558486;
 			
-			// aapt resource value: 0x7F06002B
-			public const int color_select = 2131099691;
+			// aapt resource value: 0x7f0d0057
+			public const int color_select = 2131558487;
 			
-			// aapt resource value: 0x7F06002C
-			public const int color_white = 2131099692;
+			// aapt resource value: 0x7f0d0055
+			public const int color_white = 2131558485;
 			
-			// aapt resource value: 0x7F06002D
-			public const int design_bottom_navigation_shadow_color = 2131099693;
+			// aapt resource value: 0x7f0d003c
+			public const int design_bottom_navigation_shadow_color = 2131558460;
 			
-			// aapt resource value: 0x7F06002E
-			public const int design_error = 2131099694;
+			// aapt resource value: 0x7f0d006d
+			public const int design_error = 2131558509;
 			
-			// aapt resource value: 0x7F06002F
-			public const int design_fab_shadow_end_color = 2131099695;
+			// aapt resource value: 0x7f0d003d
+			public const int design_fab_shadow_end_color = 2131558461;
 			
-			// aapt resource value: 0x7F060030
-			public const int design_fab_shadow_mid_color = 2131099696;
+			// aapt resource value: 0x7f0d003e
+			public const int design_fab_shadow_mid_color = 2131558462;
 			
-			// aapt resource value: 0x7F060031
-			public const int design_fab_shadow_start_color = 2131099697;
+			// aapt resource value: 0x7f0d003f
+			public const int design_fab_shadow_start_color = 2131558463;
 			
-			// aapt resource value: 0x7F060032
-			public const int design_fab_stroke_end_inner_color = 2131099698;
+			// aapt resource value: 0x7f0d0040
+			public const int design_fab_stroke_end_inner_color = 2131558464;
 			
-			// aapt resource value: 0x7F060033
-			public const int design_fab_stroke_end_outer_color = 2131099699;
+			// aapt resource value: 0x7f0d0041
+			public const int design_fab_stroke_end_outer_color = 2131558465;
 			
-			// aapt resource value: 0x7F060034
-			public const int design_fab_stroke_top_inner_color = 2131099700;
+			// aapt resource value: 0x7f0d0042
+			public const int design_fab_stroke_top_inner_color = 2131558466;
 			
-			// aapt resource value: 0x7F060035
-			public const int design_fab_stroke_top_outer_color = 2131099701;
+			// aapt resource value: 0x7f0d0043
+			public const int design_fab_stroke_top_outer_color = 2131558467;
 			
-			// aapt resource value: 0x7F060036
-			public const int design_snackbar_background_color = 2131099702;
+			// aapt resource value: 0x7f0d0044
+			public const int design_snackbar_background_color = 2131558468;
 			
-			// aapt resource value: 0x7F060037
-			public const int design_tint_password_toggle = 2131099703;
+			// aapt resource value: 0x7f0d006e
+			public const int design_tint_password_toggle = 2131558510;
 			
-			// aapt resource value: 0x7F060038
-			public const int dim_foreground_disabled_material_dark = 2131099704;
+			// aapt resource value: 0x7f0d0012
+			public const int dim_foreground_disabled_material_dark = 2131558418;
 			
-			// aapt resource value: 0x7F060039
-			public const int dim_foreground_disabled_material_light = 2131099705;
+			// aapt resource value: 0x7f0d0013
+			public const int dim_foreground_disabled_material_light = 2131558419;
 			
-			// aapt resource value: 0x7F06003A
-			public const int dim_foreground_material_dark = 2131099706;
+			// aapt resource value: 0x7f0d0014
+			public const int dim_foreground_material_dark = 2131558420;
 			
-			// aapt resource value: 0x7F06003B
-			public const int dim_foreground_material_light = 2131099707;
+			// aapt resource value: 0x7f0d0015
+			public const int dim_foreground_material_light = 2131558421;
 			
-			// aapt resource value: 0x7F06003C
-			public const int error_color_material = 2131099708;
+			// aapt resource value: 0x7f0d0016
+			public const int error_color_material = 2131558422;
 			
-			// aapt resource value: 0x7F06003D
-			public const int foreground_material_dark = 2131099709;
+			// aapt resource value: 0x7f0d0017
+			public const int foreground_material_dark = 2131558423;
 			
-			// aapt resource value: 0x7F06003E
-			public const int foreground_material_light = 2131099710;
+			// aapt resource value: 0x7f0d0018
+			public const int foreground_material_light = 2131558424;
 			
-			// aapt resource value: 0x7F06003F
-			public const int gd_top_view = 2131099711;
+			// aapt resource value: 0x7f0d004b
+			public const int gd_top_view = 2131558475;
 			
-			// aapt resource value: 0x7F060040
-			public const int highlighted_text_material_dark = 2131099712;
+			// aapt resource value: 0x7f0d0019
+			public const int highlighted_text_material_dark = 2131558425;
 			
-			// aapt resource value: 0x7F060041
-			public const int highlighted_text_material_light = 2131099713;
+			// aapt resource value: 0x7f0d001a
+			public const int highlighted_text_material_light = 2131558426;
 			
-			// aapt resource value: 0x7F060042
-			public const int material_blue_grey_800 = 2131099714;
+			// aapt resource value: 0x7f0d001b
+			public const int material_blue_grey_800 = 2131558427;
 			
-			// aapt resource value: 0x7F060043
-			public const int material_blue_grey_900 = 2131099715;
+			// aapt resource value: 0x7f0d001c
+			public const int material_blue_grey_900 = 2131558428;
 			
-			// aapt resource value: 0x7F060044
-			public const int material_blue_grey_950 = 2131099716;
+			// aapt resource value: 0x7f0d001d
+			public const int material_blue_grey_950 = 2131558429;
 			
-			// aapt resource value: 0x7F060045
-			public const int material_deep_teal_200 = 2131099717;
+			// aapt resource value: 0x7f0d001e
+			public const int material_deep_teal_200 = 2131558430;
 			
-			// aapt resource value: 0x7F060046
-			public const int material_deep_teal_500 = 2131099718;
+			// aapt resource value: 0x7f0d001f
+			public const int material_deep_teal_500 = 2131558431;
 			
-			// aapt resource value: 0x7F060047
-			public const int material_grey_100 = 2131099719;
+			// aapt resource value: 0x7f0d0020
+			public const int material_grey_100 = 2131558432;
 			
-			// aapt resource value: 0x7F060048
-			public const int material_grey_300 = 2131099720;
+			// aapt resource value: 0x7f0d0021
+			public const int material_grey_300 = 2131558433;
 			
-			// aapt resource value: 0x7F060049
-			public const int material_grey_50 = 2131099721;
+			// aapt resource value: 0x7f0d0022
+			public const int material_grey_50 = 2131558434;
 			
-			// aapt resource value: 0x7F06004A
-			public const int material_grey_600 = 2131099722;
+			// aapt resource value: 0x7f0d0023
+			public const int material_grey_600 = 2131558435;
 			
-			// aapt resource value: 0x7F06004B
-			public const int material_grey_800 = 2131099723;
+			// aapt resource value: 0x7f0d0024
+			public const int material_grey_800 = 2131558436;
 			
-			// aapt resource value: 0x7F06004C
-			public const int material_grey_850 = 2131099724;
+			// aapt resource value: 0x7f0d0025
+			public const int material_grey_850 = 2131558437;
 			
-			// aapt resource value: 0x7F06004D
-			public const int material_grey_900 = 2131099725;
+			// aapt resource value: 0x7f0d0026
+			public const int material_grey_900 = 2131558438;
 			
-			// aapt resource value: 0x7F06004E
-			public const int material_red_500 = 2131099726;
+			// aapt resource value: 0x7f0d004a
+			public const int material_red_500 = 2131558474;
 			
-			// aapt resource value: 0x7F06004F
-			public const int notification_action_color_filter = 2131099727;
+			// aapt resource value: 0x7f0d0045
+			public const int notification_action_color_filter = 2131558469;
 			
-			// aapt resource value: 0x7F060050
-			public const int notification_icon_bg_color = 2131099728;
+			// aapt resource value: 0x7f0d0046
+			public const int notification_icon_bg_color = 2131558470;
 			
-			// aapt resource value: 0x7F060051
-			public const int notification_material_background_media_default_color = 2131099729;
+			// aapt resource value: 0x7f0d003b
+			public const int notification_material_background_media_default_color = 2131558459;
 			
-			// aapt resource value: 0x7F060052
-			public const int pickerview_bgColor_default = 2131099730;
+			// aapt resource value: 0x7f0d004c
+			public const int pickerview_bgColor_default = 2131558476;
 			
-			// aapt resource value: 0x7F060053
-			public const int pickerview_bgColor_overlay = 2131099731;
+			// aapt resource value: 0x7f0d004d
+			public const int pickerview_bgColor_overlay = 2131558477;
 			
-			// aapt resource value: 0x7F060054
-			public const int pickerview_bg_topbar = 2131099732;
+			// aapt resource value: 0x7f0d004e
+			public const int pickerview_bg_topbar = 2131558478;
 			
-			// aapt resource value: 0x7F060055
-			public const int pickerview_timebtn_nor = 2131099733;
+			// aapt resource value: 0x7f0d004f
+			public const int pickerview_timebtn_nor = 2131558479;
 			
-			// aapt resource value: 0x7F060056
-			public const int pickerview_timebtn_pre = 2131099734;
+			// aapt resource value: 0x7f0d0050
+			public const int pickerview_timebtn_pre = 2131558480;
 			
-			// aapt resource value: 0x7F060057
-			public const int pickerview_topbar_title = 2131099735;
+			// aapt resource value: 0x7f0d0051
+			public const int pickerview_topbar_title = 2131558481;
 			
-			// aapt resource value: 0x7F060058
-			public const int pickerview_wheelview_textcolor_center = 2131099736;
+			// aapt resource value: 0x7f0d0052
+			public const int pickerview_wheelview_textcolor_center = 2131558482;
 			
-			// aapt resource value: 0x7F060059
-			public const int pickerview_wheelview_textcolor_divider = 2131099737;
+			// aapt resource value: 0x7f0d0053
+			public const int pickerview_wheelview_textcolor_divider = 2131558483;
 			
-			// aapt resource value: 0x7F06005A
-			public const int pickerview_wheelview_textcolor_out = 2131099738;
+			// aapt resource value: 0x7f0d0054
+			public const int pickerview_wheelview_textcolor_out = 2131558484;
 			
-			// aapt resource value: 0x7F06005B
-			public const int primary_dark_material_dark = 2131099739;
+			// aapt resource value: 0x7f0d0027
+			public const int primary_dark_material_dark = 2131558439;
 			
-			// aapt resource value: 0x7F06005C
-			public const int primary_dark_material_light = 2131099740;
+			// aapt resource value: 0x7f0d0028
+			public const int primary_dark_material_light = 2131558440;
 			
-			// aapt resource value: 0x7F06005D
-			public const int primary_material_dark = 2131099741;
+			// aapt resource value: 0x7f0d0029
+			public const int primary_material_dark = 2131558441;
 			
-			// aapt resource value: 0x7F06005E
-			public const int primary_material_light = 2131099742;
+			// aapt resource value: 0x7f0d002a
+			public const int primary_material_light = 2131558442;
 			
-			// aapt resource value: 0x7F06005F
-			public const int primary_text_default_material_dark = 2131099743;
+			// aapt resource value: 0x7f0d002b
+			public const int primary_text_default_material_dark = 2131558443;
 			
-			// aapt resource value: 0x7F060060
-			public const int primary_text_default_material_light = 2131099744;
+			// aapt resource value: 0x7f0d002c
+			public const int primary_text_default_material_light = 2131558444;
 			
-			// aapt resource value: 0x7F060061
-			public const int primary_text_disabled_material_dark = 2131099745;
+			// aapt resource value: 0x7f0d002d
+			public const int primary_text_disabled_material_dark = 2131558445;
 			
-			// aapt resource value: 0x7F060062
-			public const int primary_text_disabled_material_light = 2131099746;
+			// aapt resource value: 0x7f0d002e
+			public const int primary_text_disabled_material_light = 2131558446;
 			
-			// aapt resource value: 0x7F060063
-			public const int ripple_material_dark = 2131099747;
+			// aapt resource value: 0x7f0d002f
+			public const int ripple_material_dark = 2131558447;
 			
-			// aapt resource value: 0x7F060064
-			public const int ripple_material_light = 2131099748;
+			// aapt resource value: 0x7f0d0030
+			public const int ripple_material_light = 2131558448;
 			
-			// aapt resource value: 0x7F060065
-			public const int secondary_text_default_material_dark = 2131099749;
+			// aapt resource value: 0x7f0d0031
+			public const int secondary_text_default_material_dark = 2131558449;
 			
-			// aapt resource value: 0x7F060066
-			public const int secondary_text_default_material_light = 2131099750;
+			// aapt resource value: 0x7f0d0032
+			public const int secondary_text_default_material_light = 2131558450;
 			
-			// aapt resource value: 0x7F060067
-			public const int secondary_text_disabled_material_dark = 2131099751;
+			// aapt resource value: 0x7f0d0033
+			public const int secondary_text_disabled_material_dark = 2131558451;
 			
-			// aapt resource value: 0x7F060068
-			public const int secondary_text_disabled_material_light = 2131099752;
+			// aapt resource value: 0x7f0d0034
+			public const int secondary_text_disabled_material_light = 2131558452;
 			
-			// aapt resource value: 0x7F060069
-			public const int switch_thumb_disabled_material_dark = 2131099753;
+			// aapt resource value: 0x7f0d0035
+			public const int switch_thumb_disabled_material_dark = 2131558453;
 			
-			// aapt resource value: 0x7F06006A
-			public const int switch_thumb_disabled_material_light = 2131099754;
+			// aapt resource value: 0x7f0d0036
+			public const int switch_thumb_disabled_material_light = 2131558454;
 			
-			// aapt resource value: 0x7F06006B
-			public const int switch_thumb_material_dark = 2131099755;
+			// aapt resource value: 0x7f0d006f
+			public const int switch_thumb_material_dark = 2131558511;
 			
-			// aapt resource value: 0x7F06006C
-			public const int switch_thumb_material_light = 2131099756;
+			// aapt resource value: 0x7f0d0070
+			public const int switch_thumb_material_light = 2131558512;
 			
-			// aapt resource value: 0x7F06006D
-			public const int switch_thumb_normal_material_dark = 2131099757;
+			// aapt resource value: 0x7f0d0037
+			public const int switch_thumb_normal_material_dark = 2131558455;
 			
-			// aapt resource value: 0x7F06006E
-			public const int switch_thumb_normal_material_light = 2131099758;
+			// aapt resource value: 0x7f0d0038
+			public const int switch_thumb_normal_material_light = 2131558456;
 			
-			// aapt resource value: 0x7F06006F
-			public const int text_color = 2131099759;
+			// aapt resource value: 0x7f0d0071
+			public const int text_color = 2131558513;
 			
-			// aapt resource value: 0x7F060070
-			public const int tooltip_background_dark = 2131099760;
+			// aapt resource value: 0x7f0d0039
+			public const int tooltip_background_dark = 2131558457;
 			
-			// aapt resource value: 0x7F060071
-			public const int tooltip_background_light = 2131099761;
+			// aapt resource value: 0x7f0d003a
+			public const int tooltip_background_light = 2131558458;
 			
 			static Color()
 			{
@@ -2053,491 +2053,491 @@
 		public partial class Dimension
 		{
 			
-			// aapt resource value: 0x7F070000
-			public const int abc_action_bar_content_inset_material = 2131165184;
+			// aapt resource value: 0x7f080012
+			public const int abc_action_bar_content_inset_material = 2131230738;
 			
-			// aapt resource value: 0x7F070001
-			public const int abc_action_bar_content_inset_with_nav = 2131165185;
+			// aapt resource value: 0x7f080013
+			public const int abc_action_bar_content_inset_with_nav = 2131230739;
 			
-			// aapt resource value: 0x7F070002
-			public const int abc_action_bar_default_height_material = 2131165186;
+			// aapt resource value: 0x7f080007
+			public const int abc_action_bar_default_height_material = 2131230727;
 			
-			// aapt resource value: 0x7F070003
-			public const int abc_action_bar_default_padding_end_material = 2131165187;
+			// aapt resource value: 0x7f080014
+			public const int abc_action_bar_default_padding_end_material = 2131230740;
 			
-			// aapt resource value: 0x7F070004
-			public const int abc_action_bar_default_padding_start_material = 2131165188;
+			// aapt resource value: 0x7f080015
+			public const int abc_action_bar_default_padding_start_material = 2131230741;
 			
-			// aapt resource value: 0x7F070005
-			public const int abc_action_bar_elevation_material = 2131165189;
+			// aapt resource value: 0x7f080017
+			public const int abc_action_bar_elevation_material = 2131230743;
 			
-			// aapt resource value: 0x7F070006
-			public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
+			// aapt resource value: 0x7f080018
+			public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
 			
-			// aapt resource value: 0x7F070007
-			public const int abc_action_bar_overflow_padding_end_material = 2131165191;
+			// aapt resource value: 0x7f080019
+			public const int abc_action_bar_overflow_padding_end_material = 2131230745;
 			
-			// aapt resource value: 0x7F070008
-			public const int abc_action_bar_overflow_padding_start_material = 2131165192;
+			// aapt resource value: 0x7f08001a
+			public const int abc_action_bar_overflow_padding_start_material = 2131230746;
 			
-			// aapt resource value: 0x7F070009
-			public const int abc_action_bar_progress_bar_size = 2131165193;
+			// aapt resource value: 0x7f080008
+			public const int abc_action_bar_progress_bar_size = 2131230728;
 			
-			// aapt resource value: 0x7F07000A
-			public const int abc_action_bar_stacked_max_height = 2131165194;
+			// aapt resource value: 0x7f08001b
+			public const int abc_action_bar_stacked_max_height = 2131230747;
 			
-			// aapt resource value: 0x7F07000B
-			public const int abc_action_bar_stacked_tab_max_width = 2131165195;
+			// aapt resource value: 0x7f08001c
+			public const int abc_action_bar_stacked_tab_max_width = 2131230748;
 			
-			// aapt resource value: 0x7F07000C
-			public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
+			// aapt resource value: 0x7f08001d
+			public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
 			
-			// aapt resource value: 0x7F07000D
-			public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
+			// aapt resource value: 0x7f08001e
+			public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
 			
-			// aapt resource value: 0x7F07000E
-			public const int abc_action_button_min_height_material = 2131165198;
+			// aapt resource value: 0x7f08001f
+			public const int abc_action_button_min_height_material = 2131230751;
 			
-			// aapt resource value: 0x7F07000F
-			public const int abc_action_button_min_width_material = 2131165199;
+			// aapt resource value: 0x7f080020
+			public const int abc_action_button_min_width_material = 2131230752;
 			
-			// aapt resource value: 0x7F070010
-			public const int abc_action_button_min_width_overflow_material = 2131165200;
+			// aapt resource value: 0x7f080021
+			public const int abc_action_button_min_width_overflow_material = 2131230753;
 			
-			// aapt resource value: 0x7F070011
-			public const int abc_alert_dialog_button_bar_height = 2131165201;
+			// aapt resource value: 0x7f080006
+			public const int abc_alert_dialog_button_bar_height = 2131230726;
 			
-			// aapt resource value: 0x7F070012
-			public const int abc_button_inset_horizontal_material = 2131165202;
+			// aapt resource value: 0x7f080022
+			public const int abc_button_inset_horizontal_material = 2131230754;
 			
-			// aapt resource value: 0x7F070013
-			public const int abc_button_inset_vertical_material = 2131165203;
+			// aapt resource value: 0x7f080023
+			public const int abc_button_inset_vertical_material = 2131230755;
 			
-			// aapt resource value: 0x7F070014
-			public const int abc_button_padding_horizontal_material = 2131165204;
+			// aapt resource value: 0x7f080024
+			public const int abc_button_padding_horizontal_material = 2131230756;
 			
-			// aapt resource value: 0x7F070015
-			public const int abc_button_padding_vertical_material = 2131165205;
+			// aapt resource value: 0x7f080025
+			public const int abc_button_padding_vertical_material = 2131230757;
 			
-			// aapt resource value: 0x7F070016
-			public const int abc_cascading_menus_min_smallest_width = 2131165206;
+			// aapt resource value: 0x7f080026
+			public const int abc_cascading_menus_min_smallest_width = 2131230758;
 			
-			// aapt resource value: 0x7F070017
-			public const int abc_config_prefDialogWidth = 2131165207;
+			// aapt resource value: 0x7f08000b
+			public const int abc_config_prefDialogWidth = 2131230731;
 			
-			// aapt resource value: 0x7F070018
-			public const int abc_control_corner_material = 2131165208;
+			// aapt resource value: 0x7f080027
+			public const int abc_control_corner_material = 2131230759;
 			
-			// aapt resource value: 0x7F070019
-			public const int abc_control_inset_material = 2131165209;
+			// aapt resource value: 0x7f080028
+			public const int abc_control_inset_material = 2131230760;
 			
-			// aapt resource value: 0x7F07001A
-			public const int abc_control_padding_material = 2131165210;
+			// aapt resource value: 0x7f080029
+			public const int abc_control_padding_material = 2131230761;
 			
-			// aapt resource value: 0x7F07001B
-			public const int abc_dialog_fixed_height_major = 2131165211;
+			// aapt resource value: 0x7f08000c
+			public const int abc_dialog_fixed_height_major = 2131230732;
 			
-			// aapt resource value: 0x7F07001C
-			public const int abc_dialog_fixed_height_minor = 2131165212;
+			// aapt resource value: 0x7f08000d
+			public const int abc_dialog_fixed_height_minor = 2131230733;
 			
-			// aapt resource value: 0x7F07001D
-			public const int abc_dialog_fixed_width_major = 2131165213;
+			// aapt resource value: 0x7f08000e
+			public const int abc_dialog_fixed_width_major = 2131230734;
 			
-			// aapt resource value: 0x7F07001E
-			public const int abc_dialog_fixed_width_minor = 2131165214;
+			// aapt resource value: 0x7f08000f
+			public const int abc_dialog_fixed_width_minor = 2131230735;
 			
-			// aapt resource value: 0x7F07001F
-			public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
+			// aapt resource value: 0x7f08002a
+			public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
 			
-			// aapt resource value: 0x7F070020
-			public const int abc_dialog_list_padding_top_no_title = 2131165216;
+			// aapt resource value: 0x7f08002b
+			public const int abc_dialog_list_padding_top_no_title = 2131230763;
 			
-			// aapt resource value: 0x7F070021
-			public const int abc_dialog_min_width_major = 2131165217;
+			// aapt resource value: 0x7f080010
+			public const int abc_dialog_min_width_major = 2131230736;
 			
-			// aapt resource value: 0x7F070022
-			public const int abc_dialog_min_width_minor = 2131165218;
+			// aapt resource value: 0x7f080011
+			public const int abc_dialog_min_width_minor = 2131230737;
 			
-			// aapt resource value: 0x7F070023
-			public const int abc_dialog_padding_material = 2131165219;
+			// aapt resource value: 0x7f08002c
+			public const int abc_dialog_padding_material = 2131230764;
 			
-			// aapt resource value: 0x7F070024
-			public const int abc_dialog_padding_top_material = 2131165220;
+			// aapt resource value: 0x7f08002d
+			public const int abc_dialog_padding_top_material = 2131230765;
 			
-			// aapt resource value: 0x7F070025
-			public const int abc_dialog_title_divider_material = 2131165221;
+			// aapt resource value: 0x7f08002e
+			public const int abc_dialog_title_divider_material = 2131230766;
 			
-			// aapt resource value: 0x7F070026
-			public const int abc_disabled_alpha_material_dark = 2131165222;
+			// aapt resource value: 0x7f08002f
+			public const int abc_disabled_alpha_material_dark = 2131230767;
 			
-			// aapt resource value: 0x7F070027
-			public const int abc_disabled_alpha_material_light = 2131165223;
+			// aapt resource value: 0x7f080030
+			public const int abc_disabled_alpha_material_light = 2131230768;
 			
-			// aapt resource value: 0x7F070028
-			public const int abc_dropdownitem_icon_width = 2131165224;
+			// aapt resource value: 0x7f080031
+			public const int abc_dropdownitem_icon_width = 2131230769;
 			
-			// aapt resource value: 0x7F070029
-			public const int abc_dropdownitem_text_padding_left = 2131165225;
+			// aapt resource value: 0x7f080032
+			public const int abc_dropdownitem_text_padding_left = 2131230770;
 			
-			// aapt resource value: 0x7F07002A
-			public const int abc_dropdownitem_text_padding_right = 2131165226;
+			// aapt resource value: 0x7f080033
+			public const int abc_dropdownitem_text_padding_right = 2131230771;
 			
-			// aapt resource value: 0x7F07002B
-			public const int abc_edit_text_inset_bottom_material = 2131165227;
+			// aapt resource value: 0x7f080034
+			public const int abc_edit_text_inset_bottom_material = 2131230772;
 			
-			// aapt resource value: 0x7F07002C
-			public const int abc_edit_text_inset_horizontal_material = 2131165228;
+			// aapt resource value: 0x7f080035
+			public const int abc_edit_text_inset_horizontal_material = 2131230773;
 			
-			// aapt resource value: 0x7F07002D
-			public const int abc_edit_text_inset_top_material = 2131165229;
+			// aapt resource value: 0x7f080036
+			public const int abc_edit_text_inset_top_material = 2131230774;
 			
-			// aapt resource value: 0x7F07002E
-			public const int abc_floating_window_z = 2131165230;
+			// aapt resource value: 0x7f080037
+			public const int abc_floating_window_z = 2131230775;
 			
-			// aapt resource value: 0x7F07002F
-			public const int abc_list_item_padding_horizontal_material = 2131165231;
+			// aapt resource value: 0x7f080038
+			public const int abc_list_item_padding_horizontal_material = 2131230776;
 			
-			// aapt resource value: 0x7F070030
-			public const int abc_panel_menu_list_width = 2131165232;
+			// aapt resource value: 0x7f080039
+			public const int abc_panel_menu_list_width = 2131230777;
 			
-			// aapt resource value: 0x7F070031
-			public const int abc_progress_bar_height_material = 2131165233;
+			// aapt resource value: 0x7f08003a
+			public const int abc_progress_bar_height_material = 2131230778;
 			
-			// aapt resource value: 0x7F070032
-			public const int abc_search_view_preferred_height = 2131165234;
+			// aapt resource value: 0x7f08003b
+			public const int abc_search_view_preferred_height = 2131230779;
 			
-			// aapt resource value: 0x7F070033
-			public const int abc_search_view_preferred_width = 2131165235;
+			// aapt resource value: 0x7f08003c
+			public const int abc_search_view_preferred_width = 2131230780;
 			
-			// aapt resource value: 0x7F070034
-			public const int abc_seekbar_track_background_height_material = 2131165236;
+			// aapt resource value: 0x7f08003d
+			public const int abc_seekbar_track_background_height_material = 2131230781;
 			
-			// aapt resource value: 0x7F070035
-			public const int abc_seekbar_track_progress_height_material = 2131165237;
+			// aapt resource value: 0x7f08003e
+			public const int abc_seekbar_track_progress_height_material = 2131230782;
 			
-			// aapt resource value: 0x7F070036
-			public const int abc_select_dialog_padding_start_material = 2131165238;
+			// aapt resource value: 0x7f08003f
+			public const int abc_select_dialog_padding_start_material = 2131230783;
 			
-			// aapt resource value: 0x7F070037
-			public const int abc_switch_padding = 2131165239;
+			// aapt resource value: 0x7f080016
+			public const int abc_switch_padding = 2131230742;
 			
-			// aapt resource value: 0x7F070038
-			public const int abc_text_size_body_1_material = 2131165240;
+			// aapt resource value: 0x7f080040
+			public const int abc_text_size_body_1_material = 2131230784;
 			
-			// aapt resource value: 0x7F070039
-			public const int abc_text_size_body_2_material = 2131165241;
+			// aapt resource value: 0x7f080041
+			public const int abc_text_size_body_2_material = 2131230785;
 			
-			// aapt resource value: 0x7F07003A
-			public const int abc_text_size_button_material = 2131165242;
+			// aapt resource value: 0x7f080042
+			public const int abc_text_size_button_material = 2131230786;
 			
-			// aapt resource value: 0x7F07003B
-			public const int abc_text_size_caption_material = 2131165243;
+			// aapt resource value: 0x7f080043
+			public const int abc_text_size_caption_material = 2131230787;
 			
-			// aapt resource value: 0x7F07003C
-			public const int abc_text_size_display_1_material = 2131165244;
+			// aapt resource value: 0x7f080044
+			public const int abc_text_size_display_1_material = 2131230788;
 			
-			// aapt resource value: 0x7F07003D
-			public const int abc_text_size_display_2_material = 2131165245;
+			// aapt resource value: 0x7f080045
+			public const int abc_text_size_display_2_material = 2131230789;
 			
-			// aapt resource value: 0x7F07003E
-			public const int abc_text_size_display_3_material = 2131165246;
+			// aapt resource value: 0x7f080046
+			public const int abc_text_size_display_3_material = 2131230790;
 			
-			// aapt resource value: 0x7F07003F
-			public const int abc_text_size_display_4_material = 2131165247;
+			// aapt resource value: 0x7f080047
+			public const int abc_text_size_display_4_material = 2131230791;
 			
-			// aapt resource value: 0x7F070040
-			public const int abc_text_size_headline_material = 2131165248;
+			// aapt resource value: 0x7f080048
+			public const int abc_text_size_headline_material = 2131230792;
 			
-			// aapt resource value: 0x7F070041
-			public const int abc_text_size_large_material = 2131165249;
+			// aapt resource value: 0x7f080049
+			public const int abc_text_size_large_material = 2131230793;
 			
-			// aapt resource value: 0x7F070042
-			public const int abc_text_size_medium_material = 2131165250;
+			// aapt resource value: 0x7f08004a
+			public const int abc_text_size_medium_material = 2131230794;
 			
-			// aapt resource value: 0x7F070043
-			public const int abc_text_size_menu_header_material = 2131165251;
+			// aapt resource value: 0x7f08004b
+			public const int abc_text_size_menu_header_material = 2131230795;
 			
-			// aapt resource value: 0x7F070044
-			public const int abc_text_size_menu_material = 2131165252;
+			// aapt resource value: 0x7f08004c
+			public const int abc_text_size_menu_material = 2131230796;
 			
-			// aapt resource value: 0x7F070045
-			public const int abc_text_size_small_material = 2131165253;
+			// aapt resource value: 0x7f08004d
+			public const int abc_text_size_small_material = 2131230797;
 			
-			// aapt resource value: 0x7F070046
-			public const int abc_text_size_subhead_material = 2131165254;
+			// aapt resource value: 0x7f08004e
+			public const int abc_text_size_subhead_material = 2131230798;
 			
-			// aapt resource value: 0x7F070047
-			public const int abc_text_size_subtitle_material_toolbar = 2131165255;
+			// aapt resource value: 0x7f080009
+			public const int abc_text_size_subtitle_material_toolbar = 2131230729;
 			
-			// aapt resource value: 0x7F070048
-			public const int abc_text_size_title_material = 2131165256;
+			// aapt resource value: 0x7f08004f
+			public const int abc_text_size_title_material = 2131230799;
 			
-			// aapt resource value: 0x7F070049
-			public const int abc_text_size_title_material_toolbar = 2131165257;
+			// aapt resource value: 0x7f08000a
+			public const int abc_text_size_title_material_toolbar = 2131230730;
 			
-			// aapt resource value: 0x7F07004A
-			public const int compat_button_inset_horizontal_material = 2131165258;
+			// aapt resource value: 0x7f08008b
+			public const int compat_button_inset_horizontal_material = 2131230859;
 			
-			// aapt resource value: 0x7F07004B
-			public const int compat_button_inset_vertical_material = 2131165259;
+			// aapt resource value: 0x7f08008c
+			public const int compat_button_inset_vertical_material = 2131230860;
 			
-			// aapt resource value: 0x7F07004C
-			public const int compat_button_padding_horizontal_material = 2131165260;
+			// aapt resource value: 0x7f08008d
+			public const int compat_button_padding_horizontal_material = 2131230861;
 			
-			// aapt resource value: 0x7F07004D
-			public const int compat_button_padding_vertical_material = 2131165261;
+			// aapt resource value: 0x7f08008e
+			public const int compat_button_padding_vertical_material = 2131230862;
 			
-			// aapt resource value: 0x7F07004E
-			public const int compat_control_corner_material = 2131165262;
+			// aapt resource value: 0x7f08008f
+			public const int compat_control_corner_material = 2131230863;
 			
-			// aapt resource value: 0x7F07004F
-			public const int design_appbar_elevation = 2131165263;
+			// aapt resource value: 0x7f080069
+			public const int design_appbar_elevation = 2131230825;
 			
-			// aapt resource value: 0x7F070050
-			public const int design_bottom_navigation_active_item_max_width = 2131165264;
+			// aapt resource value: 0x7f08006a
+			public const int design_bottom_navigation_active_item_max_width = 2131230826;
 			
-			// aapt resource value: 0x7F070051
-			public const int design_bottom_navigation_active_text_size = 2131165265;
+			// aapt resource value: 0x7f08006b
+			public const int design_bottom_navigation_active_text_size = 2131230827;
 			
-			// aapt resource value: 0x7F070052
-			public const int design_bottom_navigation_elevation = 2131165266;
+			// aapt resource value: 0x7f08006c
+			public const int design_bottom_navigation_elevation = 2131230828;
 			
-			// aapt resource value: 0x7F070053
-			public const int design_bottom_navigation_height = 2131165267;
+			// aapt resource value: 0x7f08006d
+			public const int design_bottom_navigation_height = 2131230829;
 			
-			// aapt resource value: 0x7F070054
-			public const int design_bottom_navigation_item_max_width = 2131165268;
+			// aapt resource value: 0x7f08006e
+			public const int design_bottom_navigation_item_max_width = 2131230830;
 			
-			// aapt resource value: 0x7F070055
-			public const int design_bottom_navigation_item_min_width = 2131165269;
+			// aapt resource value: 0x7f08006f
+			public const int design_bottom_navigation_item_min_width = 2131230831;
 			
-			// aapt resource value: 0x7F070056
-			public const int design_bottom_navigation_margin = 2131165270;
+			// aapt resource value: 0x7f080070
+			public const int design_bottom_navigation_margin = 2131230832;
 			
-			// aapt resource value: 0x7F070057
-			public const int design_bottom_navigation_shadow_height = 2131165271;
+			// aapt resource value: 0x7f080071
+			public const int design_bottom_navigation_shadow_height = 2131230833;
 			
-			// aapt resource value: 0x7F070058
-			public const int design_bottom_navigation_text_size = 2131165272;
+			// aapt resource value: 0x7f080072
+			public const int design_bottom_navigation_text_size = 2131230834;
 			
-			// aapt resource value: 0x7F070059
-			public const int design_bottom_sheet_modal_elevation = 2131165273;
+			// aapt resource value: 0x7f080073
+			public const int design_bottom_sheet_modal_elevation = 2131230835;
 			
-			// aapt resource value: 0x7F07005A
-			public const int design_bottom_sheet_peek_height_min = 2131165274;
+			// aapt resource value: 0x7f080074
+			public const int design_bottom_sheet_peek_height_min = 2131230836;
 			
-			// aapt resource value: 0x7F07005B
-			public const int design_fab_border_width = 2131165275;
+			// aapt resource value: 0x7f080075
+			public const int design_fab_border_width = 2131230837;
 			
-			// aapt resource value: 0x7F07005C
-			public const int design_fab_elevation = 2131165276;
+			// aapt resource value: 0x7f080076
+			public const int design_fab_elevation = 2131230838;
 			
-			// aapt resource value: 0x7F07005D
-			public const int design_fab_image_size = 2131165277;
+			// aapt resource value: 0x7f080077
+			public const int design_fab_image_size = 2131230839;
 			
-			// aapt resource value: 0x7F07005E
-			public const int design_fab_size_mini = 2131165278;
+			// aapt resource value: 0x7f080078
+			public const int design_fab_size_mini = 2131230840;
 			
-			// aapt resource value: 0x7F07005F
-			public const int design_fab_size_normal = 2131165279;
+			// aapt resource value: 0x7f080079
+			public const int design_fab_size_normal = 2131230841;
 			
-			// aapt resource value: 0x7F070060
-			public const int design_fab_translation_z_pressed = 2131165280;
+			// aapt resource value: 0x7f08007a
+			public const int design_fab_translation_z_pressed = 2131230842;
 			
-			// aapt resource value: 0x7F070061
-			public const int design_navigation_elevation = 2131165281;
+			// aapt resource value: 0x7f08007b
+			public const int design_navigation_elevation = 2131230843;
 			
-			// aapt resource value: 0x7F070062
-			public const int design_navigation_icon_padding = 2131165282;
+			// aapt resource value: 0x7f08007c
+			public const int design_navigation_icon_padding = 2131230844;
 			
-			// aapt resource value: 0x7F070063
-			public const int design_navigation_icon_size = 2131165283;
+			// aapt resource value: 0x7f08007d
+			public const int design_navigation_icon_size = 2131230845;
 			
-			// aapt resource value: 0x7F070064
-			public const int design_navigation_max_width = 2131165284;
+			// aapt resource value: 0x7f080061
+			public const int design_navigation_max_width = 2131230817;
 			
-			// aapt resource value: 0x7F070065
-			public const int design_navigation_padding_bottom = 2131165285;
+			// aapt resource value: 0x7f08007e
+			public const int design_navigation_padding_bottom = 2131230846;
 			
-			// aapt resource value: 0x7F070066
-			public const int design_navigation_separator_vertical_padding = 2131165286;
+			// aapt resource value: 0x7f08007f
+			public const int design_navigation_separator_vertical_padding = 2131230847;
 			
-			// aapt resource value: 0x7F070067
-			public const int design_snackbar_action_inline_max_width = 2131165287;
+			// aapt resource value: 0x7f080062
+			public const int design_snackbar_action_inline_max_width = 2131230818;
 			
-			// aapt resource value: 0x7F070068
-			public const int design_snackbar_background_corner_radius = 2131165288;
+			// aapt resource value: 0x7f080063
+			public const int design_snackbar_background_corner_radius = 2131230819;
 			
-			// aapt resource value: 0x7F070069
-			public const int design_snackbar_elevation = 2131165289;
+			// aapt resource value: 0x7f080080
+			public const int design_snackbar_elevation = 2131230848;
 			
-			// aapt resource value: 0x7F07006A
-			public const int design_snackbar_extra_spacing_horizontal = 2131165290;
+			// aapt resource value: 0x7f080064
+			public const int design_snackbar_extra_spacing_horizontal = 2131230820;
 			
-			// aapt resource value: 0x7F07006B
-			public const int design_snackbar_max_width = 2131165291;
+			// aapt resource value: 0x7f080065
+			public const int design_snackbar_max_width = 2131230821;
 			
-			// aapt resource value: 0x7F07006C
-			public const int design_snackbar_min_width = 2131165292;
+			// aapt resource value: 0x7f080066
+			public const int design_snackbar_min_width = 2131230822;
 			
-			// aapt resource value: 0x7F07006D
-			public const int design_snackbar_padding_horizontal = 2131165293;
+			// aapt resource value: 0x7f080081
+			public const int design_snackbar_padding_horizontal = 2131230849;
 			
-			// aapt resource value: 0x7F07006E
-			public const int design_snackbar_padding_vertical = 2131165294;
+			// aapt resource value: 0x7f080082
+			public const int design_snackbar_padding_vertical = 2131230850;
 			
-			// aapt resource value: 0x7F07006F
-			public const int design_snackbar_padding_vertical_2lines = 2131165295;
+			// aapt resource value: 0x7f080067
+			public const int design_snackbar_padding_vertical_2lines = 2131230823;
 			
-			// aapt resource value: 0x7F070070
-			public const int design_snackbar_text_size = 2131165296;
+			// aapt resource value: 0x7f080083
+			public const int design_snackbar_text_size = 2131230851;
 			
-			// aapt resource value: 0x7F070071
-			public const int design_tab_max_width = 2131165297;
+			// aapt resource value: 0x7f080084
+			public const int design_tab_max_width = 2131230852;
 			
-			// aapt resource value: 0x7F070072
-			public const int design_tab_scrollable_min_width = 2131165298;
+			// aapt resource value: 0x7f080068
+			public const int design_tab_scrollable_min_width = 2131230824;
 			
-			// aapt resource value: 0x7F070073
-			public const int design_tab_text_size = 2131165299;
+			// aapt resource value: 0x7f080085
+			public const int design_tab_text_size = 2131230853;
 			
-			// aapt resource value: 0x7F070074
-			public const int design_tab_text_size_2line = 2131165300;
+			// aapt resource value: 0x7f080086
+			public const int design_tab_text_size_2line = 2131230854;
 			
-			// aapt resource value: 0x7F070075
-			public const int disabled_alpha_material_dark = 2131165301;
+			// aapt resource value: 0x7f080050
+			public const int disabled_alpha_material_dark = 2131230800;
 			
-			// aapt resource value: 0x7F070076
-			public const int disabled_alpha_material_light = 2131165302;
+			// aapt resource value: 0x7f080051
+			public const int disabled_alpha_material_light = 2131230801;
 			
-			// aapt resource value: 0x7F070077
-			public const int fastscroll_default_thickness = 2131165303;
+			// aapt resource value: 0x7f080000
+			public const int fastscroll_default_thickness = 2131230720;
 			
-			// aapt resource value: 0x7F070078
-			public const int fastscroll_margin = 2131165304;
+			// aapt resource value: 0x7f080001
+			public const int fastscroll_margin = 2131230721;
 			
-			// aapt resource value: 0x7F070079
-			public const int fastscroll_minimum_range = 2131165305;
+			// aapt resource value: 0x7f080002
+			public const int fastscroll_minimum_range = 2131230722;
 			
-			// aapt resource value: 0x7F07007A
-			public const int fingerprint_icon_size = 2131165306;
+			// aapt resource value: 0x7f08009c
+			public const int fingerprint_icon_size = 2131230876;
 			
-			// aapt resource value: 0x7F07007B
-			public const int fingerprint_status_layout_margin_vertical = 2131165307;
+			// aapt resource value: 0x7f08009b
+			public const int fingerprint_status_layout_margin_vertical = 2131230875;
 			
-			// aapt resource value: 0x7F07007C
-			public const int highlight_alpha_material_colored = 2131165308;
+			// aapt resource value: 0x7f080052
+			public const int highlight_alpha_material_colored = 2131230802;
 			
-			// aapt resource value: 0x7F07007D
-			public const int highlight_alpha_material_dark = 2131165309;
+			// aapt resource value: 0x7f080053
+			public const int highlight_alpha_material_dark = 2131230803;
 			
-			// aapt resource value: 0x7F07007E
-			public const int highlight_alpha_material_light = 2131165310;
+			// aapt resource value: 0x7f080054
+			public const int highlight_alpha_material_light = 2131230804;
 			
-			// aapt resource value: 0x7F07007F
-			public const int hint_alpha_material_dark = 2131165311;
+			// aapt resource value: 0x7f080055
+			public const int hint_alpha_material_dark = 2131230805;
 			
-			// aapt resource value: 0x7F070080
-			public const int hint_alpha_material_light = 2131165312;
+			// aapt resource value: 0x7f080056
+			public const int hint_alpha_material_light = 2131230806;
 			
-			// aapt resource value: 0x7F070081
-			public const int hint_pressed_alpha_material_dark = 2131165313;
+			// aapt resource value: 0x7f080057
+			public const int hint_pressed_alpha_material_dark = 2131230807;
 			
-			// aapt resource value: 0x7F070082
-			public const int hint_pressed_alpha_material_light = 2131165314;
+			// aapt resource value: 0x7f080058
+			public const int hint_pressed_alpha_material_light = 2131230808;
 			
-			// aapt resource value: 0x7F070083
-			public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
+			// aapt resource value: 0x7f080003
+			public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
 			
-			// aapt resource value: 0x7F070084
-			public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
+			// aapt resource value: 0x7f080004
+			public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
 			
-			// aapt resource value: 0x7F070085
-			public const int item_touch_helper_swipe_escape_velocity = 2131165317;
+			// aapt resource value: 0x7f080005
+			public const int item_touch_helper_swipe_escape_velocity = 2131230725;
 			
-			// aapt resource value: 0x7F070086
-			public const int notification_action_icon_size = 2131165318;
+			// aapt resource value: 0x7f080090
+			public const int notification_action_icon_size = 2131230864;
 			
-			// aapt resource value: 0x7F070087
-			public const int notification_action_text_size = 2131165319;
+			// aapt resource value: 0x7f080091
+			public const int notification_action_text_size = 2131230865;
 			
-			// aapt resource value: 0x7F070088
-			public const int notification_big_circle_margin = 2131165320;
+			// aapt resource value: 0x7f080092
+			public const int notification_big_circle_margin = 2131230866;
 			
-			// aapt resource value: 0x7F070089
-			public const int notification_content_margin_start = 2131165321;
+			// aapt resource value: 0x7f080088
+			public const int notification_content_margin_start = 2131230856;
 			
-			// aapt resource value: 0x7F07008A
-			public const int notification_large_icon_height = 2131165322;
+			// aapt resource value: 0x7f080093
+			public const int notification_large_icon_height = 2131230867;
 			
-			// aapt resource value: 0x7F07008B
-			public const int notification_large_icon_width = 2131165323;
+			// aapt resource value: 0x7f080094
+			public const int notification_large_icon_width = 2131230868;
 			
-			// aapt resource value: 0x7F07008C
-			public const int notification_main_column_padding_top = 2131165324;
+			// aapt resource value: 0x7f080089
+			public const int notification_main_column_padding_top = 2131230857;
 			
-			// aapt resource value: 0x7F07008D
-			public const int notification_media_narrow_margin = 2131165325;
+			// aapt resource value: 0x7f08008a
+			public const int notification_media_narrow_margin = 2131230858;
 			
-			// aapt resource value: 0x7F07008E
-			public const int notification_right_icon_size = 2131165326;
+			// aapt resource value: 0x7f080095
+			public const int notification_right_icon_size = 2131230869;
 			
-			// aapt resource value: 0x7F07008F
-			public const int notification_right_side_padding_top = 2131165327;
+			// aapt resource value: 0x7f080087
+			public const int notification_right_side_padding_top = 2131230855;
 			
-			// aapt resource value: 0x7F070090
-			public const int notification_small_icon_background_padding = 2131165328;
+			// aapt resource value: 0x7f080096
+			public const int notification_small_icon_background_padding = 2131230870;
 			
-			// aapt resource value: 0x7F070091
-			public const int notification_small_icon_size_as_large = 2131165329;
+			// aapt resource value: 0x7f080097
+			public const int notification_small_icon_size_as_large = 2131230871;
 			
-			// aapt resource value: 0x7F070092
-			public const int notification_subtext_size = 2131165330;
+			// aapt resource value: 0x7f080098
+			public const int notification_subtext_size = 2131230872;
 			
-			// aapt resource value: 0x7F070093
-			public const int notification_top_pad = 2131165331;
+			// aapt resource value: 0x7f080099
+			public const int notification_top_pad = 2131230873;
 			
-			// aapt resource value: 0x7F070094
-			public const int notification_top_pad_large_text = 2131165332;
+			// aapt resource value: 0x7f08009a
+			public const int notification_top_pad_large_text = 2131230874;
 			
-			// aapt resource value: 0x7F070095
-			public const int pickerview_textsize = 2131165333;
+			// aapt resource value: 0x7f08009d
+			public const int pickerview_textsize = 2131230877;
 			
-			// aapt resource value: 0x7F070096
-			public const int pickerview_topbar_btn_textsize = 2131165334;
+			// aapt resource value: 0x7f08009e
+			public const int pickerview_topbar_btn_textsize = 2131230878;
 			
-			// aapt resource value: 0x7F070097
-			public const int pickerview_topbar_height = 2131165335;
+			// aapt resource value: 0x7f08009f
+			public const int pickerview_topbar_height = 2131230879;
 			
-			// aapt resource value: 0x7F070098
-			public const int pickerview_topbar_padding = 2131165336;
+			// aapt resource value: 0x7f0800a0
+			public const int pickerview_topbar_padding = 2131230880;
 			
-			// aapt resource value: 0x7F070099
-			public const int pickerview_topbar_title_textsize = 2131165337;
+			// aapt resource value: 0x7f0800a1
+			public const int pickerview_topbar_title_textsize = 2131230881;
 			
-			// aapt resource value: 0x7F07009A
-			public const int tooltip_corner_radius = 2131165338;
+			// aapt resource value: 0x7f080059
+			public const int tooltip_corner_radius = 2131230809;
 			
-			// aapt resource value: 0x7F07009B
-			public const int tooltip_horizontal_padding = 2131165339;
+			// aapt resource value: 0x7f08005a
+			public const int tooltip_horizontal_padding = 2131230810;
 			
-			// aapt resource value: 0x7F07009C
-			public const int tooltip_margin = 2131165340;
+			// aapt resource value: 0x7f08005b
+			public const int tooltip_margin = 2131230811;
 			
-			// aapt resource value: 0x7F07009D
-			public const int tooltip_precise_anchor_extra_offset = 2131165341;
+			// aapt resource value: 0x7f08005c
+			public const int tooltip_precise_anchor_extra_offset = 2131230812;
 			
-			// aapt resource value: 0x7F07009E
-			public const int tooltip_precise_anchor_threshold = 2131165342;
+			// aapt resource value: 0x7f08005d
+			public const int tooltip_precise_anchor_threshold = 2131230813;
 			
-			// aapt resource value: 0x7F07009F
-			public const int tooltip_vertical_padding = 2131165343;
+			// aapt resource value: 0x7f08005e
+			public const int tooltip_vertical_padding = 2131230814;
 			
-			// aapt resource value: 0x7F0700A0
-			public const int tooltip_y_offset_non_touch = 2131165344;
+			// aapt resource value: 0x7f08005f
+			public const int tooltip_y_offset_non_touch = 2131230815;
 			
-			// aapt resource value: 0x7F0700A1
-			public const int tooltip_y_offset_touch = 2131165345;
+			// aapt resource value: 0x7f080060
+			public const int tooltip_y_offset_touch = 2131230816;
 			
 			static Dimension()
 			{
@@ -2552,533 +2552,563 @@
 		public partial class Drawable
 		{
 			
-			// aapt resource value: 0x7F080007
-			public const int abc_ab_share_pack_mtrl_alpha = 2131230727;
+			// aapt resource value: 0x7f020000
+			public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
 			
-			// aapt resource value: 0x7F080008
-			public const int abc_action_bar_item_background_material = 2131230728;
+			// aapt resource value: 0x7f020001
+			public const int abc_action_bar_item_background_material = 2130837505;
 			
-			// aapt resource value: 0x7F080009
-			public const int abc_btn_borderless_material = 2131230729;
+			// aapt resource value: 0x7f020002
+			public const int abc_btn_borderless_material = 2130837506;
 			
-			// aapt resource value: 0x7F08000A
-			public const int abc_btn_check_material = 2131230730;
+			// aapt resource value: 0x7f020003
+			public const int abc_btn_check_material = 2130837507;
 			
-			// aapt resource value: 0x7F08000B
-			public const int abc_btn_check_to_on_mtrl_000 = 2131230731;
+			// aapt resource value: 0x7f020004
+			public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
 			
-			// aapt resource value: 0x7F08000C
-			public const int abc_btn_check_to_on_mtrl_015 = 2131230732;
+			// aapt resource value: 0x7f020005
+			public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
 			
-			// aapt resource value: 0x7F08000D
-			public const int abc_btn_colored_material = 2131230733;
+			// aapt resource value: 0x7f020006
+			public const int abc_btn_colored_material = 2130837510;
 			
-			// aapt resource value: 0x7F08000E
-			public const int abc_btn_default_mtrl_shape = 2131230734;
+			// aapt resource value: 0x7f020007
+			public const int abc_btn_default_mtrl_shape = 2130837511;
 			
-			// aapt resource value: 0x7F08000F
-			public const int abc_btn_radio_material = 2131230735;
+			// aapt resource value: 0x7f020008
+			public const int abc_btn_radio_material = 2130837512;
 			
-			// aapt resource value: 0x7F080010
-			public const int abc_btn_radio_to_on_mtrl_000 = 2131230736;
+			// aapt resource value: 0x7f020009
+			public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
 			
-			// aapt resource value: 0x7F080011
-			public const int abc_btn_radio_to_on_mtrl_015 = 2131230737;
+			// aapt resource value: 0x7f02000a
+			public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
 			
-			// aapt resource value: 0x7F080012
-			public const int abc_btn_switch_to_on_mtrl_00001 = 2131230738;
+			// aapt resource value: 0x7f02000b
+			public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
 			
-			// aapt resource value: 0x7F080013
-			public const int abc_btn_switch_to_on_mtrl_00012 = 2131230739;
+			// aapt resource value: 0x7f02000c
+			public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
 			
-			// aapt resource value: 0x7F080014
-			public const int abc_cab_background_internal_bg = 2131230740;
+			// aapt resource value: 0x7f02000d
+			public const int abc_cab_background_internal_bg = 2130837517;
 			
-			// aapt resource value: 0x7F080015
-			public const int abc_cab_background_top_material = 2131230741;
+			// aapt resource value: 0x7f02000e
+			public const int abc_cab_background_top_material = 2130837518;
 			
-			// aapt resource value: 0x7F080016
-			public const int abc_cab_background_top_mtrl_alpha = 2131230742;
+			// aapt resource value: 0x7f02000f
+			public const int abc_cab_background_top_mtrl_alpha = 2130837519;
 			
-			// aapt resource value: 0x7F080017
-			public const int abc_control_background_material = 2131230743;
+			// aapt resource value: 0x7f020010
+			public const int abc_control_background_material = 2130837520;
 			
-			// aapt resource value: 0x7F080018
-			public const int abc_dialog_material_background = 2131230744;
+			// aapt resource value: 0x7f020011
+			public const int abc_dialog_material_background = 2130837521;
 			
-			// aapt resource value: 0x7F080019
-			public const int abc_edit_text_material = 2131230745;
+			// aapt resource value: 0x7f020012
+			public const int abc_edit_text_material = 2130837522;
 			
-			// aapt resource value: 0x7F08001A
-			public const int abc_ic_ab_back_material = 2131230746;
+			// aapt resource value: 0x7f020013
+			public const int abc_ic_ab_back_material = 2130837523;
 			
-			// aapt resource value: 0x7F08001B
-			public const int abc_ic_arrow_drop_right_black_24dp = 2131230747;
+			// aapt resource value: 0x7f020014
+			public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
 			
-			// aapt resource value: 0x7F08001C
-			public const int abc_ic_clear_material = 2131230748;
+			// aapt resource value: 0x7f020015
+			public const int abc_ic_clear_material = 2130837525;
 			
-			// aapt resource value: 0x7F08001D
-			public const int abc_ic_commit_search_api_mtrl_alpha = 2131230749;
+			// aapt resource value: 0x7f020016
+			public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
 			
-			// aapt resource value: 0x7F08001E
-			public const int abc_ic_go_search_api_material = 2131230750;
+			// aapt resource value: 0x7f020017
+			public const int abc_ic_go_search_api_material = 2130837527;
 			
-			// aapt resource value: 0x7F08001F
-			public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230751;
+			// aapt resource value: 0x7f020018
+			public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
 			
-			// aapt resource value: 0x7F080020
-			public const int abc_ic_menu_cut_mtrl_alpha = 2131230752;
+			// aapt resource value: 0x7f020019
+			public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
 			
-			// aapt resource value: 0x7F080021
-			public const int abc_ic_menu_overflow_material = 2131230753;
+			// aapt resource value: 0x7f02001a
+			public const int abc_ic_menu_overflow_material = 2130837530;
 			
-			// aapt resource value: 0x7F080022
-			public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230754;
+			// aapt resource value: 0x7f02001b
+			public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
 			
-			// aapt resource value: 0x7F080023
-			public const int abc_ic_menu_selectall_mtrl_alpha = 2131230755;
+			// aapt resource value: 0x7f02001c
+			public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
 			
-			// aapt resource value: 0x7F080024
-			public const int abc_ic_menu_share_mtrl_alpha = 2131230756;
+			// aapt resource value: 0x7f02001d
+			public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
 			
-			// aapt resource value: 0x7F080025
-			public const int abc_ic_search_api_material = 2131230757;
+			// aapt resource value: 0x7f02001e
+			public const int abc_ic_search_api_material = 2130837534;
 			
-			// aapt resource value: 0x7F080026
-			public const int abc_ic_star_black_16dp = 2131230758;
+			// aapt resource value: 0x7f02001f
+			public const int abc_ic_star_black_16dp = 2130837535;
 			
-			// aapt resource value: 0x7F080027
-			public const int abc_ic_star_black_36dp = 2131230759;
+			// aapt resource value: 0x7f020020
+			public const int abc_ic_star_black_36dp = 2130837536;
 			
-			// aapt resource value: 0x7F080028
-			public const int abc_ic_star_black_48dp = 2131230760;
+			// aapt resource value: 0x7f020021
+			public const int abc_ic_star_black_48dp = 2130837537;
 			
-			// aapt resource value: 0x7F080029
-			public const int abc_ic_star_half_black_16dp = 2131230761;
+			// aapt resource value: 0x7f020022
+			public const int abc_ic_star_half_black_16dp = 2130837538;
 			
-			// aapt resource value: 0x7F08002A
-			public const int abc_ic_star_half_black_36dp = 2131230762;
+			// aapt resource value: 0x7f020023
+			public const int abc_ic_star_half_black_36dp = 2130837539;
 			
-			// aapt resource value: 0x7F08002B
-			public const int abc_ic_star_half_black_48dp = 2131230763;
+			// aapt resource value: 0x7f020024
+			public const int abc_ic_star_half_black_48dp = 2130837540;
 			
-			// aapt resource value: 0x7F08002C
-			public const int abc_ic_voice_search_api_material = 2131230764;
+			// aapt resource value: 0x7f020025
+			public const int abc_ic_voice_search_api_material = 2130837541;
 			
-			// aapt resource value: 0x7F08002D
-			public const int abc_item_background_holo_dark = 2131230765;
+			// aapt resource value: 0x7f020026
+			public const int abc_item_background_holo_dark = 2130837542;
 			
-			// aapt resource value: 0x7F08002E
-			public const int abc_item_background_holo_light = 2131230766;
+			// aapt resource value: 0x7f020027
+			public const int abc_item_background_holo_light = 2130837543;
 			
-			// aapt resource value: 0x7F08002F
-			public const int abc_list_divider_mtrl_alpha = 2131230767;
+			// aapt resource value: 0x7f020028
+			public const int abc_list_divider_mtrl_alpha = 2130837544;
 			
-			// aapt resource value: 0x7F080030
-			public const int abc_list_focused_holo = 2131230768;
+			// aapt resource value: 0x7f020029
+			public const int abc_list_focused_holo = 2130837545;
 			
-			// aapt resource value: 0x7F080031
-			public const int abc_list_longpressed_holo = 2131230769;
+			// aapt resource value: 0x7f02002a
+			public const int abc_list_longpressed_holo = 2130837546;
 			
-			// aapt resource value: 0x7F080032
-			public const int abc_list_pressed_holo_dark = 2131230770;
+			// aapt resource value: 0x7f02002b
+			public const int abc_list_pressed_holo_dark = 2130837547;
 			
-			// aapt resource value: 0x7F080033
-			public const int abc_list_pressed_holo_light = 2131230771;
+			// aapt resource value: 0x7f02002c
+			public const int abc_list_pressed_holo_light = 2130837548;
 			
-			// aapt resource value: 0x7F080034
-			public const int abc_list_selector_background_transition_holo_dark = 2131230772;
+			// aapt resource value: 0x7f02002d
+			public const int abc_list_selector_background_transition_holo_dark = 2130837549;
 			
-			// aapt resource value: 0x7F080035
-			public const int abc_list_selector_background_transition_holo_light = 2131230773;
+			// aapt resource value: 0x7f02002e
+			public const int abc_list_selector_background_transition_holo_light = 2130837550;
 			
-			// aapt resource value: 0x7F080036
-			public const int abc_list_selector_disabled_holo_dark = 2131230774;
+			// aapt resource value: 0x7f02002f
+			public const int abc_list_selector_disabled_holo_dark = 2130837551;
 			
-			// aapt resource value: 0x7F080037
-			public const int abc_list_selector_disabled_holo_light = 2131230775;
+			// aapt resource value: 0x7f020030
+			public const int abc_list_selector_disabled_holo_light = 2130837552;
 			
-			// aapt resource value: 0x7F080038
-			public const int abc_list_selector_holo_dark = 2131230776;
+			// aapt resource value: 0x7f020031
+			public const int abc_list_selector_holo_dark = 2130837553;
 			
-			// aapt resource value: 0x7F080039
-			public const int abc_list_selector_holo_light = 2131230777;
+			// aapt resource value: 0x7f020032
+			public const int abc_list_selector_holo_light = 2130837554;
 			
-			// aapt resource value: 0x7F08003A
-			public const int abc_menu_hardkey_panel_mtrl_mult = 2131230778;
+			// aapt resource value: 0x7f020033
+			public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
 			
-			// aapt resource value: 0x7F08003B
-			public const int abc_popup_background_mtrl_mult = 2131230779;
+			// aapt resource value: 0x7f020034
+			public const int abc_popup_background_mtrl_mult = 2130837556;
 			
-			// aapt resource value: 0x7F08003C
-			public const int abc_ratingbar_indicator_material = 2131230780;
+			// aapt resource value: 0x7f020035
+			public const int abc_ratingbar_indicator_material = 2130837557;
 			
-			// aapt resource value: 0x7F08003D
-			public const int abc_ratingbar_material = 2131230781;
+			// aapt resource value: 0x7f020036
+			public const int abc_ratingbar_material = 2130837558;
 			
-			// aapt resource value: 0x7F08003E
-			public const int abc_ratingbar_small_material = 2131230782;
+			// aapt resource value: 0x7f020037
+			public const int abc_ratingbar_small_material = 2130837559;
 			
-			// aapt resource value: 0x7F08003F
-			public const int abc_scrubber_control_off_mtrl_alpha = 2131230783;
+			// aapt resource value: 0x7f020038
+			public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
 			
-			// aapt resource value: 0x7F080040
-			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230784;
+			// aapt resource value: 0x7f020039
+			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
 			
-			// aapt resource value: 0x7F080041
-			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230785;
+			// aapt resource value: 0x7f02003a
+			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
 			
-			// aapt resource value: 0x7F080042
-			public const int abc_scrubber_primary_mtrl_alpha = 2131230786;
+			// aapt resource value: 0x7f02003b
+			public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
 			
-			// aapt resource value: 0x7F080043
-			public const int abc_scrubber_track_mtrl_alpha = 2131230787;
+			// aapt resource value: 0x7f02003c
+			public const int abc_scrubber_track_mtrl_alpha = 2130837564;
 			
-			// aapt resource value: 0x7F080044
-			public const int abc_seekbar_thumb_material = 2131230788;
+			// aapt resource value: 0x7f02003d
+			public const int abc_seekbar_thumb_material = 2130837565;
 			
-			// aapt resource value: 0x7F080045
-			public const int abc_seekbar_tick_mark_material = 2131230789;
+			// aapt resource value: 0x7f02003e
+			public const int abc_seekbar_tick_mark_material = 2130837566;
 			
-			// aapt resource value: 0x7F080046
-			public const int abc_seekbar_track_material = 2131230790;
+			// aapt resource value: 0x7f02003f
+			public const int abc_seekbar_track_material = 2130837567;
 			
-			// aapt resource value: 0x7F080047
-			public const int abc_spinner_mtrl_am_alpha = 2131230791;
+			// aapt resource value: 0x7f020040
+			public const int abc_spinner_mtrl_am_alpha = 2130837568;
 			
-			// aapt resource value: 0x7F080048
-			public const int abc_spinner_textfield_background_material = 2131230792;
+			// aapt resource value: 0x7f020041
+			public const int abc_spinner_textfield_background_material = 2130837569;
 			
-			// aapt resource value: 0x7F080049
-			public const int abc_switch_thumb_material = 2131230793;
+			// aapt resource value: 0x7f020042
+			public const int abc_switch_thumb_material = 2130837570;
 			
-			// aapt resource value: 0x7F08004A
-			public const int abc_switch_track_mtrl_alpha = 2131230794;
+			// aapt resource value: 0x7f020043
+			public const int abc_switch_track_mtrl_alpha = 2130837571;
 			
-			// aapt resource value: 0x7F08004B
-			public const int abc_tab_indicator_material = 2131230795;
+			// aapt resource value: 0x7f020044
+			public const int abc_tab_indicator_material = 2130837572;
 			
-			// aapt resource value: 0x7F08004C
-			public const int abc_tab_indicator_mtrl_alpha = 2131230796;
+			// aapt resource value: 0x7f020045
+			public const int abc_tab_indicator_mtrl_alpha = 2130837573;
 			
-			// aapt resource value: 0x7F080054
-			public const int abc_textfield_activated_mtrl_alpha = 2131230804;
+			// aapt resource value: 0x7f020046
+			public const int abc_text_cursor_material = 2130837574;
 			
-			// aapt resource value: 0x7F080055
-			public const int abc_textfield_default_mtrl_alpha = 2131230805;
+			// aapt resource value: 0x7f020047
+			public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
 			
-			// aapt resource value: 0x7F080056
-			public const int abc_textfield_search_activated_mtrl_alpha = 2131230806;
+			// aapt resource value: 0x7f020048
+			public const int abc_text_select_handle_left_mtrl_light = 2130837576;
 			
-			// aapt resource value: 0x7F080057
-			public const int abc_textfield_search_default_mtrl_alpha = 2131230807;
+			// aapt resource value: 0x7f020049
+			public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
 			
-			// aapt resource value: 0x7F080058
-			public const int abc_textfield_search_material = 2131230808;
+			// aapt resource value: 0x7f02004a
+			public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
 			
-			// aapt resource value: 0x7F08004D
-			public const int abc_text_cursor_material = 2131230797;
+			// aapt resource value: 0x7f02004b
+			public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
 			
-			// aapt resource value: 0x7F08004E
-			public const int abc_text_select_handle_left_mtrl_dark = 2131230798;
+			// aapt resource value: 0x7f02004c
+			public const int abc_text_select_handle_right_mtrl_light = 2130837580;
 			
-			// aapt resource value: 0x7F08004F
-			public const int abc_text_select_handle_left_mtrl_light = 2131230799;
+			// aapt resource value: 0x7f02004d
+			public const int abc_textfield_activated_mtrl_alpha = 2130837581;
 			
-			// aapt resource value: 0x7F080050
-			public const int abc_text_select_handle_middle_mtrl_dark = 2131230800;
+			// aapt resource value: 0x7f02004e
+			public const int abc_textfield_default_mtrl_alpha = 2130837582;
 			
-			// aapt resource value: 0x7F080051
-			public const int abc_text_select_handle_middle_mtrl_light = 2131230801;
+			// aapt resource value: 0x7f02004f
+			public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
 			
-			// aapt resource value: 0x7F080052
-			public const int abc_text_select_handle_right_mtrl_dark = 2131230802;
+			// aapt resource value: 0x7f020050
+			public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
 			
-			// aapt resource value: 0x7F080053
-			public const int abc_text_select_handle_right_mtrl_light = 2131230803;
+			// aapt resource value: 0x7f020051
+			public const int abc_textfield_search_material = 2130837585;
 			
-			// aapt resource value: 0x7F080059
-			public const int abc_vector_test = 2131230809;
+			// aapt resource value: 0x7f020052
+			public const int abc_vector_test = 2130837586;
 			
-			// aapt resource value: 0x7F08005A
-			public const int avd_hide_password = 2131230810;
+			// aapt resource value: 0x7f020053
+			public const int avd_hide_password = 2130837587;
 			
-			// aapt resource value: 0x7F08005B
-			public const int avd_show_password = 2131230811;
+			// aapt resource value: 0x7f0200b3
+			public const int avd_hide_password_1 = 2130837683;
+			
+			// aapt resource value: 0x7f0200b4
+			public const int avd_hide_password_2 = 2130837684;
+			
+			// aapt resource value: 0x7f0200b5
+			public const int avd_hide_password_3 = 2130837685;
+			
+			// aapt resource value: 0x7f020054
+			public const int avd_show_password = 2130837588;
+			
+			// aapt resource value: 0x7f0200b6
+			public const int avd_show_password_1 = 2130837686;
+			
+			// aapt resource value: 0x7f0200b7
+			public const int avd_show_password_2 = 2130837687;
+			
+			// aapt resource value: 0x7f0200b8
+			public const int avd_show_password_3 = 2130837688;
+			
+			// aapt resource value: 0x7f020055
+			public const int back = 2130837589;
+			
+			// aapt resource value: 0x7f020056
+			public const int call = 2130837590;
+			
+			// aapt resource value: 0x7f020057
+			public const int design_bottom_navigation_item_background = 2130837591;
+			
+			// aapt resource value: 0x7f020058
+			public const int design_fab_background = 2130837592;
 			
-			// aapt resource value: 0x7F08005C
-			public const int back = 2131230812;
+			// aapt resource value: 0x7f020059
+			public const int design_ic_visibility = 2130837593;
 			
-			// aapt resource value: 0x7F08005D
-			public const int call = 2131230813;
+			// aapt resource value: 0x7f02005a
+			public const int design_ic_visibility_off = 2130837594;
 			
-			// aapt resource value: 0x7F08005E
-			public const int design_bottom_navigation_item_background = 2131230814;
+			// aapt resource value: 0x7f02005b
+			public const int design_password_eye = 2130837595;
 			
-			// aapt resource value: 0x7F08005F
-			public const int design_fab_background = 2131230815;
+			// aapt resource value: 0x7f02005c
+			public const int design_snackbar_background = 2130837596;
 			
-			// aapt resource value: 0x7F080060
-			public const int design_ic_visibility = 2131230816;
+			// aapt resource value: 0x7f02005d
+			public const int dialog_background = 2130837597;
 			
-			// aapt resource value: 0x7F080061
-			public const int design_ic_visibility_off = 2131230817;
+			// aapt resource value: 0x7f02005e
+			public const int fingerprint_draw_off = 2130837598;
 			
-			// aapt resource value: 0x7F080062
-			public const int design_password_eye = 2131230818;
+			// aapt resource value: 0x7f02005f
+			public const int fingerprint_draw_off_animation = 2130837599;
 			
-			// aapt resource value: 0x7F080063
-			public const int design_snackbar_background = 2131230819;
+			// aapt resource value: 0x7f020060
+			public const int fingerprint_draw_on = 2130837600;
 			
-			// aapt resource value: 0x7F080064
-			public const int dialog_background = 2131230820;
+			// aapt resource value: 0x7f020061
+			public const int fingerprint_draw_on_animation = 2130837601;
 			
-			// aapt resource value: 0x7F080065
-			public const int fingerprint_draw_off = 2131230821;
+			// aapt resource value: 0x7f020062
+			public const int fingerprint_error = 2130837602;
 			
-			// aapt resource value: 0x7F080066
-			public const int fingerprint_draw_off_animation = 2131230822;
+			// aapt resource value: 0x7f020063
+			public const int fingerprint_error_off = 2130837603;
 			
-			// aapt resource value: 0x7F080067
-			public const int fingerprint_draw_on = 2131230823;
+			// aapt resource value: 0x7f020064
+			public const int fingerprint_error_off_animation = 2130837604;
 			
-			// aapt resource value: 0x7F080068
-			public const int fingerprint_draw_on_animation = 2131230824;
+			// aapt resource value: 0x7f020065
+			public const int fingerprint_error_on = 2130837605;
 			
-			// aapt resource value: 0x7F080069
-			public const int fingerprint_error = 2131230825;
+			// aapt resource value: 0x7f020066
+			public const int fingerprint_error_on_animation = 2130837606;
 			
-			// aapt resource value: 0x7F08006A
-			public const int fingerprint_error_off = 2131230826;
+			// aapt resource value: 0x7f020067
+			public const int fingerprint_error_state_to_fp = 2130837607;
 			
-			// aapt resource value: 0x7F08006B
-			public const int fingerprint_error_off_animation = 2131230827;
+			// aapt resource value: 0x7f020068
+			public const int fingerprint_error_state_to_fp_animation = 2130837608;
 			
-			// aapt resource value: 0x7F08006C
-			public const int fingerprint_error_on = 2131230828;
+			// aapt resource value: 0x7f020069
+			public const int fingerprint_fingerprint = 2130837609;
 			
-			// aapt resource value: 0x7F08006D
-			public const int fingerprint_error_on_animation = 2131230829;
+			// aapt resource value: 0x7f02006a
+			public const int fingerprint_fp_to_error_state = 2130837610;
 			
-			// aapt resource value: 0x7F08006E
-			public const int fingerprint_error_state_to_fp = 2131230830;
+			// aapt resource value: 0x7f02006b
+			public const int fingerprint_fp_to_error_state_animation = 2130837611;
 			
-			// aapt resource value: 0x7F08006F
-			public const int fingerprint_error_state_to_fp_animation = 2131230831;
+			// aapt resource value: 0x7f02006c
+			public const int floor = 2130837612;
 			
-			// aapt resource value: 0x7F080070
-			public const int fingerprint_fingerprint = 2131230832;
+			// aapt resource value: 0x7f02006d
+			public const int gd_btn_shape_app_b = 2130837613;
 			
-			// aapt resource value: 0x7F080071
-			public const int fingerprint_fp_to_error_state = 2131230833;
+			// aapt resource value: 0x7f02006e
+			public const int gd_btn_shape_app_g = 2130837614;
 			
-			// aapt resource value: 0x7F080072
-			public const int fingerprint_fp_to_error_state_animation = 2131230834;
+			// aapt resource value: 0x7f02006f
+			public const int gd_btn_shape_app_w = 2130837615;
 			
-			// aapt resource value: 0x7F080073
-			public const int floor = 2131230835;
+			// aapt resource value: 0x7f020070
+			public const int gd_btn_shape_shadow_w = 2130837616;
 			
-			// aapt resource value: 0x7F080074
-			public const int gd_btn_shape_app_b = 2131230836;
+			// aapt resource value: 0x7f020071
+			public const int gd_click_effect_select = 2130837617;
 			
-			// aapt resource value: 0x7F080075
-			public const int gd_btn_shape_app_g = 2131230837;
+			// aapt resource value: 0x7f020072
+			public const int hangup = 2130837618;
 			
-			// aapt resource value: 0x7F080076
-			public const int gd_btn_shape_app_w = 2131230838;
+			// aapt resource value: 0x7f020073
+			public const int ic_gdmap_add = 2130837619;
 			
-			// aapt resource value: 0x7F080077
-			public const int gd_btn_shape_shadow_w = 2131230839;
+			// aapt resource value: 0x7f020074
+			public const int ic_gdmap_back = 2130837620;
 			
-			// aapt resource value: 0x7F080078
-			public const int gd_click_effect_select = 2131230840;
+			// aapt resource value: 0x7f020075
+			public const int ic_gdmap_delete = 2130837621;
 			
-			// aapt resource value: 0x7F080079
-			public const int hangup = 2131230841;
+			// aapt resource value: 0x7f020076
+			public const int ic_gdmap_home = 2130837622;
 			
-			// aapt resource value: 0x7F08009A
-			public const int Icon = 2131230874;
+			// aapt resource value: 0x7f020077
+			public const int ic_gdmap_mylocation = 2130837623;
 			
-			// aapt resource value: 0x7F08007A
-			public const int ic_gdmap_add = 2131230842;
+			// aapt resource value: 0x7f020078
+			public const int ic_gdmap_now = 2130837624;
 			
-			// aapt resource value: 0x7F08007B
-			public const int ic_gdmap_back = 2131230843;
+			// aapt resource value: 0x7f020079
+			public const int ic_gdmap_search = 2130837625;
 			
-			// aapt resource value: 0x7F08007C
-			public const int ic_gdmap_delete = 2131230844;
+			// aapt resource value: 0x7f02007a
+			public const int ic_gdmap_zoom_out = 2130837626;
 			
-			// aapt resource value: 0x7F08007D
-			public const int ic_gdmap_home = 2131230845;
+			// aapt resource value: 0x7f02007b
+			public const int ic_gps_point = 2130837627;
 			
-			// aapt resource value: 0x7F08007E
-			public const int ic_gdmap_mylocation = 2131230846;
+			// aapt resource value: 0x7f02007c
+			public const int ic_launcher_background = 2130837628;
 			
-			// aapt resource value: 0x7F08007F
-			public const int ic_gdmap_now = 2131230847;
+			// aapt resource value: 0x7f02007d
+			public const int ic_launcher_foreground = 2130837629;
 			
-			// aapt resource value: 0x7F080080
-			public const int ic_gdmap_search = 2131230848;
+			// aapt resource value: 0x7f0200b9
+			public const int ic_launcher_foreground_1 = 2130837689;
 			
-			// aapt resource value: 0x7F080081
-			public const int ic_gdmap_zoom_out = 2131230849;
+			// aapt resource value: 0x7f02007e
+			public const int ic_wd_arc_scale_bg = 2130837630;
 			
-			// aapt resource value: 0x7F080082
-			public const int ic_gps_point = 2131230850;
+			// aapt resource value: 0x7f02007f
+			public const int ic_wd_curtain_bg_top = 2130837631;
 			
-			// aapt resource value: 0x7F080083
-			public const int ic_launcher_background = 2131230851;
+			// aapt resource value: 0x7f020080
+			public const int ic_wd_curtain_h_bg = 2130837632;
 			
-			// aapt resource value: 0x7F080084
-			public const int ic_launcher_foreground = 2131230852;
+			// aapt resource value: 0x7f020081
+			public const int ic_wd_curtain_h_open = 2130837633;
 			
-			// aapt resource value: 0x7F080085
-			public const int ic_wd_arc_scale_bg = 2131230853;
+			// aapt resource value: 0x7f020082
+			public const int ic_wd_curtain_h_progress = 2130837634;
 			
-			// aapt resource value: 0x7F080086
-			public const int ic_wd_curtain_bg_top = 2131230854;
+			// aapt resource value: 0x7f020083
+			public const int ic_wd_curtain_h_top = 2130837635;
 			
-			// aapt resource value: 0x7F080087
-			public const int ic_wd_curtain_h_bg = 2131230855;
+			// aapt resource value: 0x7f020084
+			public const int ic_wd_curtain_open = 2130837636;
 			
-			// aapt resource value: 0x7F080088
-			public const int ic_wd_curtain_h_open = 2131230856;
+			// aapt resource value: 0x7f020085
+			public const int ic_wd_curtain_roll_bg = 2130837637;
 			
-			// aapt resource value: 0x7F080089
-			public const int ic_wd_curtain_h_progress = 2131230857;
+			// aapt resource value: 0x7f020086
+			public const int ic_wd_curtain_roll_progress = 2130837638;
 			
-			// aapt resource value: 0x7F08008A
-			public const int ic_wd_curtain_h_top = 2131230858;
+			// aapt resource value: 0x7f020087
+			public const int ic_wd_on_curtain_blinds_progress = 2130837639;
 			
-			// aapt resource value: 0x7F08008B
-			public const int ic_wd_curtain_open = 2131230859;
+			// aapt resource value: 0x7f020088
+			public const int ic_wd_on_curtain_blinds_progress2 = 2130837640;
 			
-			// aapt resource value: 0x7F08008C
-			public const int ic_wd_curtain_roll_bg = 2131230860;
+			// aapt resource value: 0x7f020089
+			public const int ic_wd_on_curtain_blinds_progress_close = 2130837641;
 			
-			// aapt resource value: 0x7F08008D
-			public const int ic_wd_curtain_roll_progress = 2131230861;
+			// aapt resource value: 0x7f02008a
+			public const int ic_wd_on_curtain_blinds_progress_close2 = 2130837642;
 			
-			// aapt resource value: 0x7F08008E
-			public const int ic_wd_on_curtain_blinds_progress = 2131230862;
+			// aapt resource value: 0x7f02008b
+			public const int ic_wd_on_curtain_h_bg = 2130837643;
 			
-			// aapt resource value: 0x7F08008F
-			public const int ic_wd_on_curtain_blinds_progress2 = 2131230863;
+			// aapt resource value: 0x7f02008c
+			public const int ic_wd_on_curtain_h_open = 2130837644;
 			
-			// aapt resource value: 0x7F080090
-			public const int ic_wd_on_curtain_blinds_progress_close = 2131230864;
+			// aapt resource value: 0x7f02008d
+			public const int ic_wd_on_curtain_h_progress = 2130837645;
 			
-			// aapt resource value: 0x7F080091
-			public const int ic_wd_on_curtain_blinds_progress_close2 = 2131230865;
+			// aapt resource value: 0x7f02008e
+			public const int ic_wd_on_curtain_h_progress_close = 2130837646;
 			
-			// aapt resource value: 0x7F080092
-			public const int ic_wd_on_curtain_h_bg = 2131230866;
+			// aapt resource value: 0x7f02008f
+			public const int ic_wd_on_curtain_open = 2130837647;
 			
-			// aapt resource value: 0x7F080093
-			public const int ic_wd_on_curtain_h_open = 2131230867;
+			// aapt resource value: 0x7f020090
+			public const int ic_wd_on_curtain_roll_bg = 2130837648;
 			
-			// aapt resource value: 0x7F080094
-			public const int ic_wd_on_curtain_h_progress = 2131230868;
+			// aapt resource value: 0x7f020091
+			public const int ic_wd_on_curtain_roll_progress = 2130837649;
 			
-			// aapt resource value: 0x7F080095
-			public const int ic_wd_on_curtain_h_progress_close = 2131230869;
+			// aapt resource value: 0x7f020092
+			public const int ic_wd_on_curtain_roll_progress_close = 2130837650;
 			
-			// aapt resource value: 0x7F080096
-			public const int ic_wd_on_curtain_open = 2131230870;
+			// aapt resource value: 0x7f020093
+			public const int Icon = 2130837651;
 			
-			// aapt resource value: 0x7F080097
-			public const int ic_wd_on_curtain_roll_bg = 2131230871;
+			// aapt resource value: 0x7f020094
+			public const int leak_canary_icon = 2130837652;
 			
-			// aapt resource value: 0x7F080098
-			public const int ic_wd_on_curtain_roll_progress = 2131230872;
+			// aapt resource value: 0x7f020095
+			public const int leak_canary_notification = 2130837653;
 			
-			// aapt resource value: 0x7F080099
-			public const int ic_wd_on_curtain_roll_progress_close = 2131230873;
+			// aapt resource value: 0x7f020096
+			public const int leak_canary_toast_background = 2130837654;
 			
-			// aapt resource value: 0x7F08009B
-			public const int Loading = 2131230875;
+			// aapt resource value: 0x7f020097
+			public const int Loading = 2130837655;
 			
-			// aapt resource value: 0x7F08009C
-			public const int navigation_empty_icon = 2131230876;
+			// aapt resource value: 0x7f020098
+			public const int navigation_empty_icon = 2130837656;
 			
-			// aapt resource value: 0x7F08009D
-			public const int notification_action_background = 2131230877;
+			// aapt resource value: 0x7f020099
+			public const int notification_action_background = 2130837657;
 			
-			// aapt resource value: 0x7F08009E
-			public const int notification_bg = 2131230878;
+			// aapt resource value: 0x7f02009a
+			public const int notification_bg = 2130837658;
 			
-			// aapt resource value: 0x7F08009F
-			public const int notification_bg_low = 2131230879;
+			// aapt resource value: 0x7f02009b
+			public const int notification_bg_low = 2130837659;
 			
-			// aapt resource value: 0x7F0800A0
-			public const int notification_bg_low_normal = 2131230880;
+			// aapt resource value: 0x7f02009c
+			public const int notification_bg_low_normal = 2130837660;
 			
-			// aapt resource value: 0x7F0800A1
-			public const int notification_bg_low_pressed = 2131230881;
+			// aapt resource value: 0x7f02009d
+			public const int notification_bg_low_pressed = 2130837661;
 			
-			// aapt resource value: 0x7F0800A2
-			public const int notification_bg_normal = 2131230882;
+			// aapt resource value: 0x7f02009e
+			public const int notification_bg_normal = 2130837662;
 			
-			// aapt resource value: 0x7F0800A3
-			public const int notification_bg_normal_pressed = 2131230883;
+			// aapt resource value: 0x7f02009f
+			public const int notification_bg_normal_pressed = 2130837663;
 			
-			// aapt resource value: 0x7F0800A4
-			public const int notification_icon_background = 2131230884;
+			// aapt resource value: 0x7f0200a0
+			public const int notification_icon_background = 2130837664;
 			
-			// aapt resource value: 0x7F0800A5
-			public const int notification_template_icon_bg = 2131230885;
+			// aapt resource value: 0x7f0200b1
+			public const int notification_template_icon_bg = 2130837681;
 			
-			// aapt resource value: 0x7F0800A6
-			public const int notification_template_icon_low_bg = 2131230886;
+			// aapt resource value: 0x7f0200b2
+			public const int notification_template_icon_low_bg = 2130837682;
 			
-			// aapt resource value: 0x7F0800A7
-			public const int notification_tile_bg = 2131230887;
+			// aapt resource value: 0x7f0200a1
+			public const int notification_tile_bg = 2130837665;
 			
-			// aapt resource value: 0x7F0800A8
-			public const int notify_panel_notification_icon_bg = 2131230888;
+			// aapt resource value: 0x7f0200a2
+			public const int notify_panel_notification_icon_bg = 2130837666;
 			
-			// aapt resource value: 0x7F0800A9
-			public const int screenshot = 2131230889;
+			// aapt resource value: 0x7f0200a3
+			public const int screenshot = 2130837667;
 			
-			// aapt resource value: 0x7F0800AA
-			public const int screenshot_def = 2131230890;
+			// aapt resource value: 0x7f0200a4
+			public const int screenshot_def = 2130837668;
 			
-			// aapt resource value: 0x7F0800AB
-			public const int screenshot_sel = 2131230891;
+			// aapt resource value: 0x7f0200a5
+			public const int screenshot_sel = 2130837669;
 			
-			// aapt resource value: 0x7F0800AC
-			public const int selector_pickerview_btn = 2131230892;
+			// aapt resource value: 0x7f0200a6
+			public const int selector_pickerview_btn = 2130837670;
 			
-			// aapt resource value: 0x7F0800AD
-			public const int sure_background_def = 2131230893;
+			// aapt resource value: 0x7f0200a7
+			public const int sure_background_def = 2130837671;
 			
-			// aapt resource value: 0x7F0800AE
-			public const int sure_background_sel = 2131230894;
+			// aapt resource value: 0x7f0200a8
+			public const int sure_background_sel = 2130837672;
 			
-			// aapt resource value: 0x7F0800AF
-			public const int tip_background = 2131230895;
+			// aapt resource value: 0x7f0200a9
+			public const int tip_background = 2130837673;
 			
-			// aapt resource value: 0x7F0800B0
-			public const int tooltip_frame_dark = 2131230896;
+			// aapt resource value: 0x7f0200aa
+			public const int tooltip_frame_dark = 2130837674;
 			
-			// aapt resource value: 0x7F0800B1
-			public const int tooltip_frame_light = 2131230897;
+			// aapt resource value: 0x7f0200ab
+			public const int tooltip_frame_light = 2130837675;
 			
-			// aapt resource value: 0x7F0800B2
-			public const int unlock = 2131230898;
+			// aapt resource value: 0x7f0200ac
+			public const int unlock = 2130837676;
 			
-			// aapt resource value: 0x7F0800B3
-			public const int unlock_def = 2131230899;
+			// aapt resource value: 0x7f0200ad
+			public const int unlock_def = 2130837677;
 			
-			// aapt resource value: 0x7F0800B4
-			public const int unlock_disable = 2131230900;
+			// aapt resource value: 0x7f0200ae
+			public const int unlock_disable = 2130837678;
 			
-			// aapt resource value: 0x7F0800B5
-			public const int unlock_sel = 2131230901;
+			// aapt resource value: 0x7f0200af
+			public const int unlock_sel = 2130837679;
 			
-			// aapt resource value: 0x7F0800B6
-			public const int video_background = 2131230902;
+			// aapt resource value: 0x7f0200b0
+			public const int video_background = 2130837680;
 			
 			static Drawable()
 			{
@@ -3093,905 +3123,926 @@
 		public partial class Id
 		{
 			
-			// aapt resource value: 0x7F090015
-			public const int action0 = 2131296277;
+			// aapt resource value: 0x7f090027
+			public const int ALT = 2131296295;
 			
-			// aapt resource value: 0x7F090027
-			public const int actions = 2131296295;
+			// aapt resource value: 0x7f090028
+			public const int CTRL = 2131296296;
 			
-			// aapt resource value: 0x7F090016
-			public const int action_bar = 2131296278;
+			// aapt resource value: 0x7f09008e
+			public const int Custom = 2131296398;
 			
-			// aapt resource value: 0x7F090017
-			public const int action_bar_activity_content = 2131296279;
+			// aapt resource value: 0x7f09008d
+			public const int CustomLabel = 2131296397;
 			
-			// aapt resource value: 0x7F090018
-			public const int action_bar_container = 2131296280;
+			// aapt resource value: 0x7f090054
+			public const int FILL = 2131296340;
 			
-			// aapt resource value: 0x7F090019
-			public const int action_bar_root = 2131296281;
+			// aapt resource value: 0x7f090055
+			public const int FILL_STROKE = 2131296341;
 			
-			// aapt resource value: 0x7F09001A
-			public const int action_bar_spinner = 2131296282;
+			// aapt resource value: 0x7f090029
+			public const int FUNCTION = 2131296297;
 			
-			// aapt resource value: 0x7F09001B
-			public const int action_bar_subtitle = 2131296283;
+			// aapt resource value: 0x7f09004f
+			public const int FixedBehind = 2131296335;
 			
-			// aapt resource value: 0x7F09001C
-			public const int action_bar_title = 2131296284;
+			// aapt resource value: 0x7f090050
+			public const int FixedFront = 2131296336;
 			
-			// aapt resource value: 0x7F09001D
-			public const int action_container = 2131296285;
+			// aapt resource value: 0x7f09002a
+			public const int META = 2131296298;
 			
-			// aapt resource value: 0x7F09001E
-			public const int action_context_bar = 2131296286;
+			// aapt resource value: 0x7f090051
+			public const int MatchLayout = 2131296337;
 			
-			// aapt resource value: 0x7F09001F
-			public const int action_divider = 2131296287;
+			// aapt resource value: 0x7f090088
+			public const int Notice = 2131296392;
 			
-			// aapt resource value: 0x7F090020
-			public const int action_image = 2131296288;
+			// aapt resource value: 0x7f09008c
+			public const int Password = 2131296396;
 			
-			// aapt resource value: 0x7F090021
-			public const int action_menu_divider = 2131296289;
+			// aapt resource value: 0x7f09008b
+			public const int PasswordLabel = 2131296395;
 			
-			// aapt resource value: 0x7F090022
-			public const int action_menu_presenter = 2131296290;
+			// aapt resource value: 0x7f09002b
+			public const int SHIFT = 2131296299;
 			
-			// aapt resource value: 0x7F090023
-			public const int action_mode_bar = 2131296291;
+			// aapt resource value: 0x7f09008a
+			public const int SSID = 2131296394;
 			
-			// aapt resource value: 0x7F090024
-			public const int action_mode_bar_stub = 2131296292;
+			// aapt resource value: 0x7f090089
+			public const int SSIDLabel = 2131296393;
 			
-			// aapt resource value: 0x7F090025
-			public const int action_mode_close_button = 2131296293;
+			// aapt resource value: 0x7f090056
+			public const int STROKE = 2131296342;
 			
-			// aapt resource value: 0x7F090026
-			public const int action_text = 2131296294;
+			// aapt resource value: 0x7f09002c
+			public const int SYM = 2131296300;
 			
-			// aapt resource value: 0x7F090028
-			public const int activity_chooser_view_content = 2131296296;
+			// aapt resource value: 0x7f090052
+			public const int Scale = 2131296338;
 			
-			// aapt resource value: 0x7F090029
-			public const int add = 2131296297;
+			// aapt resource value: 0x7f090053
+			public const int Translate = 2131296339;
 			
-			// aapt resource value: 0x7F09002A
-			public const int alertTitle = 2131296298;
+			// aapt resource value: 0x7f0900ec
+			public const int action0 = 2131296492;
 			
-			// aapt resource value: 0x7F09002B
-			public const int all = 2131296299;
+			// aapt resource value: 0x7f090079
+			public const int action_bar = 2131296377;
 			
-			// aapt resource value: 0x7F090000
-			public const int ALT = 2131296256;
+			// aapt resource value: 0x7f090001
+			public const int action_bar_activity_content = 2131296257;
 			
-			// aapt resource value: 0x7F09002C
-			public const int always = 2131296300;
+			// aapt resource value: 0x7f090078
+			public const int action_bar_container = 2131296376;
 			
-			// aapt resource value: 0x7F09002D
-			public const int async = 2131296301;
+			// aapt resource value: 0x7f090074
+			public const int action_bar_root = 2131296372;
 			
-			// aapt resource value: 0x7F09002E
-			public const int auto = 2131296302;
+			// aapt resource value: 0x7f090002
+			public const int action_bar_spinner = 2131296258;
 			
-			// aapt resource value: 0x7F09002F
-			public const int autoAccept = 2131296303;
+			// aapt resource value: 0x7f090058
+			public const int action_bar_subtitle = 2131296344;
 			
-			// aapt resource value: 0x7F090030
-			public const int autoTest = 2131296304;
+			// aapt resource value: 0x7f090057
+			public const int action_bar_title = 2131296343;
 			
-			// aapt resource value: 0x7F090031
-			public const int beginning = 2131296305;
+			// aapt resource value: 0x7f0900e9
+			public const int action_container = 2131296489;
 			
-			// aapt resource value: 0x7F090032
-			public const int blocking = 2131296306;
+			// aapt resource value: 0x7f09007a
+			public const int action_context_bar = 2131296378;
 			
-			// aapt resource value: 0x7F090033
-			public const int bottom = 2131296307;
+			// aapt resource value: 0x7f0900f0
+			public const int action_divider = 2131296496;
 			
-			// aapt resource value: 0x7F090034
-			public const int btnCancel = 2131296308;
+			// aapt resource value: 0x7f0900ea
+			public const int action_image = 2131296490;
 			
-			// aapt resource value: 0x7F090035
-			public const int btnSubmit = 2131296309;
+			// aapt resource value: 0x7f090003
+			public const int action_menu_divider = 2131296259;
 			
-			// aapt resource value: 0x7F090036
-			public const int buttonPanel = 2131296310;
+			// aapt resource value: 0x7f090004
+			public const int action_menu_presenter = 2131296260;
 			
-			// aapt resource value: 0x7F090037
-			public const int call_accept = 2131296311;
+			// aapt resource value: 0x7f090076
+			public const int action_mode_bar = 2131296374;
 			
-			// aapt resource value: 0x7F090038
-			public const int camera0 = 2131296312;
+			// aapt resource value: 0x7f090075
+			public const int action_mode_bar_stub = 2131296373;
 			
-			// aapt resource value: 0x7F090039
-			public const int camera1 = 2131296313;
+			// aapt resource value: 0x7f090059
+			public const int action_mode_close_button = 2131296345;
 			
-			// aapt resource value: 0x7F09003A
-			public const int cancel_action = 2131296314;
+			// aapt resource value: 0x7f0900eb
+			public const int action_text = 2131296491;
 			
-			// aapt resource value: 0x7F09003B
-			public const int center = 2131296315;
+			// aapt resource value: 0x7f0900f9
+			public const int actions = 2131296505;
 			
-			// aapt resource value: 0x7F09003C
-			public const int center_horizontal = 2131296316;
+			// aapt resource value: 0x7f09005a
+			public const int activity_chooser_view_content = 2131296346;
 			
-			// aapt resource value: 0x7F09003D
-			public const int center_vertical = 2131296317;
+			// aapt resource value: 0x7f090021
+			public const int add = 2131296289;
 			
-			// aapt resource value: 0x7F09003E
-			public const int checkbox = 2131296318;
+			// aapt resource value: 0x7f09006d
+			public const int alertTitle = 2131296365;
 			
-			// aapt resource value: 0x7F09003F
-			public const int chronometer = 2131296319;
+			// aapt resource value: 0x7f090047
+			public const int all = 2131296327;
 			
-			// aapt resource value: 0x7F090040
-			public const int clip_horizontal = 2131296320;
+			// aapt resource value: 0x7f09002d
+			public const int always = 2131296301;
 			
-			// aapt resource value: 0x7F090041
-			public const int clip_vertical = 2131296321;
+			// aapt resource value: 0x7f09004b
+			public const int async = 2131296331;
 			
-			// aapt resource value: 0x7F090042
-			public const int collapseActionView = 2131296322;
+			// aapt resource value: 0x7f090039
+			public const int auto = 2131296313;
 			
-			// aapt resource value: 0x7F090043
-			public const int configAVMsg = 2131296323;
+			// aapt resource value: 0x7f090102
+			public const int autoAccept = 2131296514;
 			
-			// aapt resource value: 0x7F090044
-			public const int container = 2131296324;
+			// aapt resource value: 0x7f090103
+			public const int autoTest = 2131296515;
 			
-			// aapt resource value: 0x7F090045
-			public const int content = 2131296325;
+			// aapt resource value: 0x7f090024
+			public const int beginning = 2131296292;
 			
-			// aapt resource value: 0x7F090046
-			public const int contentFrame = 2131296326;
+			// aapt resource value: 0x7f09004c
+			public const int blocking = 2131296332;
 			
-			// aapt resource value: 0x7F090047
-			public const int contentPanel = 2131296327;
+			// aapt resource value: 0x7f090032
+			public const int bottom = 2131296306;
 			
-			// aapt resource value: 0x7F090048
-			public const int content_container = 2131296328;
+			// aapt resource value: 0x7f0900cd
+			public const int btnCancel = 2131296461;
 			
-			// aapt resource value: 0x7F090049
-			public const int coordinator = 2131296329;
+			// aapt resource value: 0x7f0900cf
+			public const int btnSubmit = 2131296463;
 			
-			// aapt resource value: 0x7F090001
-			public const int CTRL = 2131296257;
+			// aapt resource value: 0x7f090060
+			public const int buttonPanel = 2131296352;
 			
-			// aapt resource value: 0x7F090002
-			public const int Custom = 2131296258;
+			// aapt resource value: 0x7f090104
+			public const int call_accept = 2131296516;
 			
-			// aapt resource value: 0x7F09004A
-			public const int custom = 2131296330;
+			// aapt resource value: 0x7f090128
+			public const int camera0 = 2131296552;
 			
-			// aapt resource value: 0x7F090003
-			public const int CustomLabel = 2131296259;
+			// aapt resource value: 0x7f090129
+			public const int camera1 = 2131296553;
 			
-			// aapt resource value: 0x7F09004B
-			public const int customPanel = 2131296331;
+			// aapt resource value: 0x7f0900ed
+			public const int cancel_action = 2131296493;
 			
-			// aapt resource value: 0x7F09004C
-			public const int day = 2131296332;
+			// aapt resource value: 0x7f09003a
+			public const int center = 2131296314;
 			
-			// aapt resource value: 0x7F09004D
-			public const int decor_content_parent = 2131296333;
+			// aapt resource value: 0x7f09003b
+			public const int center_horizontal = 2131296315;
 			
-			// aapt resource value: 0x7F09004E
-			public const int default_activity_button = 2131296334;
+			// aapt resource value: 0x7f09003c
+			public const int center_vertical = 2131296316;
 			
-			// aapt resource value: 0x7F09004F
-			public const int description = 2131296335;
+			// aapt resource value: 0x7f090070
+			public const int checkbox = 2131296368;
 			
-			// aapt resource value: 0x7F090050
-			public const int design_bottom_sheet = 2131296336;
+			// aapt resource value: 0x7f0900f5
+			public const int chronometer = 2131296501;
 			
-			// aapt resource value: 0x7F090051
-			public const int design_menu_item_action_area = 2131296337;
+			// aapt resource value: 0x7f090043
+			public const int clip_horizontal = 2131296323;
 			
-			// aapt resource value: 0x7F090052
-			public const int design_menu_item_action_area_stub = 2131296338;
+			// aapt resource value: 0x7f090044
+			public const int clip_vertical = 2131296324;
 			
-			// aapt resource value: 0x7F090053
-			public const int design_menu_item_text = 2131296339;
+			// aapt resource value: 0x7f09002e
+			public const int collapseActionView = 2131296302;
 			
-			// aapt resource value: 0x7F090054
-			public const int design_navigation_view = 2131296340;
+			// aapt resource value: 0x7f09011e
+			public const int configAVMsg = 2131296542;
 			
-			// aapt resource value: 0x7F090055
-			public const int disableHome = 2131296341;
+			// aapt resource value: 0x7f0900a3
+			public const int container = 2131296419;
 			
-			// aapt resource value: 0x7F090056
-			public const int disableReportBytes = 2131296342;
+			// aapt resource value: 0x7f09009c
+			public const int content = 2131296412;
 			
-			// aapt resource value: 0x7F090057
-			public const int edit_query = 2131296343;
+			// aapt resource value: 0x7f090130
+			public const int contentFrame = 2131296560;
 			
-			// aapt resource value: 0x7F090058
-			public const int enableReportBytes = 2131296344;
+			// aapt resource value: 0x7f090063
+			public const int contentPanel = 2131296355;
 			
-			// aapt resource value: 0x7F090059
-			public const int end = 2131296345;
+			// aapt resource value: 0x7f0900d1
+			public const int content_container = 2131296465;
 			
-			// aapt resource value: 0x7F09005A
-			public const int end_padder = 2131296346;
+			// aapt resource value: 0x7f0900a4
+			public const int coordinator = 2131296420;
 			
-			// aapt resource value: 0x7F09005B
-			public const int enterAlways = 2131296347;
+			// aapt resource value: 0x7f09006a
+			public const int custom = 2131296362;
 			
-			// aapt resource value: 0x7F09005C
-			public const int enterAlwaysCollapsed = 2131296348;
+			// aapt resource value: 0x7f090069
+			public const int customPanel = 2131296361;
 			
-			// aapt resource value: 0x7F09005D
-			public const int exitUntilCollapsed = 2131296349;
+			// aapt resource value: 0x7f0900dd
+			public const int day = 2131296477;
 			
-			// aapt resource value: 0x7F09005F
-			public const int expanded_menu = 2131296351;
+			// aapt resource value: 0x7f090077
+			public const int decor_content_parent = 2131296375;
 			
-			// aapt resource value: 0x7F09005E
-			public const int expand_activities_button = 2131296350;
+			// aapt resource value: 0x7f09005d
+			public const int default_activity_button = 2131296349;
 			
-			// aapt resource value: 0x7F090004
-			public const int FILL = 2131296260;
+			// aapt resource value: 0x7f09009e
+			public const int description = 2131296414;
 			
-			// aapt resource value: 0x7F090060
-			public const int fill = 2131296352;
+			// aapt resource value: 0x7f0900a6
+			public const int design_bottom_sheet = 2131296422;
 			
-			// aapt resource value: 0x7F090061
-			public const int fill_horizontal = 2131296353;
+			// aapt resource value: 0x7f0900ad
+			public const int design_menu_item_action_area = 2131296429;
 			
-			// aapt resource value: 0x7F090005
-			public const int FILL_STROKE = 2131296261;
+			// aapt resource value: 0x7f0900ac
+			public const int design_menu_item_action_area_stub = 2131296428;
 			
-			// aapt resource value: 0x7F090062
-			public const int fill_vertical = 2131296354;
+			// aapt resource value: 0x7f0900ab
+			public const int design_menu_item_text = 2131296427;
 			
-			// aapt resource value: 0x7F090063
-			public const int fingerprint_icon = 2131296355;
+			// aapt resource value: 0x7f0900aa
+			public const int design_navigation_view = 2131296426;
 			
-			// aapt resource value: 0x7F090064
-			public const int @fixed = 2131296356;
+			// aapt resource value: 0x7f090015
+			public const int disableHome = 2131296277;
 			
-			// aapt resource value: 0x7F090007
-			public const int FixedBehind = 2131296263;
+			// aapt resource value: 0x7f09011d
+			public const int disableReportBytes = 2131296541;
+			
+			// aapt resource value: 0x7f09007b
+			public const int edit_query = 2131296379;
+			
+			// aapt resource value: 0x7f09011c
+			public const int enableReportBytes = 2131296540;
+			
+			// aapt resource value: 0x7f090025
+			public const int end = 2131296293;
+			
+			// aapt resource value: 0x7f0900fb
+			public const int end_padder = 2131296507;
+			
+			// 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: 0x7f09009f
+			public const int fingerprint_icon = 2131296415;
+			
+			// aapt resource value: 0x7f090049
+			public const int @fixed = 2131296329;
 			
-			// aapt resource value: 0x7F090008
-			public const int FixedFront = 2131296264;
+			// aapt resource value: 0x7f09004d
+			public const int forever = 2131296333;
 			
-			// aapt resource value: 0x7F090065
-			public const int forever = 2131296357;
+			// aapt resource value: 0x7f0900c2
+			public const int gd_btn_back = 2131296450;
 			
-			// aapt resource value: 0x7F090006
-			public const int FUNCTION = 2131296262;
+			// aapt resource value: 0x7f0900cb
+			public const int gd_btn_myLocation = 2131296459;
 			
-			// aapt resource value: 0x7F090066
-			public const int gd_btn_back = 2131296358;
+			// aapt resource value: 0x7f0900ca
+			public const int gd_btn_save = 2131296458;
 			
-			// aapt resource value: 0x7F090067
-			public const int gd_btn_myLocation = 2131296359;
+			// aapt resource value: 0x7f0900c7
+			public const int gd_img_search_delete = 2131296455;
 			
-			// aapt resource value: 0x7F090068
-			public const int gd_btn_save = 2131296360;
+			// aapt resource value: 0x7f0900c9
+			public const int gd_ll_myhome = 2131296457;
 			
-			// aapt resource value: 0x7F090069
-			public const int gd_img_search_delete = 2131296361;
+			// aapt resource value: 0x7f0900c5
+			public const int gd_ll_search = 2131296453;
 			
-			// aapt resource value: 0x7F09006A
-			public const int gd_ll_myhome = 2131296362;
+			// aapt resource value: 0x7f0900c4
+			public const int gd_mapView = 2131296452;
 			
-			// aapt resource value: 0x7F09006B
-			public const int gd_ll_search = 2131296363;
+			// aapt resource value: 0x7f0900c1
+			public const int gd_rl_topview = 2131296449;
 			
-			// aapt resource value: 0x7F09006C
-			public const int gd_mapView = 2131296364;
+			// aapt resource value: 0x7f0900c3
+			public const int gd_tv_activity_title = 2131296451;
 			
-			// aapt resource value: 0x7F09006D
-			public const int gd_rl_topview = 2131296365;
+			// aapt resource value: 0x7f0900c8
+			public const int gd_tv_radius = 2131296456;
 			
-			// aapt resource value: 0x7F09006E
-			public const int gd_tv_activity_title = 2131296366;
+			// aapt resource value: 0x7f0900c6
+			public const int gd_tv_search_title = 2131296454;
 			
-			// aapt resource value: 0x7F09006F
-			public const int gd_tv_radius = 2131296367;
+			// aapt resource value: 0x7f090106
+			public const int hangup = 2131296518;
 			
-			// aapt resource value: 0x7F090070
-			public const int gd_tv_search_title = 2131296368;
+			// aapt resource value: 0x7f090108
+			public const int hangupMonitorIn = 2131296520;
 			
-			// aapt resource value: 0x7F090071
-			public const int hangup = 2131296369;
+			// aapt resource value: 0x7f0900bf
+			public const int hdl_gallery_rootView = 2131296447;
 			
-			// aapt resource value: 0x7F090072
-			public const int hangupMonitorIn = 2131296370;
+			// aapt resource value: 0x7f0900c0
+			public const int hdl_gallery_viewPager = 2131296448;
 			
-			// aapt resource value: 0x7F090073
-			public const int hdl_gallery_rootView = 2131296371;
+			// aapt resource value: 0x7f0900d3
+			public const int hdl_options1 = 2131296467;
 			
-			// aapt resource value: 0x7F090074
-			public const int hdl_gallery_viewPager = 2131296372;
+			// aapt resource value: 0x7f0900d4
+			public const int hdl_options2 = 2131296468;
 			
-			// aapt resource value: 0x7F090075
-			public const int hdl_options1 = 2131296373;
+			// aapt resource value: 0x7f0900d5
+			public const int hdl_options3 = 2131296469;
 			
-			// aapt resource value: 0x7F090076
-			public const int hdl_options2 = 2131296374;
+			// aapt resource value: 0x7f0900d2
+			public const int hdl_pickerview_ll = 2131296466;
 			
-			// aapt resource value: 0x7F090077
-			public const int hdl_options3 = 2131296375;
+			// aapt resource value: 0x7f090094
+			public const int hide = 2131296404;
 			
-			// aapt resource value: 0x7F090078
-			public const int hdl_pickerview_ll = 2131296376;
+			// aapt resource value: 0x7f090005
+			public const int home = 2131296261;
 			
-			// aapt resource value: 0x7F090079
-			public const int hide = 2131296377;
+			// aapt resource value: 0x7f090016
+			public const int homeAsUp = 2131296278;
 			
-			// aapt resource value: 0x7F09007A
-			public const int home = 2131296378;
+			// aapt resource value: 0x7f0900de
+			public const int hour = 2131296478;
 			
-			// aapt resource value: 0x7F09007B
-			public const int homeAsUp = 2131296379;
+			// aapt resource value: 0x7f09005f
+			public const int icon = 2131296351;
 			
-			// aapt resource value: 0x7F09007C
-			public const int hour = 2131296380;
+			// aapt resource value: 0x7f090098
+			public const int icon_back = 2131296408;
 			
-			// aapt resource value: 0x7F09007D
-			public const int icon = 2131296381;
+			// aapt resource value: 0x7f0900fa
+			public const int icon_group = 2131296506;
 			
-			// aapt resource value: 0x7F09007E
-			public const int icon_back = 2131296382;
+			// aapt resource value: 0x7f0900b2
+			public const int icon_screenshot = 2131296434;
 			
-			// aapt resource value: 0x7F09007F
-			public const int icon_group = 2131296383;
+			// aapt resource value: 0x7f0900b3
+			public const int icon_unlock = 2131296435;
 			
-			// aapt resource value: 0x7F090080
-			public const int icon_screenshot = 2131296384;
+			// aapt resource value: 0x7f09002f
+			public const int ifRoom = 2131296303;
 			
-			// aapt resource value: 0x7F090081
-			public const int icon_unlock = 2131296385;
+			// aapt resource value: 0x7f09005c
+			public const int image = 2131296348;
 			
-			// aapt resource value: 0x7F090082
-			public const int ifRoom = 2131296386;
+			// aapt resource value: 0x7f0900b9
+			public const int img_call = 2131296441;
 			
-			// aapt resource value: 0x7F090083
-			public const int image = 2131296387;
+			// aapt resource value: 0x7f0900b6
+			public const int img_hangup = 2131296438;
 			
-			// aapt resource value: 0x7F090084
-			public const int img_call = 2131296388;
+			// aapt resource value: 0x7f0900f6
+			public const int info = 2131296502;
 			
-			// aapt resource value: 0x7F090085
-			public const int img_hangup = 2131296389;
+			// aapt resource value: 0x7f09004e
+			public const int italic = 2131296334;
 			
-			// aapt resource value: 0x7F090086
-			public const int info = 2131296390;
+			// aapt resource value: 0x7f090000
+			public const int item_touch_helper_previous_elevation = 2131296256;
 			
-			// aapt resource value: 0x7F090087
-			public const int italic = 2131296391;
+			// aapt resource value: 0x7f0900a2
+			public const int largeLabel = 2131296418;
 			
-			// aapt resource value: 0x7F090088
-			public const int item_touch_helper_previous_elevation = 2131296392;
+			// aapt resource value: 0x7f0900e3
+			public const int leak_canary_action = 2131296483;
 			
-			// aapt resource value: 0x7F090089
-			public const int largeLabel = 2131296393;
+			// aapt resource value: 0x7f0900e2
+			public const int leak_canary_display_leak_failure = 2131296482;
 			
-			// aapt resource value: 0x7F09008A
-			public const int left = 2131296394;
+			// aapt resource value: 0x7f0900e1
+			public const int leak_canary_display_leak_list = 2131296481;
 			
-			// aapt resource value: 0x7F09008B
-			public const int line1 = 2131296395;
+			// aapt resource value: 0x7f0900e6
+			public const int leak_canary_row_connector = 2131296486;
 			
-			// aapt resource value: 0x7F09008C
-			public const int line3 = 2131296396;
+			// aapt resource value: 0x7f0900e7
+			public const int leak_canary_row_more = 2131296487;
 			
-			// aapt resource value: 0x7F09008D
-			public const int listMode = 2131296397;
+			// aapt resource value: 0x7f0900e4
+			public const int leak_canary_row_text = 2131296484;
 			
-			// aapt resource value: 0x7F09008E
-			public const int list_item = 2131296398;
+			// aapt resource value: 0x7f0900e5
+			public const int leak_canary_row_time = 2131296485;
 			
-			// aapt resource value: 0x7F09008F
-			public const int localDoorUnlock = 2131296399;
+			// aapt resource value: 0x7f09003e
+			public const int left = 2131296318;
 			
-			// aapt resource value: 0x7F090090
-			public const int localVideo = 2131296400;
+			// aapt resource value: 0x7f09000d
+			public const int line1 = 2131296269;
 			
-			// aapt resource value: 0x7F090091
-			public const int masked = 2131296401;
+			// aapt resource value: 0x7f09000e
+			public const int line3 = 2131296270;
 			
-			// aapt resource value: 0x7F09000A
-			public const int MatchLayout = 2131296266;
+			// aapt resource value: 0x7f090012
+			public const int listMode = 2131296274;
 			
-			// aapt resource value: 0x7F090092
-			public const int media_actions = 2131296402;
+			// aapt resource value: 0x7f09005e
+			public const int list_item = 2131296350;
 			
-			// aapt resource value: 0x7F090093
-			public const int message = 2131296403;
+			// aapt resource value: 0x7f09011a
+			public const int localDoorUnlock = 2131296538;
 			
-			// aapt resource value: 0x7F090009
-			public const int META = 2131296265;
+			// aapt resource value: 0x7f09009a
+			public const int localVideo = 2131296410;
 			
-			// aapt resource value: 0x7F090094
-			public const int middle = 2131296404;
+			// aapt resource value: 0x7f090132
+			public const int masked = 2131296562;
 			
-			// aapt resource value: 0x7F090095
-			public const int min = 2131296405;
+			// aapt resource value: 0x7f0900ef
+			public const int media_actions = 2131296495;
 			
-			// aapt resource value: 0x7F090096
-			public const int mini = 2131296406;
+			// aapt resource value: 0x7f090126
+			public const int message = 2131296550;
 			
-			// aapt resource value: 0x7F090097
-			public const int monitor = 2131296407;
+			// aapt resource value: 0x7f090026
+			public const int middle = 2131296294;
 			
-			// aapt resource value: 0x7F090098
-			public const int month = 2131296408;
+			// aapt resource value: 0x7f0900df
+			public const int min = 2131296479;
 			
-			// aapt resource value: 0x7F090099
-			public const int multiply = 2131296409;
+			// aapt resource value: 0x7f090048
+			public const int mini = 2131296328;
 			
-			// aapt resource value: 0x7F09009A
-			public const int myButton = 2131296410;
+			// aapt resource value: 0x7f090107
+			public const int monitor = 2131296519;
 			
-			// aapt resource value: 0x7F09009B
-			public const int navigation_header_container = 2131296411;
+			// aapt resource value: 0x7f0900dc
+			public const int month = 2131296476;
 			
-			// aapt resource value: 0x7F09009C
-			public const int never = 2131296412;
+			// aapt resource value: 0x7f09001c
+			public const int multiply = 2131296284;
 			
-			// aapt resource value: 0x7F09009D
-			public const int none = 2131296413;
+			// aapt resource value: 0x7f0900e8
+			public const int myButton = 2131296488;
 			
-			// aapt resource value: 0x7F09009E
-			public const int normal = 2131296414;
+			// aapt resource value: 0x7f0900a9
+			public const int navigation_header_container = 2131296425;
 			
-			// aapt resource value: 0x7F09000B
-			public const int Notice = 2131296267;
+			// aapt resource value: 0x7f090030
+			public const int never = 2131296304;
 			
-			// aapt resource value: 0x7F09009F
-			public const int notification_background = 2131296415;
+			// aapt resource value: 0x7f090017
+			public const int none = 2131296279;
 			
-			// aapt resource value: 0x7F0900A0
-			public const int notification_main_column = 2131296416;
+			// aapt resource value: 0x7f090013
+			public const int normal = 2131296275;
 			
-			// aapt resource value: 0x7F0900A1
-			public const int notification_main_column_container = 2131296417;
+			// aapt resource value: 0x7f0900f8
+			public const int notification_background = 2131296504;
 			
-			// aapt resource value: 0x7F0900A2
-			public const int options1 = 2131296418;
+			// aapt resource value: 0x7f0900f2
+			public const int notification_main_column = 2131296498;
 			
-			// aapt resource value: 0x7F0900A3
-			public const int options2 = 2131296419;
+			// aapt resource value: 0x7f0900f1
+			public const int notification_main_column_container = 2131296497;
 			
-			// aapt resource value: 0x7F0900A4
-			public const int options3 = 2131296420;
+			// aapt resource value: 0x7f0900d7
+			public const int options1 = 2131296471;
 			
-			// aapt resource value: 0x7F0900A5
-			public const int optionspicker = 2131296421;
+			// aapt resource value: 0x7f0900d8
+			public const int options2 = 2131296472;
 			
-			// aapt resource value: 0x7F0900A6
-			public const int outmost_container = 2131296422;
+			// aapt resource value: 0x7f0900d9
+			public const int options3 = 2131296473;
 			
-			// aapt resource value: 0x7F0900A7
-			public const int parallax = 2131296423;
+			// aapt resource value: 0x7f0900d6
+			public const int optionspicker = 2131296470;
 			
-			// aapt resource value: 0x7F0900A8
-			public const int parentPanel = 2131296424;
+			// aapt resource value: 0x7f0900d0
+			public const int outmost_container = 2131296464;
 			
-			// aapt resource value: 0x7F09000C
-			public const int Password = 2131296268;
+			// aapt resource value: 0x7f090041
+			public const int parallax = 2131296321;
 			
-			// aapt resource value: 0x7F09000D
-			public const int PasswordLabel = 2131296269;
+			// aapt resource value: 0x7f090062
+			public const int parentPanel = 2131296354;
 			
-			// aapt resource value: 0x7F0900A9
-			public const int peerAddress = 2131296425;
+			// aapt resource value: 0x7f090105
+			public const int peerAddress = 2131296517;
 			
-			// aapt resource value: 0x7F0900AA
-			public const int pin = 2131296426;
+			// aapt resource value: 0x7f090042
+			public const int pin = 2131296322;
 			
-			// aapt resource value: 0x7F0900AB
-			public const int progress_circular = 2131296427;
+			// aapt resource value: 0x7f090006
+			public const int progress_circular = 2131296262;
 			
-			// aapt resource value: 0x7F0900AC
-			public const int progress_horizontal = 2131296428;
+			// aapt resource value: 0x7f090007
+			public const int progress_horizontal = 2131296263;
 			
-			// aapt resource value: 0x7F0900AD
-			public const int radio = 2131296429;
+			// aapt resource value: 0x7f090072
+			public const int radio = 2131296370;
 			
-			// aapt resource value: 0x7F0900AE
-			public const int remoteFrame = 2131296430;
+			// aapt resource value: 0x7f090096
+			public const int remoteFrame = 2131296406;
 			
-			// aapt resource value: 0x7F0900AF
-			public const int remoteFrameContainer = 2131296431;
+			// aapt resource value: 0x7f090095
+			public const int remoteFrameContainer = 2131296405;
 			
-			// aapt resource value: 0x7F0900B0
-			public const int remoteVideo = 2131296432;
+			// aapt resource value: 0x7f090097
+			public const int remoteVideo = 2131296407;
 			
-			// aapt resource value: 0x7F0900B1
-			public const int requestA = 2131296433;
+			// aapt resource value: 0x7f0900fe
+			public const int requestA = 2131296510;
 			
-			// aapt resource value: 0x7F0900B2
-			public const int requestMasterAudio = 2131296434;
+			// aapt resource value: 0x7f090113
+			public const int requestMasterAudio = 2131296531;
 			
-			// aapt resource value: 0x7F0900B3
-			public const int requestMasterVideo = 2131296435;
+			// aapt resource value: 0x7f090114
+			public const int requestMasterVideo = 2131296532;
 			
-			// aapt resource value: 0x7F0900B4
-			public const int requestV = 2131296436;
+			// aapt resource value: 0x7f0900ff
+			public const int requestV = 2131296511;
 			
-			// aapt resource value: 0x7F0900B5
-			public const int reverseCall = 2131296437;
+			// aapt resource value: 0x7f090115
+			public const int reverseCall = 2131296533;
 			
-			// aapt resource value: 0x7F0900B6
-			public const int reverseCallInfo = 2131296438;
+			// aapt resource value: 0x7f090116
+			public const int reverseCallInfo = 2131296534;
 			
-			// aapt resource value: 0x7F0900B7
-			public const int right = 2131296439;
+			// aapt resource value: 0x7f09003f
+			public const int right = 2131296319;
 			
-			// aapt resource value: 0x7F0900B8
-			public const int right_icon = 2131296440;
+			// aapt resource value: 0x7f0900f7
+			public const int right_icon = 2131296503;
 			
-			// aapt resource value: 0x7F0900B9
-			public const int right_side = 2131296441;
+			// aapt resource value: 0x7f0900f3
+			public const int right_side = 2131296499;
 			
-			// aapt resource value: 0x7F0900BA
-			public const int rl_call = 2131296442;
+			// aapt resource value: 0x7f0900b8
+			public const int rl_call = 2131296440;
 			
-			// aapt resource value: 0x7F0900BB
-			public const int rl_hangup = 2131296443;
+			// aapt resource value: 0x7f0900b5
+			public const int rl_hangup = 2131296437;
 			
-			// aapt resource value: 0x7F0900BC
-			public const int rl_sceenshot = 2131296444;
+			// aapt resource value: 0x7f0900bb
+			public const int rl_sceenshot = 2131296443;
 			
-			// aapt resource value: 0x7F0900BD
+			// aapt resource value: 0x7f0900bd
 			public const int rl_unlock = 2131296445;
 			
-			// aapt resource value: 0x7F0900BE
-			public const int rv_topbar = 2131296446;
+			// aapt resource value: 0x7f0900cc
+			public const int rv_topbar = 2131296460;
 			
-			// aapt resource value: 0x7F090013
-			public const int Scale = 2131296275;
+			// aapt resource value: 0x7f09001d
+			public const int screen = 2131296285;
 			
-			// aapt resource value: 0x7F0900BF
-			public const int screen = 2131296447;
+			// aapt resource value: 0x7f090037
+			public const int scroll = 2131296311;
 			
-			// aapt resource value: 0x7F0900C0
-			public const int scroll = 2131296448;
+			// aapt resource value: 0x7f090068
+			public const int scrollIndicatorDown = 2131296360;
 			
-			// aapt resource value: 0x7F0900C4
-			public const int scrollable = 2131296452;
+			// aapt resource value: 0x7f090064
+			public const int scrollIndicatorUp = 2131296356;
 			
-			// aapt resource value: 0x7F0900C1
-			public const int scrollIndicatorDown = 2131296449;
+			// aapt resource value: 0x7f090065
+			public const int scrollView = 2131296357;
 			
-			// aapt resource value: 0x7F0900C2
-			public const int scrollIndicatorUp = 2131296450;
+			// aapt resource value: 0x7f09004a
+			public const int scrollable = 2131296330;
 			
-			// aapt resource value: 0x7F0900C3
-			public const int scrollView = 2131296451;
+			// aapt resource value: 0x7f09007d
+			public const int search_badge = 2131296381;
 			
-			// aapt resource value: 0x7F0900C5
-			public const int search_badge = 2131296453;
+			// aapt resource value: 0x7f09007c
+			public const int search_bar = 2131296380;
 			
-			// aapt resource value: 0x7F0900C6
-			public const int search_bar = 2131296454;
+			// aapt resource value: 0x7f09007e
+			public const int search_button = 2131296382;
 			
-			// aapt resource value: 0x7F0900C7
-			public const int search_button = 2131296455;
+			// aapt resource value: 0x7f090083
+			public const int search_close_btn = 2131296387;
 			
-			// aapt resource value: 0x7F0900C8
-			public const int search_close_btn = 2131296456;
+			// aapt resource value: 0x7f09007f
+			public const int search_edit_frame = 2131296383;
 			
-			// aapt resource value: 0x7F0900C9
-			public const int search_edit_frame = 2131296457;
+			// aapt resource value: 0x7f090085
+			public const int search_go_btn = 2131296389;
 			
-			// aapt resource value: 0x7F0900CA
-			public const int search_go_btn = 2131296458;
+			// aapt resource value: 0x7f090080
+			public const int search_mag_icon = 2131296384;
 			
-			// aapt resource value: 0x7F0900CB
-			public const int search_mag_icon = 2131296459;
+			// aapt resource value: 0x7f090081
+			public const int search_plate = 2131296385;
 			
-			// aapt resource value: 0x7F0900CC
-			public const int search_plate = 2131296460;
+			// aapt resource value: 0x7f090082
+			public const int search_src_text = 2131296386;
 			
-			// aapt resource value: 0x7F0900CD
-			public const int search_src_text = 2131296461;
+			// aapt resource value: 0x7f090086
+			public const int search_voice_btn = 2131296390;
 			
-			// aapt resource value: 0x7F0900CE
-			public const int search_voice_btn = 2131296462;
+			// aapt resource value: 0x7f0900e0
+			public const int second = 2131296480;
 			
-			// aapt resource value: 0x7F0900CF
-			public const int second = 2131296463;
+			// aapt resource value: 0x7f090087
+			public const int select_dialog_listview = 2131296391;
 			
-			// aapt resource value: 0x7F0900D0
-			public const int select_dialog_listview = 2131296464;
+			// aapt resource value: 0x7f090100
+			public const int sendA = 2131296512;
 			
-			// aapt resource value: 0x7F0900D1
-			public const int sendA = 2131296465;
+			// aapt resource value: 0x7f090112
+			public const int sendCustomData = 2131296530;
 			
-			// aapt resource value: 0x7F0900D2
-			public const int sendCustomData = 2131296466;
+			// aapt resource value: 0x7f090101
+			public const int sendV = 2131296513;
 			
-			// aapt resource value: 0x7F0900D3
-			public const int sendV = 2131296467;
+			// aapt resource value: 0x7f090071
+			public const int shortcut = 2131296369;
 			
-			// aapt resource value: 0x7F09000E
-			public const int SHIFT = 2131296270;
+			// aapt resource value: 0x7f090093
+			public const int show = 2131296403;
 			
-			// aapt resource value: 0x7F0900D4
-			public const int shortcut = 2131296468;
+			// aapt resource value: 0x7f090018
+			public const int showCustom = 2131296280;
 			
-			// aapt resource value: 0x7F0900D5
-			public const int show = 2131296469;
+			// aapt resource value: 0x7f090019
+			public const int showHome = 2131296281;
 			
-			// aapt resource value: 0x7F0900D6
-			public const int showCustom = 2131296470;
+			// aapt resource value: 0x7f09001a
+			public const int showTitle = 2131296282;
 			
-			// aapt resource value: 0x7F0900D7
-			public const int showHome = 2131296471;
+			// aapt resource value: 0x7f0900a1
+			public const int smallLabel = 2131296417;
 			
-			// aapt resource value: 0x7F0900D8
-			public const int showTitle = 2131296472;
+			// aapt resource value: 0x7f0900a8
+			public const int snackbar_action = 2131296424;
 			
-			// aapt resource value: 0x7F0900D9
-			public const int smallLabel = 2131296473;
+			// aapt resource value: 0x7f0900a7
+			public const int snackbar_text = 2131296423;
 			
-			// aapt resource value: 0x7F0900DA
-			public const int snackbar_action = 2131296474;
+			// aapt resource value: 0x7f090038
+			public const int snap = 2131296312;
 			
-			// aapt resource value: 0x7F0900DB
-			public const int snackbar_text = 2131296475;
+			// aapt resource value: 0x7f090111
+			public const int snapshot = 2131296529;
 			
-			// aapt resource value: 0x7F0900DC
-			public const int snap = 2131296476;
+			// aapt resource value: 0x7f090061
+			public const int spacer = 2131296353;
 			
-			// aapt resource value: 0x7F0900DD
-			public const int snapshot = 2131296477;
+			// aapt resource value: 0x7f090008
+			public const int split_action_bar = 2131296264;
 			
-			// aapt resource value: 0x7F0900DE
-			public const int spacer = 2131296478;
+			// aapt resource value: 0x7f09001e
+			public const int src_atop = 2131296286;
 			
-			// aapt resource value: 0x7F0900DF
-			public const int split_action_bar = 2131296479;
+			// aapt resource value: 0x7f09001f
+			public const int src_in = 2131296287;
 			
-			// aapt resource value: 0x7F0900E0
-			public const int src_atop = 2131296480;
+			// aapt resource value: 0x7f090020
+			public const int src_over = 2131296288;
 			
-			// aapt resource value: 0x7F0900E1
-			public const int src_in = 2131296481;
+			// aapt resource value: 0x7f090121
+			public const int srl_classics_arrow = 2131296545;
 			
-			// aapt resource value: 0x7F0900E2
-			public const int src_over = 2131296482;
+			// aapt resource value: 0x7f090124
+			public const int srl_classics_center = 2131296548;
 			
-			// aapt resource value: 0x7F0900E3
-			public const int srl_classics_arrow = 2131296483;
+			// aapt resource value: 0x7f090123
+			public const int srl_classics_progress = 2131296547;
 			
-			// aapt resource value: 0x7F0900E4
-			public const int srl_classics_center = 2131296484;
+			// aapt resource value: 0x7f090122
+			public const int srl_classics_title = 2131296546;
 			
-			// aapt resource value: 0x7F0900E5
-			public const int srl_classics_progress = 2131296485;
+			// aapt resource value: 0x7f090125
+			public const int srl_classics_update = 2131296549;
 			
-			// aapt resource value: 0x7F0900E6
-			public const int srl_classics_title = 2131296486;
+			// aapt resource value: 0x7f090040
+			public const int start = 2131296320;
 			
-			// aapt resource value: 0x7F0900E7
-			public const int srl_classics_update = 2131296487;
+			// aapt resource value: 0x7f09011f
+			public const int startAVMsg = 2131296543;
 			
-			// aapt resource value: 0x7F09000F
-			public const int SSID = 2131296271;
+			// aapt resource value: 0x7f090119
+			public const int startDoorKey = 2131296537;
 			
-			// aapt resource value: 0x7F090010
-			public const int SSIDLabel = 2131296272;
+			// aapt resource value: 0x7f09010d
+			public const int startLocalRecord = 2131296525;
 			
-			// aapt resource value: 0x7F0900E8
-			public const int start = 2131296488;
+			// aapt resource value: 0x7f090117
+			public const int startReadCard = 2131296535;
 			
-			// aapt resource value: 0x7F0900E9
-			public const int startAVMsg = 2131296489;
+			// aapt resource value: 0x7f09010b
+			public const int startRecord = 2131296523;
 			
-			// aapt resource value: 0x7F0900EA
-			public const int startDoorKey = 2131296490;
+			// aapt resource value: 0x7f09010f
+			public const int startRecordLocalAudio = 2131296527;
 			
-			// aapt resource value: 0x7F0900EB
-			public const int startLocalRecord = 2131296491;
+			// aapt resource value: 0x7f090109
+			public const int startRecordPeerAudio = 2131296521;
 			
-			// aapt resource value: 0x7F0900EC
-			public const int startReadCard = 2131296492;
+			// aapt resource value: 0x7f09012b
+			public const int startStream = 2131296555;
 			
-			// aapt resource value: 0x7F0900ED
-			public const int startRecord = 2131296493;
+			// aapt resource value: 0x7f09008f
+			public const int startV1 = 2131296399;
 			
-			// aapt resource value: 0x7F0900EE
-			public const int startRecordLocalAudio = 2131296494;
+			// aapt resource value: 0x7f090091
+			public const int startV1V4 = 2131296401;
 			
-			// aapt resource value: 0x7F0900EF
-			public const int startRecordPeerAudio = 2131296495;
+			// aapt resource value: 0x7f090090
+			public const int startV4 = 2131296400;
 			
-			// aapt resource value: 0x7F0900F0
-			public const int startStream = 2131296496;
+			// aapt resource value: 0x7f0900fc
+			public const int start_stop = 2131296508;
 			
-			// aapt resource value: 0x7F0900F1
-			public const int startV1 = 2131296497;
+			// aapt resource value: 0x7f0900fd
+			public const int start_stop_stream = 2131296509;
 			
-			// aapt resource value: 0x7F0900F2
-			public const int startV1V4 = 2131296498;
+			// aapt resource value: 0x7f0900a0
+			public const int status = 2131296416;
 			
-			// aapt resource value: 0x7F0900F3
-			public const int startV4 = 2131296499;
-			
-			// aapt resource value: 0x7F0900F4
-			public const int start_stop = 2131296500;
-			
-			// aapt resource value: 0x7F0900F5
-			public const int start_stop_stream = 2131296501;
-			
-			// aapt resource value: 0x7F0900F6
-			public const int status = 2131296502;
-			
-			// aapt resource value: 0x7F0900F7
-			public const int status_bar_latest_event_content = 2131296503;
-			
-			// aapt resource value: 0x7F0900F8
-			public const int stop = 2131296504;
-			
-			// aapt resource value: 0x7F0900F9
-			public const int stopAVMsg = 2131296505;
-			
-			// aapt resource value: 0x7F0900FA
-			public const int stopDoorKey = 2131296506;
+			// aapt resource value: 0x7f0900ee
+			public const int status_bar_latest_event_content = 2131296494;
 			
-			// aapt resource value: 0x7F0900FB
-			public const int stopLocalRecord = 2131296507;
+			// aapt resource value: 0x7f090092
+			public const int stop = 2131296402;
 			
-			// aapt resource value: 0x7F0900FC
-			public const int stopReadCard = 2131296508;
+			// aapt resource value: 0x7f090120
+			public const int stopAVMsg = 2131296544;
 			
-			// aapt resource value: 0x7F0900FD
-			public const int stopRecord = 2131296509;
+			// aapt resource value: 0x7f09011b
+			public const int stopDoorKey = 2131296539;
 			
-			// aapt resource value: 0x7F0900FE
-			public const int stopRecordLocalAudio = 2131296510;
+			// aapt resource value: 0x7f09010e
+			public const int stopLocalRecord = 2131296526;
 			
-			// aapt resource value: 0x7F0900FF
-			public const int stopRecordPeerAudio = 2131296511;
+			// aapt resource value: 0x7f090118
+			public const int stopReadCard = 2131296536;
 			
-			// aapt resource value: 0x7F090100
-			public const int stopStream = 2131296512;
+			// aapt resource value: 0x7f09010c
+			public const int stopRecord = 2131296524;
 			
-			// aapt resource value: 0x7F090011
-			public const int STROKE = 2131296273;
+			// aapt resource value: 0x7f090110
+			public const int stopRecordLocalAudio = 2131296528;
 			
-			// aapt resource value: 0x7F090101
-			public const int submenuarrow = 2131296513;
+			// aapt resource value: 0x7f09010a
+			public const int stopRecordPeerAudio = 2131296522;
 			
-			// aapt resource value: 0x7F090102
-			public const int submit_area = 2131296514;
+			// aapt resource value: 0x7f09012c
+			public const int stopStream = 2131296556;
 			
-			// aapt resource value: 0x7F090103
-			public const int subtitle = 2131296515;
+			// aapt resource value: 0x7f090073
+			public const int submenuarrow = 2131296371;
 			
-			// aapt resource value: 0x7F090012
-			public const int SYM = 2131296274;
+			// aapt resource value: 0x7f090084
+			public const int submit_area = 2131296388;
 			
-			// aapt resource value: 0x7F090104
-			public const int tabMode = 2131296516;
+			// aapt resource value: 0x7f09009d
+			public const int subtitle = 2131296413;
 			
-			// aapt resource value: 0x7F090105
-			public const int text = 2131296517;
+			// aapt resource value: 0x7f090014
+			public const int tabMode = 2131296276;
 			
-			// aapt resource value: 0x7F090106
-			public const int text2 = 2131296518;
+			// aapt resource value: 0x7f09000f
+			public const int text = 2131296271;
 			
-			// aapt resource value: 0x7F09010A
-			public const int textinput_counter = 2131296522;
+			// aapt resource value: 0x7f090010
+			public const int text2 = 2131296272;
 			
-			// aapt resource value: 0x7F09010B
-			public const int textinput_error = 2131296523;
+			// aapt resource value: 0x7f090067
+			public const int textSpacerNoButtons = 2131296359;
 			
-			// aapt resource value: 0x7F090107
-			public const int textSpacerNoButtons = 2131296519;
+			// aapt resource value: 0x7f090066
+			public const int textSpacerNoTitle = 2131296358;
 			
-			// aapt resource value: 0x7F090108
-			public const int textSpacerNoTitle = 2131296520;
+			// aapt resource value: 0x7f0900ae
+			public const int text_input_password_toggle = 2131296430;
 			
-			// aapt resource value: 0x7F090109
-			public const int text_input_password_toggle = 2131296521;
+			// aapt resource value: 0x7f09000a
+			public const int textinput_counter = 2131296266;
 			
-			// aapt resource value: 0x7F09010C
-			public const int time = 2131296524;
+			// aapt resource value: 0x7f09000b
+			public const int textinput_error = 2131296267;
 			
-			// aapt resource value: 0x7F09010D
-			public const int timepicker = 2131296525;
+			// aapt resource value: 0x7f0900f4
+			public const int time = 2131296500;
 			
-			// aapt resource value: 0x7F09010E
-			public const int title = 2131296526;
+			// aapt resource value: 0x7f0900da
+			public const int timepicker = 2131296474;
 			
-			// aapt resource value: 0x7F09010F
-			public const int titleDividerNoCustom = 2131296527;
+			// aapt resource value: 0x7f090011
+			public const int title = 2131296273;
 			
-			// aapt resource value: 0x7F090110
-			public const int title_template = 2131296528;
+			// aapt resource value: 0x7f09006e
+			public const int titleDividerNoCustom = 2131296366;
 			
-			// aapt resource value: 0x7F090111
-			public const int top = 2131296529;
+			// aapt resource value: 0x7f09006c
+			public const int title_template = 2131296364;
 			
-			// aapt resource value: 0x7F090112
-			public const int topPanel = 2131296530;
+			// aapt resource value: 0x7f090033
+			public const int top = 2131296307;
 			
-			// aapt resource value: 0x7F090113
-			public const int touch_outside = 2131296531;
+			// aapt resource value: 0x7f09006b
+			public const int topPanel = 2131296363;
 			
-			// aapt resource value: 0x7F090014
-			public const int Translate = 2131296276;
+			// aapt resource value: 0x7f0900a5
+			public const int touch_outside = 2131296421;
 			
-			// aapt resource value: 0x7F090114
-			public const int tvTitle = 2131296532;
+			// aapt resource value: 0x7f0900ce
+			public const int tvTitle = 2131296462;
 			
-			// aapt resource value: 0x7F090115
-			public const int tv_call = 2131296533;
+			// aapt resource value: 0x7f0900ba
+			public const int tv_call = 2131296442;
 			
-			// aapt resource value: 0x7F090116
-			public const int tv_content = 2131296534;
+			// aapt resource value: 0x7f0900b0
+			public const int tv_content = 2131296432;
 			
-			// aapt resource value: 0x7F090117
-			public const int tv_hangup = 2131296535;
+			// aapt resource value: 0x7f0900b7
+			public const int tv_hangup = 2131296439;
 			
-			// aapt resource value: 0x7F090118
-			public const int tv_name = 2131296536;
+			// aapt resource value: 0x7f090099
+			public const int tv_name = 2131296409;
 			
-			// aapt resource value: 0x7F090119
-			public const int tv_ok = 2131296537;
+			// aapt resource value: 0x7f0900b1
+			public const int tv_ok = 2131296433;
 			
-			// aapt resource value: 0x7F09011A
-			public const int tv_roomName = 2131296538;
+			// aapt resource value: 0x7f09009b
+			public const int tv_roomName = 2131296411;
 			
-			// aapt resource value: 0x7F09011B
-			public const int tv_screenshot = 2131296539;
+			// aapt resource value: 0x7f0900bc
+			public const int tv_screenshot = 2131296444;
 			
-			// aapt resource value: 0x7F09011C
-			public const int tv_tip = 2131296540;
+			// aapt resource value: 0x7f0900b4
+			public const int tv_tip = 2131296436;
 			
-			// aapt resource value: 0x7F09011D
-			public const int tv_title = 2131296541;
+			// aapt resource value: 0x7f0900af
+			public const int tv_title = 2131296431;
 			
-			// aapt resource value: 0x7F09011E
-			public const int tv_unlock = 2131296542;
+			// aapt resource value: 0x7f0900be
+			public const int tv_unlock = 2131296446;
 			
-			// aapt resource value: 0x7F09011F
-			public const int tv_zxing_back = 2131296543;
+			// aapt resource value: 0x7f09012e
+			public const int tv_zxing_back = 2131296558;
 			
-			// aapt resource value: 0x7F090120
-			public const int tv_zxing_flash = 2131296544;
+			// aapt resource value: 0x7f09012f
+			public const int tv_zxing_flash = 2131296559;
 			
-			// aapt resource value: 0x7F090121
-			public const int tv_zxing_scan = 2131296545;
+			// aapt resource value: 0x7f09012d
+			public const int tv_zxing_scan = 2131296557;
 			
-			// aapt resource value: 0x7F090122
-			public const int uniform = 2131296546;
+			// aapt resource value: 0x7f090022
+			public const int uniform = 2131296290;
 			
-			// aapt resource value: 0x7F090123
-			public const int up = 2131296547;
+			// aapt resource value: 0x7f090009
+			public const int up = 2131296265;
 			
-			// aapt resource value: 0x7F090124
-			public const int useLogo = 2131296548;
+			// aapt resource value: 0x7f09001b
+			public const int useLogo = 2131296283;
 			
-			// aapt resource value: 0x7F090125
-			public const int uvc = 2131296549;
+			// aapt resource value: 0x7f09012a
+			public const int uvc = 2131296554;
 			
-			// aapt resource value: 0x7F090126
-			public const int videoParent = 2131296550;
+			// aapt resource value: 0x7f090127
+			public const int videoParent = 2131296551;
 			
-			// aapt resource value: 0x7F090127
-			public const int view_offset_helper = 2131296551;
+			// aapt resource value: 0x7f09000c
+			public const int view_offset_helper = 2131296268;
 			
-			// aapt resource value: 0x7F090128
-			public const int visible = 2131296552;
+			// aapt resource value: 0x7f090131
+			public const int visible = 2131296561;
 			
-			// aapt resource value: 0x7F090129
-			public const int withText = 2131296553;
+			// aapt resource value: 0x7f090031
+			public const int withText = 2131296305;
 			
-			// aapt resource value: 0x7F09012A
-			public const int wrap_content = 2131296554;
+			// aapt resource value: 0x7f090023
+			public const int wrap_content = 2131296291;
 			
-			// aapt resource value: 0x7F09012B
-			public const int year = 2131296555;
+			// aapt resource value: 0x7f0900db
+			public const int year = 2131296475;
 			
 			static Id()
 			{
@@ -4006,38 +4057,38 @@
 		public partial class Integer
 		{
 			
-			// aapt resource value: 0x7F0A0000
-			public const int abc_config_activityDefaultDur = 2131361792;
+			// aapt resource value: 0x7f0e0000
+			public const int abc_config_activityDefaultDur = 2131623936;
 			
-			// aapt resource value: 0x7F0A0001
-			public const int abc_config_activityShortDur = 2131361793;
+			// aapt resource value: 0x7f0e0001
+			public const int abc_config_activityShortDur = 2131623937;
 			
-			// aapt resource value: 0x7F0A0002
-			public const int animation_default_duration = 2131361794;
+			// aapt resource value: 0x7f0e000a
+			public const int animation_default_duration = 2131623946;
 			
-			// aapt resource value: 0x7F0A0003
-			public const int app_bar_elevation_anim_duration = 2131361795;
+			// aapt resource value: 0x7f0e0005
+			public const int app_bar_elevation_anim_duration = 2131623941;
 			
-			// aapt resource value: 0x7F0A0004
-			public const int bottom_sheet_slide_duration = 2131361796;
+			// aapt resource value: 0x7f0e0006
+			public const int bottom_sheet_slide_duration = 2131623942;
 			
-			// aapt resource value: 0x7F0A0005
-			public const int cancel_button_image_alpha = 2131361797;
+			// aapt resource value: 0x7f0e0002
+			public const int cancel_button_image_alpha = 2131623938;
 			
-			// aapt resource value: 0x7F0A0006
-			public const int config_tooltipAnimTime = 2131361798;
+			// aapt resource value: 0x7f0e0003
+			public const int config_tooltipAnimTime = 2131623939;
 			
-			// aapt resource value: 0x7F0A0007
-			public const int design_snackbar_text_max_lines = 2131361799;
+			// aapt resource value: 0x7f0e0004
+			public const int design_snackbar_text_max_lines = 2131623940;
 			
-			// aapt resource value: 0x7F0A0008
-			public const int hide_password_duration = 2131361800;
+			// aapt resource value: 0x7f0e0007
+			public const int hide_password_duration = 2131623943;
 			
-			// aapt resource value: 0x7F0A0009
-			public const int show_password_duration = 2131361801;
+			// aapt resource value: 0x7f0e0008
+			public const int show_password_duration = 2131623944;
 			
-			// aapt resource value: 0x7F0A000A
-			public const int status_bar_notification_info_maxnum = 2131361802;
+			// aapt resource value: 0x7f0e0009
+			public const int status_bar_notification_info_maxnum = 2131623945;
 			
 			static Integer()
 			{
@@ -4052,263 +4103,278 @@
 		public partial class Layout
 		{
 			
-			// aapt resource value: 0x7F0B0000
-			public const int abc_action_bar_title_item = 2131427328;
+			// aapt resource value: 0x7f040000
+			public const int abc_action_bar_title_item = 2130968576;
 			
-			// aapt resource value: 0x7F0B0001
-			public const int abc_action_bar_up_container = 2131427329;
+			// aapt resource value: 0x7f040001
+			public const int abc_action_bar_up_container = 2130968577;
 			
-			// aapt resource value: 0x7F0B0002
-			public const int abc_action_bar_view_list_nav_layout = 2131427330;
+			// aapt resource value: 0x7f040002
+			public const int abc_action_bar_view_list_nav_layout = 2130968578;
 			
-			// aapt resource value: 0x7F0B0003
-			public const int abc_action_menu_item_layout = 2131427331;
+			// aapt resource value: 0x7f040003
+			public const int abc_action_menu_item_layout = 2130968579;
 			
-			// aapt resource value: 0x7F0B0004
-			public const int abc_action_menu_layout = 2131427332;
+			// aapt resource value: 0x7f040004
+			public const int abc_action_menu_layout = 2130968580;
 			
-			// aapt resource value: 0x7F0B0005
-			public const int abc_action_mode_bar = 2131427333;
+			// aapt resource value: 0x7f040005
+			public const int abc_action_mode_bar = 2130968581;
 			
-			// aapt resource value: 0x7F0B0006
-			public const int abc_action_mode_close_item_material = 2131427334;
+			// aapt resource value: 0x7f040006
+			public const int abc_action_mode_close_item_material = 2130968582;
 			
-			// aapt resource value: 0x7F0B0007
-			public const int abc_activity_chooser_view = 2131427335;
+			// aapt resource value: 0x7f040007
+			public const int abc_activity_chooser_view = 2130968583;
 			
-			// aapt resource value: 0x7F0B0008
-			public const int abc_activity_chooser_view_list_item = 2131427336;
+			// aapt resource value: 0x7f040008
+			public const int abc_activity_chooser_view_list_item = 2130968584;
 			
-			// aapt resource value: 0x7F0B0009
-			public const int abc_alert_dialog_button_bar_material = 2131427337;
+			// aapt resource value: 0x7f040009
+			public const int abc_alert_dialog_button_bar_material = 2130968585;
 			
-			// aapt resource value: 0x7F0B000A
-			public const int abc_alert_dialog_material = 2131427338;
+			// aapt resource value: 0x7f04000a
+			public const int abc_alert_dialog_material = 2130968586;
 			
-			// aapt resource value: 0x7F0B000B
-			public const int abc_alert_dialog_title_material = 2131427339;
+			// aapt resource value: 0x7f04000b
+			public const int abc_alert_dialog_title_material = 2130968587;
 			
-			// aapt resource value: 0x7F0B000C
-			public const int abc_dialog_title_material = 2131427340;
+			// aapt resource value: 0x7f04000c
+			public const int abc_dialog_title_material = 2130968588;
 			
-			// aapt resource value: 0x7F0B000D
-			public const int abc_expanded_menu_layout = 2131427341;
+			// aapt resource value: 0x7f04000d
+			public const int abc_expanded_menu_layout = 2130968589;
 			
-			// aapt resource value: 0x7F0B000E
-			public const int abc_list_menu_item_checkbox = 2131427342;
+			// aapt resource value: 0x7f04000e
+			public const int abc_list_menu_item_checkbox = 2130968590;
 			
-			// aapt resource value: 0x7F0B000F
-			public const int abc_list_menu_item_icon = 2131427343;
+			// aapt resource value: 0x7f04000f
+			public const int abc_list_menu_item_icon = 2130968591;
 			
-			// aapt resource value: 0x7F0B0010
-			public const int abc_list_menu_item_layout = 2131427344;
+			// aapt resource value: 0x7f040010
+			public const int abc_list_menu_item_layout = 2130968592;
 			
-			// aapt resource value: 0x7F0B0011
-			public const int abc_list_menu_item_radio = 2131427345;
+			// aapt resource value: 0x7f040011
+			public const int abc_list_menu_item_radio = 2130968593;
 			
-			// aapt resource value: 0x7F0B0012
-			public const int abc_popup_menu_header_item_layout = 2131427346;
+			// aapt resource value: 0x7f040012
+			public const int abc_popup_menu_header_item_layout = 2130968594;
 			
-			// aapt resource value: 0x7F0B0013
-			public const int abc_popup_menu_item_layout = 2131427347;
+			// aapt resource value: 0x7f040013
+			public const int abc_popup_menu_item_layout = 2130968595;
 			
-			// aapt resource value: 0x7F0B0014
-			public const int abc_screen_content_include = 2131427348;
+			// aapt resource value: 0x7f040014
+			public const int abc_screen_content_include = 2130968596;
 			
-			// aapt resource value: 0x7F0B0015
-			public const int abc_screen_simple = 2131427349;
+			// aapt resource value: 0x7f040015
+			public const int abc_screen_simple = 2130968597;
 			
-			// aapt resource value: 0x7F0B0016
-			public const int abc_screen_simple_overlay_action_mode = 2131427350;
+			// aapt resource value: 0x7f040016
+			public const int abc_screen_simple_overlay_action_mode = 2130968598;
 			
-			// aapt resource value: 0x7F0B0017
-			public const int abc_screen_toolbar = 2131427351;
+			// aapt resource value: 0x7f040017
+			public const int abc_screen_toolbar = 2130968599;
 			
-			// aapt resource value: 0x7F0B0018
-			public const int abc_search_dropdown_item_icons_2line = 2131427352;
+			// aapt resource value: 0x7f040018
+			public const int abc_search_dropdown_item_icons_2line = 2130968600;
 			
-			// aapt resource value: 0x7F0B0019
-			public const int abc_search_view = 2131427353;
+			// aapt resource value: 0x7f040019
+			public const int abc_search_view = 2130968601;
 			
-			// aapt resource value: 0x7F0B001A
-			public const int abc_select_dialog_material = 2131427354;
+			// aapt resource value: 0x7f04001a
+			public const int abc_select_dialog_material = 2130968602;
 			
-			// aapt resource value: 0x7F0B001B
-			public const int activity_elian = 2131427355;
+			// aapt resource value: 0x7f04001b
+			public const int activity_elian = 2130968603;
 			
-			// aapt resource value: 0x7F0B001C
-			public const int activity_main = 2131427356;
+			// aapt resource value: 0x7f04001c
+			public const int activity_main = 2130968604;
 			
-			// aapt resource value: 0x7F0B001D
-			public const int activity_video_phone = 2131427357;
+			// aapt resource value: 0x7f04001d
+			public const int activity_video_phone = 2130968605;
 			
-			// aapt resource value: 0x7F0B001E
-			public const int biometric_prompt_dialog_content = 2131427358;
+			// aapt resource value: 0x7f04001e
+			public const int biometric_prompt_dialog_content = 2130968606;
 			
-			// aapt resource value: 0x7F0B001F
-			public const int design_bottom_navigation_item = 2131427359;
+			// aapt resource value: 0x7f04001f
+			public const int design_bottom_navigation_item = 2130968607;
 			
-			// aapt resource value: 0x7F0B0020
-			public const int design_bottom_sheet_dialog = 2131427360;
+			// aapt resource value: 0x7f040020
+			public const int design_bottom_sheet_dialog = 2130968608;
 			
-			// aapt resource value: 0x7F0B0021
-			public const int design_layout_snackbar = 2131427361;
+			// aapt resource value: 0x7f040021
+			public const int design_layout_snackbar = 2130968609;
 			
-			// aapt resource value: 0x7F0B0022
-			public const int design_layout_snackbar_include = 2131427362;
+			// aapt resource value: 0x7f040022
+			public const int design_layout_snackbar_include = 2130968610;
 			
-			// aapt resource value: 0x7F0B0023
-			public const int design_layout_tab_icon = 2131427363;
+			// aapt resource value: 0x7f040023
+			public const int design_layout_tab_icon = 2130968611;
 			
-			// aapt resource value: 0x7F0B0024
-			public const int design_layout_tab_text = 2131427364;
+			// aapt resource value: 0x7f040024
+			public const int design_layout_tab_text = 2130968612;
 			
-			// aapt resource value: 0x7F0B0025
-			public const int design_menu_item_action_area = 2131427365;
+			// aapt resource value: 0x7f040025
+			public const int design_menu_item_action_area = 2130968613;
 			
-			// aapt resource value: 0x7F0B0026
-			public const int design_navigation_item = 2131427366;
+			// aapt resource value: 0x7f040026
+			public const int design_navigation_item = 2130968614;
 			
-			// aapt resource value: 0x7F0B0027
-			public const int design_navigation_item_header = 2131427367;
+			// aapt resource value: 0x7f040027
+			public const int design_navigation_item_header = 2130968615;
 			
-			// aapt resource value: 0x7F0B0028
-			public const int design_navigation_item_separator = 2131427368;
+			// aapt resource value: 0x7f040028
+			public const int design_navigation_item_separator = 2130968616;
 			
-			// aapt resource value: 0x7F0B0029
-			public const int design_navigation_item_subheader = 2131427369;
+			// aapt resource value: 0x7f040029
+			public const int design_navigation_item_subheader = 2130968617;
+			
+			// aapt resource value: 0x7f04002a
+			public const int design_navigation_menu = 2130968618;
+			
+			// aapt resource value: 0x7f04002b
+			public const int design_navigation_menu_item = 2130968619;
+			
+			// aapt resource value: 0x7f04002c
+			public const int design_text_input_password_icon = 2130968620;
+			
+			// aapt resource value: 0x7f04002d
+			public const int dialog_tip = 2130968621;
+			
+			// aapt resource value: 0x7f04002e
+			public const int fragment_call = 2130968622;
 			
-			// aapt resource value: 0x7F0B002A
-			public const int design_navigation_menu = 2131427370;
+			// aapt resource value: 0x7f04002f
+			public const int fragment_monitor = 2130968623;
 			
-			// aapt resource value: 0x7F0B002B
-			public const int design_navigation_menu_item = 2131427371;
+			// aapt resource value: 0x7f040030
+			public const int hdl_gallery_banner_view_layout = 2130968624;
 			
-			// aapt resource value: 0x7F0B002C
-			public const int design_text_input_password_icon = 2131427372;
+			// aapt resource value: 0x7f040031
+			public const int hdl_widget_activity_crop_image = 2130968625;
 			
-			// aapt resource value: 0x7F0B002D
-			public const int dialog_tip = 2131427373;
+			// aapt resource value: 0x7f040032
+			public const int hdl_widget_activity_geofence_round = 2130968626;
 			
-			// aapt resource value: 0x7F0B002E
-			public const int fragment_call = 2131427374;
+			// aapt resource value: 0x7f040033
+			public const int hdl_widget_air_button = 2130968627;
 			
-			// aapt resource value: 0x7F0B002F
-			public const int fragment_monitor = 2131427375;
+			// aapt resource value: 0x7f040034
+			public const int hdl_widget_include_pickerview_topbar = 2130968628;
 			
-			// aapt resource value: 0x7F0B0030
-			public const int hdl_gallery_banner_view_layout = 2131427376;
+			// aapt resource value: 0x7f040035
+			public const int hdl_widget_layout_basepickerview = 2130968629;
 			
-			// aapt resource value: 0x7F0B0031
-			public const int hdl_widget_activity_crop_image = 2131427377;
+			// aapt resource value: 0x7f040036
+			public const int hdl_widget_pickerview = 2130968630;
 			
-			// aapt resource value: 0x7F0B0032
-			public const int hdl_widget_activity_geofence_round = 2131427378;
+			// aapt resource value: 0x7f040037
+			public const int hdl_widget_pickerview_options = 2130968631;
 			
-			// aapt resource value: 0x7F0B0033
-			public const int hdl_widget_air_button = 2131427379;
+			// aapt resource value: 0x7f040038
+			public const int hdl_widget_pickerview_time = 2130968632;
 			
-			// aapt resource value: 0x7F0B0034
-			public const int hdl_widget_include_pickerview_topbar = 2131427380;
+			// aapt resource value: 0x7f040039
+			public const int leak_canary_display_leak = 2130968633;
 			
-			// aapt resource value: 0x7F0B0035
-			public const int hdl_widget_layout_basepickerview = 2131427381;
+			// aapt resource value: 0x7f04003a
+			public const int leak_canary_heap_dump_toast = 2130968634;
 			
-			// aapt resource value: 0x7F0B0036
-			public const int hdl_widget_pickerview = 2131427382;
+			// aapt resource value: 0x7f04003b
+			public const int leak_canary_leak_row = 2130968635;
 			
-			// aapt resource value: 0x7F0B0037
-			public const int hdl_widget_pickerview_options = 2131427383;
+			// aapt resource value: 0x7f04003c
+			public const int leak_canary_ref_row = 2130968636;
 			
-			// aapt resource value: 0x7F0B0038
-			public const int hdl_widget_pickerview_time = 2131427384;
+			// aapt resource value: 0x7f04003d
+			public const int leak_canary_ref_top_row = 2130968637;
 			
-			// aapt resource value: 0x7F0B0039
-			public const int Main = 2131427385;
+			// aapt resource value: 0x7f04003e
+			public const int Main = 2130968638;
 			
-			// aapt resource value: 0x7F0B003A
-			public const int notification_action = 2131427386;
+			// aapt resource value: 0x7f04003f
+			public const int notification_action = 2130968639;
 			
-			// aapt resource value: 0x7F0B003B
-			public const int notification_action_tombstone = 2131427387;
+			// aapt resource value: 0x7f040040
+			public const int notification_action_tombstone = 2130968640;
 			
-			// aapt resource value: 0x7F0B003C
-			public const int notification_media_action = 2131427388;
+			// aapt resource value: 0x7f040041
+			public const int notification_media_action = 2130968641;
 			
-			// aapt resource value: 0x7F0B003D
-			public const int notification_media_cancel_action = 2131427389;
+			// aapt resource value: 0x7f040042
+			public const int notification_media_cancel_action = 2130968642;
 			
-			// aapt resource value: 0x7F0B003E
-			public const int notification_template_big_media = 2131427390;
+			// aapt resource value: 0x7f040043
+			public const int notification_template_big_media = 2130968643;
 			
-			// aapt resource value: 0x7F0B003F
-			public const int notification_template_big_media_custom = 2131427391;
+			// aapt resource value: 0x7f040044
+			public const int notification_template_big_media_custom = 2130968644;
 			
-			// aapt resource value: 0x7F0B0040
-			public const int notification_template_big_media_narrow = 2131427392;
+			// aapt resource value: 0x7f040045
+			public const int notification_template_big_media_narrow = 2130968645;
 			
-			// aapt resource value: 0x7F0B0041
-			public const int notification_template_big_media_narrow_custom = 2131427393;
+			// aapt resource value: 0x7f040046
+			public const int notification_template_big_media_narrow_custom = 2130968646;
 			
-			// aapt resource value: 0x7F0B0042
-			public const int notification_template_custom_big = 2131427394;
+			// aapt resource value: 0x7f040047
+			public const int notification_template_custom_big = 2130968647;
 			
-			// aapt resource value: 0x7F0B0043
-			public const int notification_template_icon_group = 2131427395;
+			// aapt resource value: 0x7f040048
+			public const int notification_template_icon_group = 2130968648;
 			
-			// aapt resource value: 0x7F0B0044
-			public const int notification_template_lines_media = 2131427396;
+			// aapt resource value: 0x7f040049
+			public const int notification_template_lines_media = 2130968649;
 			
-			// aapt resource value: 0x7F0B0045
-			public const int notification_template_media = 2131427397;
+			// aapt resource value: 0x7f04004a
+			public const int notification_template_media = 2130968650;
 			
-			// aapt resource value: 0x7F0B0046
-			public const int notification_template_media_custom = 2131427398;
+			// aapt resource value: 0x7f04004b
+			public const int notification_template_media_custom = 2130968651;
 			
-			// aapt resource value: 0x7F0B0047
-			public const int notification_template_part_chronometer = 2131427399;
+			// aapt resource value: 0x7f04004c
+			public const int notification_template_part_chronometer = 2130968652;
 			
-			// aapt resource value: 0x7F0B0048
-			public const int notification_template_part_time = 2131427400;
+			// aapt resource value: 0x7f04004d
+			public const int notification_template_part_time = 2130968653;
 			
-			// aapt resource value: 0x7F0B0049
-			public const int select_dialog_item_material = 2131427401;
+			// aapt resource value: 0x7f04004e
+			public const int select_dialog_item_material = 2130968654;
 			
-			// aapt resource value: 0x7F0B004A
-			public const int select_dialog_multichoice_material = 2131427402;
+			// aapt resource value: 0x7f04004f
+			public const int select_dialog_multichoice_material = 2130968655;
 			
-			// aapt resource value: 0x7F0B004B
-			public const int select_dialog_singlechoice_material = 2131427403;
+			// aapt resource value: 0x7f040050
+			public const int select_dialog_singlechoice_material = 2130968656;
 			
-			// aapt resource value: 0x7F0B004C
-			public const int simple_demo = 2131427404;
+			// aapt resource value: 0x7f040051
+			public const int simple_demo = 2130968657;
 			
-			// aapt resource value: 0x7F0B004D
-			public const int srl_classics_footer = 2131427405;
+			// aapt resource value: 0x7f040052
+			public const int srl_classics_footer = 2130968658;
 			
-			// aapt resource value: 0x7F0B004E
-			public const int srl_classics_header = 2131427406;
+			// aapt resource value: 0x7f040053
+			public const int srl_classics_header = 2130968659;
 			
-			// aapt resource value: 0x7F0B004F
-			public const int support_simple_spinner_dropdown_item = 2131427407;
+			// aapt resource value: 0x7f040054
+			public const int support_simple_spinner_dropdown_item = 2130968660;
 			
-			// aapt resource value: 0x7F0B0050
-			public const int test_surfaceview = 2131427408;
+			// aapt resource value: 0x7f040055
+			public const int test_surfaceview = 2130968661;
 			
-			// aapt resource value: 0x7F0B0051
-			public const int tooltip = 2131427409;
+			// aapt resource value: 0x7f040056
+			public const int tooltip = 2130968662;
 			
-			// aapt resource value: 0x7F0B0052
-			public const int video_device = 2131427410;
+			// aapt resource value: 0x7f040057
+			public const int video_device = 2130968663;
 			
-			// aapt resource value: 0x7F0B0054
-			public const int zxingscanneractivitylayout = 2131427412;
+			// aapt resource value: 0x7f040058
+			public const int zxing_layout = 2130968664;
 			
-			// aapt resource value: 0x7F0B0055
-			public const int zxingscannerfragmentlayout = 2131427413;
+			// aapt resource value: 0x7f040059
+			public const int zxingscanneractivitylayout = 2130968665;
 			
-			// aapt resource value: 0x7F0B0053
-			public const int zxing_layout = 2131427411;
+			// aapt resource value: 0x7f04005a
+			public const int zxingscannerfragmentlayout = 2130968666;
 			
 			static Layout()
 			{
@@ -4323,14 +4389,14 @@
 		public partial class Mipmap
 		{
 			
-			// aapt resource value: 0x7F0C0002
-			public const int Icon = 2131492866;
+			// aapt resource value: 0x7f030000
+			public const int ic_launcher = 2130903040;
 			
-			// aapt resource value: 0x7F0C0000
-			public const int ic_launcher = 2131492864;
+			// aapt resource value: 0x7f030001
+			public const int ic_launcher_round = 2130903041;
 			
-			// aapt resource value: 0x7F0C0001
-			public const int ic_launcher_round = 2131492865;
+			// aapt resource value: 0x7f030002
+			public const int Icon = 2130903042;
 			
 			static Mipmap()
 			{
@@ -4345,242 +4411,311 @@
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7F0D0000
-			public const int abc_action_bar_home_description = 2131558400;
+			// aapt resource value: 0x7f0a0000
+			public const int abc_action_bar_home_description = 2131361792;
 			
-			// aapt resource value: 0x7F0D0001
-			public const int abc_action_bar_home_description_format = 2131558401;
+			// aapt resource value: 0x7f0a0001
+			public const int abc_action_bar_home_description_format = 2131361793;
 			
-			// aapt resource value: 0x7F0D0002
-			public const int abc_action_bar_home_subtitle_description_format = 2131558402;
+			// aapt resource value: 0x7f0a0002
+			public const int abc_action_bar_home_subtitle_description_format = 2131361794;
 			
-			// aapt resource value: 0x7F0D0003
-			public const int abc_action_bar_up_description = 2131558403;
+			// aapt resource value: 0x7f0a0003
+			public const int abc_action_bar_up_description = 2131361795;
 			
-			// aapt resource value: 0x7F0D0004
-			public const int abc_action_menu_overflow_description = 2131558404;
+			// aapt resource value: 0x7f0a0004
+			public const int abc_action_menu_overflow_description = 2131361796;
 			
-			// aapt resource value: 0x7F0D0005
-			public const int abc_action_mode_done = 2131558405;
+			// aapt resource value: 0x7f0a0005
+			public const int abc_action_mode_done = 2131361797;
 			
-			// aapt resource value: 0x7F0D0007
-			public const int abc_activitychooserview_choose_application = 2131558407;
+			// aapt resource value: 0x7f0a0006
+			public const int abc_activity_chooser_view_see_all = 2131361798;
 			
-			// aapt resource value: 0x7F0D0006
-			public const int abc_activity_chooser_view_see_all = 2131558406;
+			// aapt resource value: 0x7f0a0007
+			public const int abc_activitychooserview_choose_application = 2131361799;
 			
-			// aapt resource value: 0x7F0D0008
-			public const int abc_capital_off = 2131558408;
+			// aapt resource value: 0x7f0a0008
+			public const int abc_capital_off = 2131361800;
 			
-			// aapt resource value: 0x7F0D0009
-			public const int abc_capital_on = 2131558409;
+			// aapt resource value: 0x7f0a0009
+			public const int abc_capital_on = 2131361801;
 			
-			// aapt resource value: 0x7F0D000A
-			public const int abc_font_family_body_1_material = 2131558410;
+			// aapt resource value: 0x7f0a0015
+			public const int abc_font_family_body_1_material = 2131361813;
 			
-			// aapt resource value: 0x7F0D000B
-			public const int abc_font_family_body_2_material = 2131558411;
+			// aapt resource value: 0x7f0a0016
+			public const int abc_font_family_body_2_material = 2131361814;
 			
-			// aapt resource value: 0x7F0D000C
-			public const int abc_font_family_button_material = 2131558412;
+			// aapt resource value: 0x7f0a0017
+			public const int abc_font_family_button_material = 2131361815;
 			
-			// aapt resource value: 0x7F0D000D
-			public const int abc_font_family_caption_material = 2131558413;
+			// aapt resource value: 0x7f0a0018
+			public const int abc_font_family_caption_material = 2131361816;
 			
-			// aapt resource value: 0x7F0D000E
-			public const int abc_font_family_display_1_material = 2131558414;
+			// aapt resource value: 0x7f0a0019
+			public const int abc_font_family_display_1_material = 2131361817;
 			
-			// aapt resource value: 0x7F0D000F
-			public const int abc_font_family_display_2_material = 2131558415;
+			// aapt resource value: 0x7f0a001a
+			public const int abc_font_family_display_2_material = 2131361818;
 			
-			// aapt resource value: 0x7F0D0010
-			public const int abc_font_family_display_3_material = 2131558416;
+			// aapt resource value: 0x7f0a001b
+			public const int abc_font_family_display_3_material = 2131361819;
 			
-			// aapt resource value: 0x7F0D0011
-			public const int abc_font_family_display_4_material = 2131558417;
+			// aapt resource value: 0x7f0a001c
+			public const int abc_font_family_display_4_material = 2131361820;
 			
-			// aapt resource value: 0x7F0D0012
-			public const int abc_font_family_headline_material = 2131558418;
+			// aapt resource value: 0x7f0a001d
+			public const int abc_font_family_headline_material = 2131361821;
 			
-			// aapt resource value: 0x7F0D0013
-			public const int abc_font_family_menu_material = 2131558419;
+			// aapt resource value: 0x7f0a001e
+			public const int abc_font_family_menu_material = 2131361822;
 			
-			// aapt resource value: 0x7F0D0014
-			public const int abc_font_family_subhead_material = 2131558420;
+			// aapt resource value: 0x7f0a001f
+			public const int abc_font_family_subhead_material = 2131361823;
 			
-			// aapt resource value: 0x7F0D0015
-			public const int abc_font_family_title_material = 2131558421;
+			// aapt resource value: 0x7f0a0020
+			public const int abc_font_family_title_material = 2131361824;
 			
-			// aapt resource value: 0x7F0D0017
-			public const int abc_searchview_description_clear = 2131558423;
+			// aapt resource value: 0x7f0a000a
+			public const int abc_search_hint = 2131361802;
 			
-			// aapt resource value: 0x7F0D0018
-			public const int abc_searchview_description_query = 2131558424;
+			// aapt resource value: 0x7f0a000b
+			public const int abc_searchview_description_clear = 2131361803;
 			
-			// aapt resource value: 0x7F0D0019
-			public const int abc_searchview_description_search = 2131558425;
+			// aapt resource value: 0x7f0a000c
+			public const int abc_searchview_description_query = 2131361804;
 			
-			// aapt resource value: 0x7F0D001A
-			public const int abc_searchview_description_submit = 2131558426;
+			// aapt resource value: 0x7f0a000d
+			public const int abc_searchview_description_search = 2131361805;
 			
-			// aapt resource value: 0x7F0D001B
-			public const int abc_searchview_description_voice = 2131558427;
+			// aapt resource value: 0x7f0a000e
+			public const int abc_searchview_description_submit = 2131361806;
 			
-			// aapt resource value: 0x7F0D0016
-			public const int abc_search_hint = 2131558422;
+			// aapt resource value: 0x7f0a000f
+			public const int abc_searchview_description_voice = 2131361807;
 			
-			// aapt resource value: 0x7F0D001C
-			public const int abc_shareactionprovider_share_with = 2131558428;
+			// aapt resource value: 0x7f0a0010
+			public const int abc_shareactionprovider_share_with = 2131361808;
 			
-			// aapt resource value: 0x7F0D001D
-			public const int abc_shareactionprovider_share_with_application = 2131558429;
+			// aapt resource value: 0x7f0a0011
+			public const int abc_shareactionprovider_share_with_application = 2131361809;
 			
-			// aapt resource value: 0x7F0D001E
-			public const int abc_toolbar_collapse_description = 2131558430;
+			// aapt resource value: 0x7f0a0012
+			public const int abc_toolbar_collapse_description = 2131361810;
 			
-			// aapt resource value: 0x7F0D0020
-			public const int appbar_scrolling_view_behavior = 2131558432;
+			// aapt resource value: 0x7f0a0029
+			public const int app_name = 2131361833;
+			
+			// 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: 0x7f0a0065
+			public const int hello = 2131361893;
+			
+			// aapt resource value: 0x7f0a004e
+			public const int leak_canary_analysis_failed = 2131361870;
+			
+			// aapt resource value: 0x7f0a004f
+			public const int leak_canary_class_has_leaked = 2131361871;
+			
+			// aapt resource value: 0x7f0a0050
+			public const int leak_canary_could_not_save_text = 2131361872;
+			
+			// aapt resource value: 0x7f0a0051
+			public const int leak_canary_could_not_save_title = 2131361873;
+			
+			// aapt resource value: 0x7f0a0052
+			public const int leak_canary_delete = 2131361874;
+			
+			// aapt resource value: 0x7f0a0053
+			public const int leak_canary_delete_all = 2131361875;
+			
+			// aapt resource value: 0x7f0a0054
+			public const int leak_canary_delete_all_leaks_title = 2131361876;
+			
+			// aapt resource value: 0x7f0a0055
+			public const int leak_canary_display_activity_label = 2131361877;
+			
+			// aapt resource value: 0x7f0a0056
+			public const int leak_canary_excluded_row = 2131361878;
+			
+			// aapt resource value: 0x7f0a0057
+			public const int leak_canary_failure_report = 2131361879;
 			
-			// aapt resource value: 0x7F0D001F
-			public const int app_name = 2131558431;
+			// aapt resource value: 0x7f0a0058
+			public const int leak_canary_leak_excluded = 2131361880;
 			
-			// aapt resource value: 0x7F0D0021
-			public const int bottom_sheet_behavior = 2131558433;
+			// aapt resource value: 0x7f0a0059
+			public const int leak_canary_leak_list_title = 2131361881;
 			
-			// aapt resource value: 0x7F0D0022
-			public const int character_counter_pattern = 2131558434;
+			// aapt resource value: 0x7f0a005a
+			public const int leak_canary_no_leak_text = 2131361882;
 			
-			// aapt resource value: 0x7F0D0023
-			public const int gd_activity_title = 2131558435;
+			// aapt resource value: 0x7f0a005b
+			public const int leak_canary_no_leak_title = 2131361883;
 			
-			// aapt resource value: 0x7F0D0024
-			public const int gd_cancel = 2131558436;
+			// aapt resource value: 0x7f0a005c
+			public const int leak_canary_notification_message = 2131361884;
 			
-			// aapt resource value: 0x7F0D0025
-			public const int gd_myhome = 2131558437;
+			// aapt resource value: 0x7f0a005d
+			public const int leak_canary_permission_not_granted = 2131361885;
 			
-			// aapt resource value: 0x7F0D0026
-			public const int gd_notifyMsg = 2131558438;
+			// aapt resource value: 0x7f0a005e
+			public const int leak_canary_permission_notification_text = 2131361886;
 			
-			// aapt resource value: 0x7F0D0027
-			public const int gd_notifyTitle = 2131558439;
+			// aapt resource value: 0x7f0a005f
+			public const int leak_canary_permission_notification_title = 2131361887;
 			
-			// aapt resource value: 0x7F0D0028
-			public const int gd_save = 2131558440;
+			// aapt resource value: 0x7f0a0060
+			public const int leak_canary_share_heap_dump = 2131361888;
 			
-			// aapt resource value: 0x7F0D0029
-			public const int gd_search_tip = 2131558441;
+			// aapt resource value: 0x7f0a0061
+			public const int leak_canary_share_leak = 2131361889;
 			
-			// aapt resource value: 0x7F0D002A
-			public const int gd_select_distance = 2131558442;
+			// aapt resource value: 0x7f0a0062
+			public const int leak_canary_share_with = 2131361890;
 			
-			// aapt resource value: 0x7F0D002B
-			public const int gd_setting = 2131558443;
+			// aapt resource value: 0x7f0a0063
+			public const int leak_canary_storage_permission_activity_label = 2131361891;
 			
-			// aapt resource value: 0x7F0D002C
-			public const int hello = 2131558444;
+			// aapt resource value: 0x7f0a0064
+			public const int leak_canary_toast_heap_dump = 2131361892;
 			
-			// aapt resource value: 0x7F0D002D
-			public const int not_recognized_fingerprint_hint = 2131558445;
+			// aapt resource value: 0x7f0a002a
+			public const int not_recognized_fingerprint_hint = 2131361834;
 			
-			// aapt resource value: 0x7F0D002E
-			public const int password_toggle_content_description = 2131558446;
+			// aapt resource value: 0x7f0a0024
+			public const int password_toggle_content_description = 2131361828;
 			
-			// aapt resource value: 0x7F0D002F
-			public const int path_password_eye = 2131558447;
+			// aapt resource value: 0x7f0a0025
+			public const int path_password_eye = 2131361829;
 			
-			// aapt resource value: 0x7F0D0030
-			public const int path_password_eye_mask_strike_through = 2131558448;
+			// aapt resource value: 0x7f0a0026
+			public const int path_password_eye_mask_strike_through = 2131361830;
 			
-			// aapt resource value: 0x7F0D0031
-			public const int path_password_eye_mask_visible = 2131558449;
+			// aapt resource value: 0x7f0a0027
+			public const int path_password_eye_mask_visible = 2131361831;
 			
-			// aapt resource value: 0x7F0D0032
-			public const int path_password_strike_through = 2131558450;
+			// aapt resource value: 0x7f0a0028
+			public const int path_password_strike_through = 2131361832;
 			
-			// aapt resource value: 0x7F0D0033
-			public const int pickerview_cancel = 2131558451;
+			// aapt resource value: 0x7f0a0046
+			public const int pickerview_cancel = 2131361862;
 			
-			// aapt resource value: 0x7F0D0034
-			public const int pickerview_day = 2131558452;
+			// aapt resource value: 0x7f0a0047
+			public const int pickerview_day = 2131361863;
 			
-			// aapt resource value: 0x7F0D0035
-			public const int pickerview_hours = 2131558453;
+			// aapt resource value: 0x7f0a0048
+			public const int pickerview_hours = 2131361864;
 			
-			// aapt resource value: 0x7F0D0036
-			public const int pickerview_minutes = 2131558454;
+			// aapt resource value: 0x7f0a0049
+			public const int pickerview_minutes = 2131361865;
 			
-			// aapt resource value: 0x7F0D0037
-			public const int pickerview_month = 2131558455;
+			// aapt resource value: 0x7f0a004a
+			public const int pickerview_month = 2131361866;
 			
-			// aapt resource value: 0x7F0D0038
-			public const int pickerview_seconds = 2131558456;
+			// aapt resource value: 0x7f0a004b
+			public const int pickerview_seconds = 2131361867;
 			
-			// aapt resource value: 0x7F0D0039
-			public const int pickerview_submit = 2131558457;
+			// aapt resource value: 0x7f0a004c
+			public const int pickerview_submit = 2131361868;
 			
-			// aapt resource value: 0x7F0D003A
-			public const int pickerview_year = 2131558458;
+			// aapt resource value: 0x7f0a004d
+			public const int pickerview_year = 2131361869;
 			
-			// aapt resource value: 0x7F0D003B
-			public const int search_menu_title = 2131558459;
+			// aapt resource value: 0x7f0a0013
+			public const int search_menu_title = 2131361811;
 			
-			// aapt resource value: 0x7F0D003C
-			public const int srl_component_falsify = 2131558460;
+			// aapt resource value: 0x7f0a002c
+			public const int srl_component_falsify = 2131361836;
 			
-			// aapt resource value: 0x7F0D003D
-			public const int srl_content_empty = 2131558461;
+			// aapt resource value: 0x7f0a002d
+			public const int srl_content_empty = 2131361837;
 			
-			// aapt resource value: 0x7F0D003E
-			public const int srl_footer_failed = 2131558462;
+			// aapt resource value: 0x7f0a002e
+			public const int srl_footer_failed = 2131361838;
 			
-			// aapt resource value: 0x7F0D003F
-			public const int srl_footer_finish = 2131558463;
+			// aapt resource value: 0x7f0a002f
+			public const int srl_footer_finish = 2131361839;
 			
-			// aapt resource value: 0x7F0D0040
-			public const int srl_footer_loading = 2131558464;
+			// aapt resource value: 0x7f0a0030
+			public const int srl_footer_loading = 2131361840;
 			
-			// aapt resource value: 0x7F0D0041
-			public const int srl_footer_nothing = 2131558465;
+			// aapt resource value: 0x7f0a0031
+			public const int srl_footer_nothing = 2131361841;
 			
-			// aapt resource value: 0x7F0D0042
-			public const int srl_footer_pulling = 2131558466;
+			// aapt resource value: 0x7f0a0032
+			public const int srl_footer_pulling = 2131361842;
 			
-			// aapt resource value: 0x7F0D0043
-			public const int srl_footer_refreshing = 2131558467;
+			// aapt resource value: 0x7f0a0033
+			public const int srl_footer_refreshing = 2131361843;
 			
-			// aapt resource value: 0x7F0D0044
-			public const int srl_footer_release = 2131558468;
+			// aapt resource value: 0x7f0a0034
+			public const int srl_footer_release = 2131361844;
 			
-			// aapt resource value: 0x7F0D0045
-			public const int srl_header_failed = 2131558469;
+			// aapt resource value: 0x7f0a0035
+			public const int srl_header_failed = 2131361845;
 			
-			// aapt resource value: 0x7F0D0046
-			public const int srl_header_finish = 2131558470;
+			// aapt resource value: 0x7f0a0036
+			public const int srl_header_finish = 2131361846;
 			
-			// aapt resource value: 0x7F0D0047
-			public const int srl_header_loading = 2131558471;
+			// aapt resource value: 0x7f0a0037
+			public const int srl_header_loading = 2131361847;
 			
-			// aapt resource value: 0x7F0D0048
-			public const int srl_header_pulling = 2131558472;
+			// aapt resource value: 0x7f0a0038
+			public const int srl_header_pulling = 2131361848;
 			
-			// aapt resource value: 0x7F0D0049
-			public const int srl_header_refreshing = 2131558473;
+			// aapt resource value: 0x7f0a0039
+			public const int srl_header_refreshing = 2131361849;
 			
-			// aapt resource value: 0x7F0D004A
-			public const int srl_header_release = 2131558474;
+			// aapt resource value: 0x7f0a003a
+			public const int srl_header_release = 2131361850;
 			
-			// aapt resource value: 0x7F0D004B
-			public const int srl_header_secondary = 2131558475;
+			// aapt resource value: 0x7f0a003b
+			public const int srl_header_secondary = 2131361851;
 			
-			// aapt resource value: 0x7F0D004C
-			public const int srl_header_update = 2131558476;
+			// aapt resource value: 0x7f0a003c
+			public const int srl_header_update = 2131361852;
 			
-			// aapt resource value: 0x7F0D004D
-			public const int status_bar_notification_info_overflow = 2131558477;
+			// aapt resource value: 0x7f0a0014
+			public const int status_bar_notification_info_overflow = 2131361812;
 			
-			// aapt resource value: 0x7F0D004E
-			public const int touch_fingerprint_sensor_hint = 2131558478;
+			// aapt resource value: 0x7f0a002b
+			public const int touch_fingerprint_sensor_hint = 2131361835;
 			
 			static String()
 			{
@@ -4595,1214 +4730,1220 @@
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7F0E0000
-			public const int AlertDialog_AppCompat = 2131623936;
+			// aapt resource value: 0x7f0b009d
+			public const int AlertDialog_AppCompat = 2131427485;
 			
-			// aapt resource value: 0x7F0E0001
-			public const int AlertDialog_AppCompat_Light = 2131623937;
+			// aapt resource value: 0x7f0b009e
+			public const int AlertDialog_AppCompat_Light = 2131427486;
 			
-			// aapt resource value: 0x7F0E0002
-			public const int Animation_AppCompat_Dialog = 2131623938;
+			// aapt resource value: 0x7f0b009f
+			public const int Animation_AppCompat_Dialog = 2131427487;
 			
-			// aapt resource value: 0x7F0E0003
-			public const int Animation_AppCompat_DropDownUp = 2131623939;
+			// aapt resource value: 0x7f0b00a0
+			public const int Animation_AppCompat_DropDownUp = 2131427488;
 			
-			// aapt resource value: 0x7F0E0004
-			public const int Animation_AppCompat_Tooltip = 2131623940;
+			// aapt resource value: 0x7f0b00a1
+			public const int Animation_AppCompat_Tooltip = 2131427489;
 			
-			// aapt resource value: 0x7F0E0005
-			public const int Animation_Design_BottomSheetDialog = 2131623941;
+			// aapt resource value: 0x7f0b0169
+			public const int Animation_Design_BottomSheetDialog = 2131427689;
 			
-			// aapt resource value: 0x7F0E0006
-			public const int AppTheme = 2131623942;
+			// aapt resource value: 0x7f0b018a
+			public const int AppTheme = 2131427722;
 			
-			// aapt resource value: 0x7F0E0007
-			public const int Base_AlertDialog_AppCompat = 2131623943;
+			// aapt resource value: 0x7f0b00a2
+			public const int Base_AlertDialog_AppCompat = 2131427490;
 			
-			// aapt resource value: 0x7F0E0008
-			public const int Base_AlertDialog_AppCompat_Light = 2131623944;
+			// aapt resource value: 0x7f0b00a3
+			public const int Base_AlertDialog_AppCompat_Light = 2131427491;
 			
-			// aapt resource value: 0x7F0E0009
-			public const int Base_Animation_AppCompat_Dialog = 2131623945;
+			// aapt resource value: 0x7f0b00a4
+			public const int Base_Animation_AppCompat_Dialog = 2131427492;
 			
-			// aapt resource value: 0x7F0E000A
-			public const int Base_Animation_AppCompat_DropDownUp = 2131623946;
+			// aapt resource value: 0x7f0b00a5
+			public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
 			
-			// aapt resource value: 0x7F0E000B
-			public const int Base_Animation_AppCompat_Tooltip = 2131623947;
+			// aapt resource value: 0x7f0b00a6
+			public const int Base_Animation_AppCompat_Tooltip = 2131427494;
 			
-			// aapt resource value: 0x7F0E000D
-			public const int Base_DialogWindowTitleBackground_AppCompat = 2131623949;
+			// aapt resource value: 0x7f0b00a7
+			public const int Base_DialogWindowTitle_AppCompat = 2131427495;
 			
-			// aapt resource value: 0x7F0E000C
-			public const int Base_DialogWindowTitle_AppCompat = 2131623948;
+			// aapt resource value: 0x7f0b00a8
+			public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
 			
-			// aapt resource value: 0x7F0E000E
-			public const int Base_TextAppearance_AppCompat = 2131623950;
+			// aapt resource value: 0x7f0b0039
+			public const int Base_TextAppearance_AppCompat = 2131427385;
 			
-			// aapt resource value: 0x7F0E000F
-			public const int Base_TextAppearance_AppCompat_Body1 = 2131623951;
+			// aapt resource value: 0x7f0b003a
+			public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
 			
-			// aapt resource value: 0x7F0E0010
-			public const int Base_TextAppearance_AppCompat_Body2 = 2131623952;
+			// aapt resource value: 0x7f0b003b
+			public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
 			
-			// aapt resource value: 0x7F0E0011
-			public const int Base_TextAppearance_AppCompat_Button = 2131623953;
+			// aapt resource value: 0x7f0b0027
+			public const int Base_TextAppearance_AppCompat_Button = 2131427367;
 			
-			// aapt resource value: 0x7F0E0012
-			public const int Base_TextAppearance_AppCompat_Caption = 2131623954;
+			// aapt resource value: 0x7f0b003c
+			public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
 			
-			// aapt resource value: 0x7F0E0013
-			public const int Base_TextAppearance_AppCompat_Display1 = 2131623955;
+			// aapt resource value: 0x7f0b003d
+			public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
 			
-			// aapt resource value: 0x7F0E0014
-			public const int Base_TextAppearance_AppCompat_Display2 = 2131623956;
+			// aapt resource value: 0x7f0b003e
+			public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
 			
-			// aapt resource value: 0x7F0E0015
-			public const int Base_TextAppearance_AppCompat_Display3 = 2131623957;
+			// aapt resource value: 0x7f0b003f
+			public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
 			
-			// aapt resource value: 0x7F0E0016
-			public const int Base_TextAppearance_AppCompat_Display4 = 2131623958;
+			// aapt resource value: 0x7f0b0040
+			public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
 			
-			// aapt resource value: 0x7F0E0017
-			public const int Base_TextAppearance_AppCompat_Headline = 2131623959;
+			// aapt resource value: 0x7f0b0041
+			public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
 			
-			// aapt resource value: 0x7F0E0018
-			public const int Base_TextAppearance_AppCompat_Inverse = 2131623960;
+			// aapt resource value: 0x7f0b000b
+			public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
 			
-			// aapt resource value: 0x7F0E0019
-			public const int Base_TextAppearance_AppCompat_Large = 2131623961;
+			// aapt resource value: 0x7f0b0042
+			public const int Base_TextAppearance_AppCompat_Large = 2131427394;
 			
-			// aapt resource value: 0x7F0E001A
-			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623962;
+			// aapt resource value: 0x7f0b000c
+			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
 			
-			// aapt resource value: 0x7F0E001B
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623963;
+			// aapt resource value: 0x7f0b0043
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
 			
-			// aapt resource value: 0x7F0E001C
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623964;
+			// aapt resource value: 0x7f0b0044
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
 			
-			// aapt resource value: 0x7F0E001D
-			public const int Base_TextAppearance_AppCompat_Medium = 2131623965;
+			// aapt resource value: 0x7f0b0045
+			public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
 			
-			// aapt resource value: 0x7F0E001E
-			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623966;
+			// aapt resource value: 0x7f0b000d
+			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
 			
-			// aapt resource value: 0x7F0E001F
-			public const int Base_TextAppearance_AppCompat_Menu = 2131623967;
+			// aapt resource value: 0x7f0b0046
+			public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
 			
-			// aapt resource value: 0x7F0E0020
-			public const int Base_TextAppearance_AppCompat_SearchResult = 2131623968;
+			// aapt resource value: 0x7f0b00a9
+			public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
 			
-			// aapt resource value: 0x7F0E0021
-			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623969;
+			// aapt resource value: 0x7f0b0047
+			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
 			
-			// aapt resource value: 0x7F0E0022
-			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623970;
+			// aapt resource value: 0x7f0b0048
+			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
 			
-			// aapt resource value: 0x7F0E0023
-			public const int Base_TextAppearance_AppCompat_Small = 2131623971;
+			// aapt resource value: 0x7f0b0049
+			public const int Base_TextAppearance_AppCompat_Small = 2131427401;
 			
-			// aapt resource value: 0x7F0E0024
-			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623972;
+			// aapt resource value: 0x7f0b000e
+			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
 			
-			// aapt resource value: 0x7F0E0025
-			public const int Base_TextAppearance_AppCompat_Subhead = 2131623973;
+			// aapt resource value: 0x7f0b004a
+			public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
 			
-			// aapt resource value: 0x7F0E0026
-			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623974;
+			// aapt resource value: 0x7f0b000f
+			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
 			
-			// aapt resource value: 0x7F0E0027
-			public const int Base_TextAppearance_AppCompat_Title = 2131623975;
+			// aapt resource value: 0x7f0b004b
+			public const int Base_TextAppearance_AppCompat_Title = 2131427403;
 			
-			// aapt resource value: 0x7F0E0028
-			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623976;
+			// aapt resource value: 0x7f0b0010
+			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
 			
-			// aapt resource value: 0x7F0E0029
-			public const int Base_TextAppearance_AppCompat_Tooltip = 2131623977;
+			// aapt resource value: 0x7f0b00aa
+			public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
 			
-			// aapt resource value: 0x7F0E002A
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623978;
+			// aapt resource value: 0x7f0b008e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
 			
-			// aapt resource value: 0x7F0E002B
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623979;
+			// aapt resource value: 0x7f0b004c
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
 			
-			// aapt resource value: 0x7F0E002C
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623980;
+			// aapt resource value: 0x7f0b004d
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
 			
-			// aapt resource value: 0x7F0E002D
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623981;
+			// aapt resource value: 0x7f0b004e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
 			
-			// aapt resource value: 0x7F0E002E
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623982;
+			// aapt resource value: 0x7f0b004f
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
 			
-			// aapt resource value: 0x7F0E002F
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623983;
+			// aapt resource value: 0x7f0b0050
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
 			
-			// aapt resource value: 0x7F0E0030
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623984;
+			// aapt resource value: 0x7f0b0051
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
 			
-			// aapt resource value: 0x7F0E0031
-			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623985;
+			// aapt resource value: 0x7f0b0052
+			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
 			
-			// aapt resource value: 0x7F0E0032
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623986;
+			// aapt resource value: 0x7f0b0095
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
 			
-			// aapt resource value: 0x7F0E0033
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623987;
+			// aapt resource value: 0x7f0b0096
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
 			
-			// aapt resource value: 0x7F0E0034
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623988;
+			// aapt resource value: 0x7f0b008f
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
 			
-			// aapt resource value: 0x7F0E0035
-			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623989;
+			// aapt resource value: 0x7f0b00ab
+			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
 			
-			// aapt resource value: 0x7F0E0036
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623990;
+			// aapt resource value: 0x7f0b0053
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
 			
-			// aapt resource value: 0x7F0E0037
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623991;
+			// aapt resource value: 0x7f0b0054
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
 			
-			// aapt resource value: 0x7F0E0038
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623992;
+			// aapt resource value: 0x7f0b0055
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
 			
-			// aapt resource value: 0x7F0E0039
-			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623993;
+			// aapt resource value: 0x7f0b0056
+			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
 			
-			// aapt resource value: 0x7F0E003A
-			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623994;
+			// aapt resource value: 0x7f0b0057
+			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
 			
-			// aapt resource value: 0x7F0E003B
-			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623995;
+			// aapt resource value: 0x7f0b00ac
+			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
 			
-			// aapt resource value: 0x7F0E003C
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623996;
+			// aapt resource value: 0x7f0b0058
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
 			
-			// aapt resource value: 0x7F0E003D
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623997;
+			// aapt resource value: 0x7f0b0059
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
 			
-			// aapt resource value: 0x7F0E004C
-			public const int Base_ThemeOverlay_AppCompat = 2131624012;
+			// aapt resource value: 0x7f0b005a
+			public const int Base_Theme_AppCompat = 2131427418;
 			
-			// aapt resource value: 0x7F0E004D
-			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624013;
+			// aapt resource value: 0x7f0b00ad
+			public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
 			
-			// aapt resource value: 0x7F0E004E
-			public const int Base_ThemeOverlay_AppCompat_Dark = 2131624014;
+			// aapt resource value: 0x7f0b0011
+			public const int Base_Theme_AppCompat_Dialog = 2131427345;
 			
-			// aapt resource value: 0x7F0E004F
-			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624015;
+			// aapt resource value: 0x7f0b0012
+			public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
 			
-			// aapt resource value: 0x7F0E0050
-			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624016;
+			// aapt resource value: 0x7f0b00ae
+			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
 			
-			// aapt resource value: 0x7F0E0051
-			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624017;
+			// aapt resource value: 0x7f0b0013
+			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
 			
-			// aapt resource value: 0x7F0E0052
-			public const int Base_ThemeOverlay_AppCompat_Light = 2131624018;
+			// aapt resource value: 0x7f0b0001
+			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
 			
-			// aapt resource value: 0x7F0E003E
-			public const int Base_Theme_AppCompat = 2131623998;
+			// aapt resource value: 0x7f0b005b
+			public const int Base_Theme_AppCompat_Light = 2131427419;
 			
-			// aapt resource value: 0x7F0E003F
-			public const int Base_Theme_AppCompat_CompactMenu = 2131623999;
+			// aapt resource value: 0x7f0b00af
+			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
 			
-			// aapt resource value: 0x7F0E0040
-			public const int Base_Theme_AppCompat_Dialog = 2131624000;
+			// aapt resource value: 0x7f0b0014
+			public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
 			
-			// aapt resource value: 0x7F0E0044
-			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624004;
+			// aapt resource value: 0x7f0b0015
+			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
 			
-			// aapt resource value: 0x7F0E0041
-			public const int Base_Theme_AppCompat_Dialog_Alert = 2131624001;
+			// aapt resource value: 0x7f0b00b0
+			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
 			
-			// aapt resource value: 0x7F0E0042
-			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624002;
+			// aapt resource value: 0x7f0b0016
+			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
 			
-			// aapt resource value: 0x7F0E0043
-			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624003;
+			// aapt resource value: 0x7f0b0002
+			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
 			
-			// aapt resource value: 0x7F0E0045
-			public const int Base_Theme_AppCompat_Light = 2131624005;
+			// aapt resource value: 0x7f0b00b1
+			public const int Base_ThemeOverlay_AppCompat = 2131427505;
 			
-			// aapt resource value: 0x7F0E0046
-			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624006;
+			// aapt resource value: 0x7f0b00b2
+			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
 			
-			// aapt resource value: 0x7F0E0047
-			public const int Base_Theme_AppCompat_Light_Dialog = 2131624007;
+			// aapt resource value: 0x7f0b00b3
+			public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
 			
-			// aapt resource value: 0x7F0E004B
-			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624011;
+			// aapt resource value: 0x7f0b00b4
+			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
 			
-			// aapt resource value: 0x7F0E0048
-			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624008;
+			// aapt resource value: 0x7f0b0017
+			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
 			
-			// aapt resource value: 0x7F0E0049
-			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624009;
+			// aapt resource value: 0x7f0b0018
+			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
 			
-			// aapt resource value: 0x7F0E004A
-			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624010;
+			// aapt resource value: 0x7f0b00b5
+			public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
 			
-			// aapt resource value: 0x7F0E0055
-			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624021;
+			// aapt resource value: 0x7f0b0019
+			public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
 			
-			// aapt resource value: 0x7F0E0053
-			public const int Base_V11_Theme_AppCompat_Dialog = 2131624019;
+			// aapt resource value: 0x7f0b001a
+			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
 			
-			// aapt resource value: 0x7F0E0054
-			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624020;
+			// aapt resource value: 0x7f0b001b
+			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
 			
-			// aapt resource value: 0x7F0E0056
-			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624022;
+			// aapt resource value: 0x7f0b0023
+			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
 			
-			// aapt resource value: 0x7F0E0057
-			public const int Base_V12_Widget_AppCompat_EditText = 2131624023;
+			// aapt resource value: 0x7f0b0024
+			public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
 			
-			// aapt resource value: 0x7F0E0058
-			public const int Base_V14_Widget_Design_AppBarLayout = 2131624024;
+			// aapt resource value: 0x7f0b016a
+			public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
 			
-			// aapt resource value: 0x7F0E005D
-			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624029;
+			// aapt resource value: 0x7f0b005c
+			public const int Base_V21_Theme_AppCompat = 2131427420;
 			
-			// aapt resource value: 0x7F0E0059
-			public const int Base_V21_Theme_AppCompat = 2131624025;
+			// aapt resource value: 0x7f0b005d
+			public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
 			
-			// aapt resource value: 0x7F0E005A
-			public const int Base_V21_Theme_AppCompat_Dialog = 2131624026;
+			// aapt resource value: 0x7f0b005e
+			public const int Base_V21_Theme_AppCompat_Light = 2131427422;
 			
-			// aapt resource value: 0x7F0E005B
-			public const int Base_V21_Theme_AppCompat_Light = 2131624027;
+			// aapt resource value: 0x7f0b005f
+			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
 			
-			// aapt resource value: 0x7F0E005C
-			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624028;
+			// aapt resource value: 0x7f0b0060
+			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
 			
-			// aapt resource value: 0x7F0E005E
-			public const int Base_V21_Widget_Design_AppBarLayout = 2131624030;
+			// aapt resource value: 0x7f0b0166
+			public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
 			
-			// aapt resource value: 0x7F0E005F
-			public const int Base_V22_Theme_AppCompat = 2131624031;
+			// aapt resource value: 0x7f0b008c
+			public const int Base_V22_Theme_AppCompat = 2131427468;
 			
-			// aapt resource value: 0x7F0E0060
-			public const int Base_V22_Theme_AppCompat_Light = 2131624032;
+			// aapt resource value: 0x7f0b008d
+			public const int Base_V22_Theme_AppCompat_Light = 2131427469;
 			
-			// aapt resource value: 0x7F0E0061
-			public const int Base_V23_Theme_AppCompat = 2131624033;
+			// aapt resource value: 0x7f0b0090
+			public const int Base_V23_Theme_AppCompat = 2131427472;
 			
-			// aapt resource value: 0x7F0E0062
-			public const int Base_V23_Theme_AppCompat_Light = 2131624034;
+			// aapt resource value: 0x7f0b0091
+			public const int Base_V23_Theme_AppCompat_Light = 2131427473;
 			
-			// aapt resource value: 0x7F0E0063
-			public const int Base_V26_Theme_AppCompat = 2131624035;
+			// aapt resource value: 0x7f0b0099
+			public const int Base_V26_Theme_AppCompat = 2131427481;
 			
-			// aapt resource value: 0x7F0E0064
-			public const int Base_V26_Theme_AppCompat_Light = 2131624036;
+			// aapt resource value: 0x7f0b009a
+			public const int Base_V26_Theme_AppCompat_Light = 2131427482;
 			
-			// aapt resource value: 0x7F0E0065
-			public const int Base_V26_Widget_AppCompat_Toolbar = 2131624037;
+			// aapt resource value: 0x7f0b009b
+			public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
 			
-			// aapt resource value: 0x7F0E0066
-			public const int Base_V26_Widget_Design_AppBarLayout = 2131624038;
+			// aapt resource value: 0x7f0b0168
+			public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
 			
-			// aapt resource value: 0x7F0E006B
-			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624043;
+			// aapt resource value: 0x7f0b00b6
+			public const int Base_V7_Theme_AppCompat = 2131427510;
 			
-			// aapt resource value: 0x7F0E0067
-			public const int Base_V7_Theme_AppCompat = 2131624039;
+			// aapt resource value: 0x7f0b00b7
+			public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
 			
-			// aapt resource value: 0x7F0E0068
-			public const int Base_V7_Theme_AppCompat_Dialog = 2131624040;
+			// aapt resource value: 0x7f0b00b8
+			public const int Base_V7_Theme_AppCompat_Light = 2131427512;
 			
-			// aapt resource value: 0x7F0E0069
-			public const int Base_V7_Theme_AppCompat_Light = 2131624041;
+			// aapt resource value: 0x7f0b00b9
+			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
 			
-			// aapt resource value: 0x7F0E006A
-			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624042;
+			// aapt resource value: 0x7f0b00ba
+			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
 			
-			// aapt resource value: 0x7F0E006C
-			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624044;
+			// aapt resource value: 0x7f0b00bb
+			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
 			
-			// aapt resource value: 0x7F0E006D
-			public const int Base_V7_Widget_AppCompat_EditText = 2131624045;
+			// aapt resource value: 0x7f0b00bc
+			public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
 			
-			// aapt resource value: 0x7F0E006E
-			public const int Base_V7_Widget_AppCompat_Toolbar = 2131624046;
+			// aapt resource value: 0x7f0b00bd
+			public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
 			
-			// aapt resource value: 0x7F0E006F
-			public const int Base_Widget_AppCompat_ActionBar = 2131624047;
+			// aapt resource value: 0x7f0b00be
+			public const int Base_Widget_AppCompat_ActionBar = 2131427518;
 			
-			// aapt resource value: 0x7F0E0070
-			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624048;
+			// aapt resource value: 0x7f0b00bf
+			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
 			
-			// aapt resource value: 0x7F0E0071
-			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624049;
+			// aapt resource value: 0x7f0b00c0
+			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
 			
-			// aapt resource value: 0x7F0E0072
-			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624050;
+			// aapt resource value: 0x7f0b0061
+			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
 			
-			// aapt resource value: 0x7F0E0073
-			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624051;
+			// aapt resource value: 0x7f0b0062
+			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
 			
-			// aapt resource value: 0x7F0E0074
-			public const int Base_Widget_AppCompat_ActionButton = 2131624052;
+			// aapt resource value: 0x7f0b0063
+			public const int Base_Widget_AppCompat_ActionButton = 2131427427;
 			
-			// aapt resource value: 0x7F0E0075
-			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624053;
+			// aapt resource value: 0x7f0b0064
+			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
 			
-			// aapt resource value: 0x7F0E0076
-			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624054;
+			// aapt resource value: 0x7f0b0065
+			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
 			
-			// aapt resource value: 0x7F0E0077
-			public const int Base_Widget_AppCompat_ActionMode = 2131624055;
+			// aapt resource value: 0x7f0b00c1
+			public const int Base_Widget_AppCompat_ActionMode = 2131427521;
 			
-			// aapt resource value: 0x7F0E0078
-			public const int Base_Widget_AppCompat_ActivityChooserView = 2131624056;
+			// aapt resource value: 0x7f0b00c2
+			public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
 			
-			// aapt resource value: 0x7F0E0079
-			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624057;
+			// aapt resource value: 0x7f0b0025
+			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
 			
-			// aapt resource value: 0x7F0E007A
-			public const int Base_Widget_AppCompat_Button = 2131624058;
+			// aapt resource value: 0x7f0b0066
+			public const int Base_Widget_AppCompat_Button = 2131427430;
 			
-			// aapt resource value: 0x7F0E0080
-			public const int Base_Widget_AppCompat_ButtonBar = 2131624064;
+			// aapt resource value: 0x7f0b0067
+			public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
 			
-			// aapt resource value: 0x7F0E0081
-			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624065;
+			// aapt resource value: 0x7f0b0068
+			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
 			
-			// aapt resource value: 0x7F0E007B
-			public const int Base_Widget_AppCompat_Button_Borderless = 2131624059;
+			// aapt resource value: 0x7f0b00c3
+			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
 			
-			// aapt resource value: 0x7F0E007C
-			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624060;
+			// aapt resource value: 0x7f0b0092
+			public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
 			
-			// aapt resource value: 0x7F0E007D
-			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624061;
+			// aapt resource value: 0x7f0b0069
+			public const int Base_Widget_AppCompat_Button_Small = 2131427433;
 			
-			// aapt resource value: 0x7F0E007E
-			public const int Base_Widget_AppCompat_Button_Colored = 2131624062;
+			// aapt resource value: 0x7f0b006a
+			public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
 			
-			// aapt resource value: 0x7F0E007F
-			public const int Base_Widget_AppCompat_Button_Small = 2131624063;
+			// aapt resource value: 0x7f0b00c4
+			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
 			
-			// aapt resource value: 0x7F0E0082
-			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624066;
+			// aapt resource value: 0x7f0b006b
+			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
 			
-			// aapt resource value: 0x7F0E0083
-			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624067;
+			// aapt resource value: 0x7f0b006c
+			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
 			
-			// aapt resource value: 0x7F0E0084
-			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624068;
+			// aapt resource value: 0x7f0b00c5
+			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
 			
-			// aapt resource value: 0x7F0E0085
-			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624069;
+			// aapt resource value: 0x7f0b0000
+			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
 			
-			// aapt resource value: 0x7F0E0086
-			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624070;
+			// aapt resource value: 0x7f0b00c6
+			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
 			
-			// aapt resource value: 0x7F0E0087
-			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624071;
+			// aapt resource value: 0x7f0b006d
+			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
 			
-			// aapt resource value: 0x7F0E0088
-			public const int Base_Widget_AppCompat_EditText = 2131624072;
+			// aapt resource value: 0x7f0b0026
+			public const int Base_Widget_AppCompat_EditText = 2131427366;
 			
-			// aapt resource value: 0x7F0E0089
-			public const int Base_Widget_AppCompat_ImageButton = 2131624073;
+			// aapt resource value: 0x7f0b006e
+			public const int Base_Widget_AppCompat_ImageButton = 2131427438;
 			
-			// aapt resource value: 0x7F0E008A
-			public const int Base_Widget_AppCompat_Light_ActionBar = 2131624074;
+			// aapt resource value: 0x7f0b00c7
+			public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
 			
-			// aapt resource value: 0x7F0E008B
-			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624075;
+			// aapt resource value: 0x7f0b00c8
+			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
 			
-			// aapt resource value: 0x7F0E008C
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624076;
+			// aapt resource value: 0x7f0b00c9
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
 			
-			// aapt resource value: 0x7F0E008D
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624077;
+			// aapt resource value: 0x7f0b006f
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
 			
-			// aapt resource value: 0x7F0E008E
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624078;
+			// aapt resource value: 0x7f0b0070
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
 			
-			// aapt resource value: 0x7F0E008F
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624079;
+			// aapt resource value: 0x7f0b0071
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
 			
-			// aapt resource value: 0x7F0E0090
-			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624080;
+			// aapt resource value: 0x7f0b0072
+			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
 			
-			// aapt resource value: 0x7F0E0091
-			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624081;
+			// aapt resource value: 0x7f0b0073
+			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
 			
-			// aapt resource value: 0x7F0E0092
-			public const int Base_Widget_AppCompat_ListMenuView = 2131624082;
+			// aapt resource value: 0x7f0b00ca
+			public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
 			
-			// aapt resource value: 0x7F0E0093
-			public const int Base_Widget_AppCompat_ListPopupWindow = 2131624083;
+			// aapt resource value: 0x7f0b0074
+			public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
 			
-			// aapt resource value: 0x7F0E0094
-			public const int Base_Widget_AppCompat_ListView = 2131624084;
+			// aapt resource value: 0x7f0b0075
+			public const int Base_Widget_AppCompat_ListView = 2131427445;
 			
-			// aapt resource value: 0x7F0E0095
-			public const int Base_Widget_AppCompat_ListView_DropDown = 2131624085;
+			// aapt resource value: 0x7f0b0076
+			public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
 			
-			// aapt resource value: 0x7F0E0096
-			public const int Base_Widget_AppCompat_ListView_Menu = 2131624086;
+			// aapt resource value: 0x7f0b0077
+			public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
 			
-			// aapt resource value: 0x7F0E0097
-			public const int Base_Widget_AppCompat_PopupMenu = 2131624087;
+			// aapt resource value: 0x7f0b0078
+			public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
 			
-			// aapt resource value: 0x7F0E0098
-			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624088;
+			// aapt resource value: 0x7f0b0079
+			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
 			
-			// aapt resource value: 0x7F0E0099
-			public const int Base_Widget_AppCompat_PopupWindow = 2131624089;
+			// aapt resource value: 0x7f0b00cb
+			public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
 			
-			// aapt resource value: 0x7F0E009A
-			public const int Base_Widget_AppCompat_ProgressBar = 2131624090;
+			// aapt resource value: 0x7f0b001c
+			public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
 			
-			// aapt resource value: 0x7F0E009B
-			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624091;
+			// aapt resource value: 0x7f0b001d
+			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
 			
-			// aapt resource value: 0x7F0E009C
-			public const int Base_Widget_AppCompat_RatingBar = 2131624092;
+			// aapt resource value: 0x7f0b007a
+			public const int Base_Widget_AppCompat_RatingBar = 2131427450;
 			
-			// aapt resource value: 0x7F0E009D
-			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624093;
+			// aapt resource value: 0x7f0b0093
+			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
 			
-			// aapt resource value: 0x7F0E009E
-			public const int Base_Widget_AppCompat_RatingBar_Small = 2131624094;
+			// aapt resource value: 0x7f0b0094
+			public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
 			
-			// aapt resource value: 0x7F0E009F
-			public const int Base_Widget_AppCompat_SearchView = 2131624095;
+			// aapt resource value: 0x7f0b00cc
+			public const int Base_Widget_AppCompat_SearchView = 2131427532;
 			
-			// aapt resource value: 0x7F0E00A0
-			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624096;
+			// aapt resource value: 0x7f0b00cd
+			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
 			
-			// aapt resource value: 0x7F0E00A1
-			public const int Base_Widget_AppCompat_SeekBar = 2131624097;
+			// aapt resource value: 0x7f0b007b
+			public const int Base_Widget_AppCompat_SeekBar = 2131427451;
 			
-			// aapt resource value: 0x7F0E00A2
-			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624098;
+			// aapt resource value: 0x7f0b00ce
+			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
 			
-			// aapt resource value: 0x7F0E00A3
-			public const int Base_Widget_AppCompat_Spinner = 2131624099;
+			// aapt resource value: 0x7f0b007c
+			public const int Base_Widget_AppCompat_Spinner = 2131427452;
 			
-			// aapt resource value: 0x7F0E00A4
-			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624100;
+			// aapt resource value: 0x7f0b0003
+			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
 			
-			// aapt resource value: 0x7F0E00A5
-			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624101;
+			// aapt resource value: 0x7f0b007d
+			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
 			
-			// aapt resource value: 0x7F0E00A6
-			public const int Base_Widget_AppCompat_Toolbar = 2131624102;
+			// aapt resource value: 0x7f0b009c
+			public const int Base_Widget_AppCompat_Toolbar = 2131427484;
 			
-			// aapt resource value: 0x7F0E00A7
-			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624103;
+			// aapt resource value: 0x7f0b007e
+			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
 			
-			// aapt resource value: 0x7F0E00A8
-			public const int Base_Widget_Design_AppBarLayout = 2131624104;
+			// aapt resource value: 0x7f0b0167
+			public const int Base_Widget_Design_AppBarLayout = 2131427687;
 			
-			// aapt resource value: 0x7F0E00A9
-			public const int Base_Widget_Design_TabLayout = 2131624105;
+			// aapt resource value: 0x7f0b016b
+			public const int Base_Widget_Design_TabLayout = 2131427691;
 			
-			// aapt resource value: 0x7F0E00AA
-			public const int BottomSheetDialogAnimation = 2131624106;
+			// aapt resource value: 0x7f0b018b
+			public const int BottomSheetDialogAnimation = 2131427723;
 			
-			// aapt resource value: 0x7F0E0190
-			public const int custom_dialog2 = 2131624336;
+			// aapt resource value: 0x7f0b0194
+			public const int DialogTheme = 2131427732;
 			
-			// aapt resource value: 0x7F0E00AB
-			public const int DialogTheme = 2131624107;
+			// aapt resource value: 0x7f0b0192
+			public const int MyTheme = 2131427730;
 			
-			// aapt resource value: 0x7F0E00AC
-			public const int MyTheme = 2131624108;
+			// aapt resource value: 0x7f0b0193
+			public const int MyTheme1 = 2131427731;
 			
-			// aapt resource value: 0x7F0E00AD
-			public const int MyTheme1 = 2131624109;
+			// aapt resource value: 0x7f0b001e
+			public const int Platform_AppCompat = 2131427358;
 			
-			// aapt resource value: 0x7F0E0191
-			public const int picker_view_scale_anim = 2131624337;
+			// aapt resource value: 0x7f0b001f
+			public const int Platform_AppCompat_Light = 2131427359;
 			
-			// aapt resource value: 0x7F0E0192
-			public const int picker_view_slide_anim = 2131624338;
+			// aapt resource value: 0x7f0b007f
+			public const int Platform_ThemeOverlay_AppCompat = 2131427455;
 			
-			// aapt resource value: 0x7F0E00AE
-			public const int Platform_AppCompat = 2131624110;
+			// aapt resource value: 0x7f0b0080
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
 			
-			// aapt resource value: 0x7F0E00AF
-			public const int Platform_AppCompat_Light = 2131624111;
+			// aapt resource value: 0x7f0b0081
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
 			
-			// aapt resource value: 0x7F0E00B0
-			public const int Platform_ThemeOverlay_AppCompat = 2131624112;
+			// aapt resource value: 0x7f0b0020
+			public const int Platform_V11_AppCompat = 2131427360;
 			
-			// aapt resource value: 0x7F0E00B1
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624113;
+			// aapt resource value: 0x7f0b0021
+			public const int Platform_V11_AppCompat_Light = 2131427361;
 			
-			// aapt resource value: 0x7F0E00B2
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131624114;
+			// aapt resource value: 0x7f0b0028
+			public const int Platform_V14_AppCompat = 2131427368;
 			
-			// aapt resource value: 0x7F0E00B3
-			public const int Platform_V11_AppCompat = 2131624115;
+			// aapt resource value: 0x7f0b0029
+			public const int Platform_V14_AppCompat_Light = 2131427369;
 			
-			// aapt resource value: 0x7F0E00B4
-			public const int Platform_V11_AppCompat_Light = 2131624116;
+			// aapt resource value: 0x7f0b0082
+			public const int Platform_V21_AppCompat = 2131427458;
 			
-			// aapt resource value: 0x7F0E00B5
-			public const int Platform_V14_AppCompat = 2131624117;
+			// aapt resource value: 0x7f0b0083
+			public const int Platform_V21_AppCompat_Light = 2131427459;
 			
-			// aapt resource value: 0x7F0E00B6
-			public const int Platform_V14_AppCompat_Light = 2131624118;
+			// aapt resource value: 0x7f0b0097
+			public const int Platform_V25_AppCompat = 2131427479;
 			
-			// aapt resource value: 0x7F0E00B7
-			public const int Platform_V21_AppCompat = 2131624119;
+			// aapt resource value: 0x7f0b0098
+			public const int Platform_V25_AppCompat_Light = 2131427480;
 			
-			// aapt resource value: 0x7F0E00B8
-			public const int Platform_V21_AppCompat_Light = 2131624120;
+			// aapt resource value: 0x7f0b0022
+			public const int Platform_Widget_AppCompat_Spinner = 2131427362;
 			
-			// aapt resource value: 0x7F0E00B9
-			public const int Platform_V25_AppCompat = 2131624121;
+			// aapt resource value: 0x7f0b002b
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
 			
-			// aapt resource value: 0x7F0E00BA
-			public const int Platform_V25_AppCompat_Light = 2131624122;
+			// aapt resource value: 0x7f0b002c
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
 			
-			// aapt resource value: 0x7F0E00BB
-			public const int Platform_Widget_AppCompat_Spinner = 2131624123;
+			// aapt resource value: 0x7f0b002d
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
 			
-			// aapt resource value: 0x7F0E00BC
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624124;
+			// aapt resource value: 0x7f0b002e
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
 			
-			// aapt resource value: 0x7F0E00BD
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624125;
+			// aapt resource value: 0x7f0b002f
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
 			
-			// aapt resource value: 0x7F0E00BE
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624126;
+			// aapt resource value: 0x7f0b0030
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
 			
-			// aapt resource value: 0x7F0E00BF
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624127;
+			// aapt resource value: 0x7f0b0031
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
 			
-			// aapt resource value: 0x7F0E00C0
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624128;
+			// aapt resource value: 0x7f0b0032
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
 			
-			// aapt resource value: 0x7F0E00C1
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624129;
+			// aapt resource value: 0x7f0b0033
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
 			
-			// aapt resource value: 0x7F0E00C7
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624135;
+			// aapt resource value: 0x7f0b0034
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
 			
-			// aapt resource value: 0x7F0E00C2
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624130;
+			// aapt resource value: 0x7f0b0035
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
 			
-			// aapt resource value: 0x7F0E00C3
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624131;
+			// aapt resource value: 0x7f0b0036
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
 			
-			// aapt resource value: 0x7F0E00C4
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624132;
+			// 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: 0x7F0E00C5
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624133;
+			// aapt resource value: 0x7f0b00d0
+			public const int TextAppearance_AppCompat_Body1 = 2131427536;
 			
-			// aapt resource value: 0x7F0E00C6
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624134;
+			// aapt resource value: 0x7f0b00d1
+			public const int TextAppearance_AppCompat_Body2 = 2131427537;
 			
-			// aapt resource value: 0x7F0E00C8
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624136;
+			// aapt resource value: 0x7f0b00d2
+			public const int TextAppearance_AppCompat_Button = 2131427538;
 			
-			// aapt resource value: 0x7F0E00C9
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624137;
+			// aapt resource value: 0x7f0b00d3
+			public const int TextAppearance_AppCompat_Caption = 2131427539;
 			
-			// aapt resource value: 0x7F0E00CA
-			public const int TextAppearance_AppCompat = 2131624138;
+			// aapt resource value: 0x7f0b00d4
+			public const int TextAppearance_AppCompat_Display1 = 2131427540;
 			
-			// aapt resource value: 0x7F0E00CB
-			public const int TextAppearance_AppCompat_Body1 = 2131624139;
+			// aapt resource value: 0x7f0b00d5
+			public const int TextAppearance_AppCompat_Display2 = 2131427541;
 			
-			// aapt resource value: 0x7F0E00CC
-			public const int TextAppearance_AppCompat_Body2 = 2131624140;
+			// aapt resource value: 0x7f0b00d6
+			public const int TextAppearance_AppCompat_Display3 = 2131427542;
 			
-			// aapt resource value: 0x7F0E00CD
-			public const int TextAppearance_AppCompat_Button = 2131624141;
+			// aapt resource value: 0x7f0b00d7
+			public const int TextAppearance_AppCompat_Display4 = 2131427543;
 			
-			// aapt resource value: 0x7F0E00CE
-			public const int TextAppearance_AppCompat_Caption = 2131624142;
+			// aapt resource value: 0x7f0b00d8
+			public const int TextAppearance_AppCompat_Headline = 2131427544;
 			
-			// aapt resource value: 0x7F0E00CF
-			public const int TextAppearance_AppCompat_Display1 = 2131624143;
+			// aapt resource value: 0x7f0b00d9
+			public const int TextAppearance_AppCompat_Inverse = 2131427545;
 			
-			// aapt resource value: 0x7F0E00D0
-			public const int TextAppearance_AppCompat_Display2 = 2131624144;
+			// aapt resource value: 0x7f0b00da
+			public const int TextAppearance_AppCompat_Large = 2131427546;
 			
-			// aapt resource value: 0x7F0E00D1
-			public const int TextAppearance_AppCompat_Display3 = 2131624145;
+			// aapt resource value: 0x7f0b00db
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
 			
-			// aapt resource value: 0x7F0E00D2
-			public const int TextAppearance_AppCompat_Display4 = 2131624146;
+			// aapt resource value: 0x7f0b00dc
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
 			
-			// aapt resource value: 0x7F0E00D3
-			public const int TextAppearance_AppCompat_Headline = 2131624147;
+			// aapt resource value: 0x7f0b00dd
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
 			
-			// aapt resource value: 0x7F0E00D4
-			public const int TextAppearance_AppCompat_Inverse = 2131624148;
+			// aapt resource value: 0x7f0b00de
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
 			
-			// aapt resource value: 0x7F0E00D5
-			public const int TextAppearance_AppCompat_Large = 2131624149;
+			// aapt resource value: 0x7f0b00df
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
 			
-			// aapt resource value: 0x7F0E00D6
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131624150;
+			// aapt resource value: 0x7f0b00e0
+			public const int TextAppearance_AppCompat_Medium = 2131427552;
 			
-			// aapt resource value: 0x7F0E00D7
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624151;
+			// aapt resource value: 0x7f0b00e1
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
 			
-			// aapt resource value: 0x7F0E00D8
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624152;
+			// aapt resource value: 0x7f0b00e2
+			public const int TextAppearance_AppCompat_Menu = 2131427554;
 			
-			// aapt resource value: 0x7F0E00D9
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624153;
+			// aapt resource value: 0x7f0b0084
+			public const int TextAppearance_AppCompat_Notification = 2131427460;
 			
-			// aapt resource value: 0x7F0E00DA
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624154;
+			// aapt resource value: 0x7f0b0085
+			public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
 			
-			// aapt resource value: 0x7F0E00DB
-			public const int TextAppearance_AppCompat_Medium = 2131624155;
+			// aapt resource value: 0x7f0b0086
+			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
 			
-			// aapt resource value: 0x7F0E00DC
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131624156;
+			// aapt resource value: 0x7f0b00e3
+			public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
 			
-			// aapt resource value: 0x7F0E00DD
-			public const int TextAppearance_AppCompat_Menu = 2131624157;
+			// aapt resource value: 0x7f0b00e4
+			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
 			
-			// aapt resource value: 0x7F0E00DE
-			public const int TextAppearance_AppCompat_Notification = 2131624158;
+			// aapt resource value: 0x7f0b0087
+			public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
 			
-			// aapt resource value: 0x7F0E00DF
-			public const int TextAppearance_AppCompat_Notification_Info = 2131624159;
+			// aapt resource value: 0x7f0b0088
+			public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
 			
-			// aapt resource value: 0x7F0E00E0
-			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624160;
+			// aapt resource value: 0x7f0b0089
+			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
 			
-			// aapt resource value: 0x7F0E00E1
-			public const int TextAppearance_AppCompat_Notification_Line2 = 2131624161;
+			// aapt resource value: 0x7f0b008a
+			public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
 			
-			// aapt resource value: 0x7F0E00E2
-			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624162;
+			// aapt resource value: 0x7f0b008b
+			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
 			
-			// aapt resource value: 0x7F0E00E3
-			public const int TextAppearance_AppCompat_Notification_Media = 2131624163;
+			// aapt resource value: 0x7f0b00e5
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
 			
-			// aapt resource value: 0x7F0E00E4
-			public const int TextAppearance_AppCompat_Notification_Time = 2131624164;
+			// aapt resource value: 0x7f0b00e6
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
 			
-			// aapt resource value: 0x7F0E00E5
-			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624165;
+			// aapt resource value: 0x7f0b00e7
+			public const int TextAppearance_AppCompat_Small = 2131427559;
 			
-			// aapt resource value: 0x7F0E00E6
-			public const int TextAppearance_AppCompat_Notification_Title = 2131624166;
+			// aapt resource value: 0x7f0b00e8
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
 			
-			// aapt resource value: 0x7F0E00E7
-			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624167;
+			// aapt resource value: 0x7f0b00e9
+			public const int TextAppearance_AppCompat_Subhead = 2131427561;
 			
-			// aapt resource value: 0x7F0E00E8
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624168;
+			// aapt resource value: 0x7f0b00ea
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
 			
-			// aapt resource value: 0x7F0E00E9
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131624169;
+			// aapt resource value: 0x7f0b00eb
+			public const int TextAppearance_AppCompat_Title = 2131427563;
 			
-			// aapt resource value: 0x7F0E00EA
-			public const int TextAppearance_AppCompat_Small = 2131624170;
+			// aapt resource value: 0x7f0b00ec
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
 			
-			// aapt resource value: 0x7F0E00EB
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131624171;
+			// aapt resource value: 0x7f0b002a
+			public const int TextAppearance_AppCompat_Tooltip = 2131427370;
 			
-			// aapt resource value: 0x7F0E00EC
-			public const int TextAppearance_AppCompat_Subhead = 2131624172;
+			// aapt resource value: 0x7f0b00ed
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
 			
-			// aapt resource value: 0x7F0E00ED
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624173;
+			// aapt resource value: 0x7f0b00ee
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
 			
-			// aapt resource value: 0x7F0E00EE
-			public const int TextAppearance_AppCompat_Title = 2131624174;
+			// aapt resource value: 0x7f0b00ef
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
 			
-			// aapt resource value: 0x7F0E00EF
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131624175;
+			// aapt resource value: 0x7f0b00f0
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
 			
-			// aapt resource value: 0x7F0E00F0
-			public const int TextAppearance_AppCompat_Tooltip = 2131624176;
+			// aapt resource value: 0x7f0b00f1
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
 			
-			// aapt resource value: 0x7F0E00F1
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624177;
+			// aapt resource value: 0x7f0b00f2
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
 			
-			// aapt resource value: 0x7F0E00F2
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624178;
+			// aapt resource value: 0x7f0b00f3
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
 			
-			// aapt resource value: 0x7F0E00F3
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624179;
+			// aapt resource value: 0x7f0b00f4
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
 			
-			// aapt resource value: 0x7F0E00F4
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624180;
+			// aapt resource value: 0x7f0b00f5
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
 			
-			// aapt resource value: 0x7F0E00F5
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624181;
+			// aapt resource value: 0x7f0b00f6
+			public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
 			
-			// aapt resource value: 0x7F0E00F6
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624182;
+			// aapt resource value: 0x7f0b00f7
+			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
 			
-			// aapt resource value: 0x7F0E00F7
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624183;
+			// aapt resource value: 0x7f0b00f8
+			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
 			
-			// aapt resource value: 0x7F0E00F8
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624184;
+			// aapt resource value: 0x7f0b00f9
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
 			
-			// aapt resource value: 0x7F0E00F9
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624185;
+			// aapt resource value: 0x7f0b00fa
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
 			
-			// aapt resource value: 0x7F0E00FA
-			public const int TextAppearance_AppCompat_Widget_Button = 2131624186;
+			// aapt resource value: 0x7f0b00fb
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
 			
-			// aapt resource value: 0x7F0E00FB
-			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624187;
+			// aapt resource value: 0x7f0b00fc
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
 			
-			// aapt resource value: 0x7F0E00FC
-			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624188;
+			// aapt resource value: 0x7f0b00fd
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
 			
-			// aapt resource value: 0x7F0E00FD
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624189;
+			// aapt resource value: 0x7f0b00fe
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
 			
-			// aapt resource value: 0x7F0E00FE
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624190;
+			// aapt resource value: 0x7f0b00ff
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
 			
-			// aapt resource value: 0x7F0E00FF
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624191;
+			// aapt resource value: 0x7f0b0183
+			public const int TextAppearance_Compat_Notification = 2131427715;
 			
-			// aapt resource value: 0x7F0E0100
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624192;
+			// aapt resource value: 0x7f0b0184
+			public const int TextAppearance_Compat_Notification_Info = 2131427716;
 			
-			// aapt resource value: 0x7F0E0101
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624193;
+			// aapt resource value: 0x7f0b0160
+			public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
 			
-			// aapt resource value: 0x7F0E0102
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131624194;
+			// aapt resource value: 0x7f0b0189
+			public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
 			
-			// aapt resource value: 0x7F0E0103
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624195;
+			// aapt resource value: 0x7f0b0164
+			public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
 			
-			// aapt resource value: 0x7F0E0104
-			public const int TextAppearance_Compat_Notification = 2131624196;
+			// aapt resource value: 0x7f0b0161
+			public const int TextAppearance_Compat_Notification_Media = 2131427681;
 			
-			// aapt resource value: 0x7F0E0105
-			public const int TextAppearance_Compat_Notification_Info = 2131624197;
+			// aapt resource value: 0x7f0b0185
+			public const int TextAppearance_Compat_Notification_Time = 2131427717;
 			
-			// aapt resource value: 0x7F0E0106
-			public const int TextAppearance_Compat_Notification_Info_Media = 2131624198;
+			// aapt resource value: 0x7f0b0162
+			public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
 			
-			// aapt resource value: 0x7F0E0107
-			public const int TextAppearance_Compat_Notification_Line2 = 2131624199;
+			// aapt resource value: 0x7f0b0186
+			public const int TextAppearance_Compat_Notification_Title = 2131427718;
 			
-			// aapt resource value: 0x7F0E0108
-			public const int TextAppearance_Compat_Notification_Line2_Media = 2131624200;
+			// aapt resource value: 0x7f0b0163
+			public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
 			
-			// aapt resource value: 0x7F0E0109
-			public const int TextAppearance_Compat_Notification_Media = 2131624201;
+			// aapt resource value: 0x7f0b016c
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
 			
-			// aapt resource value: 0x7F0E010A
-			public const int TextAppearance_Compat_Notification_Time = 2131624202;
+			// aapt resource value: 0x7f0b016d
+			public const int TextAppearance_Design_Counter = 2131427693;
 			
-			// aapt resource value: 0x7F0E010B
-			public const int TextAppearance_Compat_Notification_Time_Media = 2131624203;
+			// aapt resource value: 0x7f0b016e
+			public const int TextAppearance_Design_Counter_Overflow = 2131427694;
 			
-			// aapt resource value: 0x7F0E010C
-			public const int TextAppearance_Compat_Notification_Title = 2131624204;
+			// aapt resource value: 0x7f0b016f
+			public const int TextAppearance_Design_Error = 2131427695;
 			
-			// aapt resource value: 0x7F0E010D
-			public const int TextAppearance_Compat_Notification_Title_Media = 2131624205;
+			// aapt resource value: 0x7f0b0170
+			public const int TextAppearance_Design_Hint = 2131427696;
 			
-			// aapt resource value: 0x7F0E010E
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624206;
+			// aapt resource value: 0x7f0b0171
+			public const int TextAppearance_Design_Snackbar_Message = 2131427697;
 			
-			// aapt resource value: 0x7F0E010F
-			public const int TextAppearance_Design_Counter = 2131624207;
+			// aapt resource value: 0x7f0b0172
+			public const int TextAppearance_Design_Tab = 2131427698;
 			
-			// aapt resource value: 0x7F0E0110
-			public const int TextAppearance_Design_Counter_Overflow = 2131624208;
+			// aapt resource value: 0x7f0b0100
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
 			
-			// aapt resource value: 0x7F0E0111
-			public const int TextAppearance_Design_Error = 2131624209;
+			// aapt resource value: 0x7f0b0101
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
 			
-			// aapt resource value: 0x7F0E0112
-			public const int TextAppearance_Design_Hint = 2131624210;
+			// aapt resource value: 0x7f0b0102
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
 			
-			// aapt resource value: 0x7F0E0113
-			public const int TextAppearance_Design_Snackbar_Message = 2131624211;
+			// aapt resource value: 0x7f0b0103
+			public const int Theme_AppCompat = 2131427587;
 			
-			// aapt resource value: 0x7F0E0114
-			public const int TextAppearance_Design_Tab = 2131624212;
+			// aapt resource value: 0x7f0b0104
+			public const int Theme_AppCompat_CompactMenu = 2131427588;
 			
-			// aapt resource value: 0x7F0E0115
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624213;
+			// aapt resource value: 0x7f0b0004
+			public const int Theme_AppCompat_DayNight = 2131427332;
 			
-			// aapt resource value: 0x7F0E0116
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624214;
+			// aapt resource value: 0x7f0b0005
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
 			
-			// aapt resource value: 0x7F0E0117
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624215;
+			// aapt resource value: 0x7f0b0006
+			public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
 			
-			// aapt resource value: 0x7F0E0134
-			public const int ThemeOverlay_AppCompat = 2131624244;
+			// aapt resource value: 0x7f0b0007
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
 			
-			// aapt resource value: 0x7F0E0135
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131624245;
+			// aapt resource value: 0x7f0b0008
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
 			
-			// aapt resource value: 0x7F0E0136
-			public const int ThemeOverlay_AppCompat_Dark = 2131624246;
+			// aapt resource value: 0x7f0b0009
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
 			
-			// aapt resource value: 0x7F0E0137
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624247;
+			// aapt resource value: 0x7f0b000a
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
 			
-			// aapt resource value: 0x7F0E0138
-			public const int ThemeOverlay_AppCompat_Dialog = 2131624248;
+			// aapt resource value: 0x7f0b0105
+			public const int Theme_AppCompat_Dialog = 2131427589;
 			
-			// aapt resource value: 0x7F0E0139
-			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624249;
+			// aapt resource value: 0x7f0b0106
+			public const int Theme_AppCompat_Dialog_Alert = 2131427590;
 			
-			// aapt resource value: 0x7F0E013A
-			public const int ThemeOverlay_AppCompat_Light = 2131624250;
+			// aapt resource value: 0x7f0b0107
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
 			
-			// aapt resource value: 0x7F0E0118
-			public const int Theme_AppCompat = 2131624216;
+			// aapt resource value: 0x7f0b0108
+			public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
 			
-			// aapt resource value: 0x7F0E0119
-			public const int Theme_AppCompat_CompactMenu = 2131624217;
+			// aapt resource value: 0x7f0b0109
+			public const int Theme_AppCompat_Light = 2131427593;
 			
-			// aapt resource value: 0x7F0E011A
-			public const int Theme_AppCompat_DayNight = 2131624218;
+			// aapt resource value: 0x7f0b010a
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
 			
-			// aapt resource value: 0x7F0E011B
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624219;
+			// aapt resource value: 0x7f0b010b
+			public const int Theme_AppCompat_Light_Dialog = 2131427595;
 			
-			// aapt resource value: 0x7F0E011C
-			public const int Theme_AppCompat_DayNight_Dialog = 2131624220;
+			// aapt resource value: 0x7f0b010c
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
 			
-			// aapt resource value: 0x7F0E011F
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624223;
+			// aapt resource value: 0x7f0b010d
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
 			
-			// aapt resource value: 0x7F0E011D
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624221;
+			// aapt resource value: 0x7f0b010e
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
 			
-			// aapt resource value: 0x7F0E011E
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624222;
+			// aapt resource value: 0x7f0b010f
+			public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
 			
-			// aapt resource value: 0x7F0E0120
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131624224;
+			// aapt resource value: 0x7f0b0110
+			public const int Theme_AppCompat_NoActionBar = 2131427600;
 			
-			// aapt resource value: 0x7F0E0121
-			public const int Theme_AppCompat_Dialog = 2131624225;
+			// aapt resource value: 0x7f0b018c
+			public const int Theme_BiometricPromptDialog = 2131427724;
 			
-			// aapt resource value: 0x7F0E0124
-			public const int Theme_AppCompat_DialogWhenLarge = 2131624228;
+			// aapt resource value: 0x7f0b0173
+			public const int Theme_Design = 2131427699;
 			
-			// aapt resource value: 0x7F0E0122
-			public const int Theme_AppCompat_Dialog_Alert = 2131624226;
+			// aapt resource value: 0x7f0b0174
+			public const int Theme_Design_BottomSheetDialog = 2131427700;
 			
-			// aapt resource value: 0x7F0E0123
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131624227;
+			// aapt resource value: 0x7f0b0175
+			public const int Theme_Design_Light = 2131427701;
 			
-			// aapt resource value: 0x7F0E0125
-			public const int Theme_AppCompat_Light = 2131624229;
+			// aapt resource value: 0x7f0b0176
+			public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
 			
-			// aapt resource value: 0x7F0E0126
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131624230;
+			// aapt resource value: 0x7f0b0177
+			public const int Theme_Design_Light_NoActionBar = 2131427703;
 			
-			// aapt resource value: 0x7F0E0127
-			public const int Theme_AppCompat_Light_Dialog = 2131624231;
+			// aapt resource value: 0x7f0b0178
+			public const int Theme_Design_NoActionBar = 2131427704;
 			
-			// aapt resource value: 0x7F0E012A
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624234;
+			// aapt resource value: 0x7f0b0111
+			public const int ThemeOverlay_AppCompat = 2131427601;
 			
-			// aapt resource value: 0x7F0E0128
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131624232;
+			// aapt resource value: 0x7f0b0112
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
 			
-			// aapt resource value: 0x7F0E0129
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624233;
+			// aapt resource value: 0x7f0b0113
+			public const int ThemeOverlay_AppCompat_Dark = 2131427603;
 			
-			// aapt resource value: 0x7F0E012B
-			public const int Theme_AppCompat_Light_NoActionBar = 2131624235;
+			// aapt resource value: 0x7f0b0114
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
 			
-			// aapt resource value: 0x7F0E012C
-			public const int Theme_AppCompat_NoActionBar = 2131624236;
+			// aapt resource value: 0x7f0b0115
+			public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
 			
-			// aapt resource value: 0x7F0E012D
-			public const int Theme_BiometricPromptDialog = 2131624237;
+			// aapt resource value: 0x7f0b0116
+			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
 			
-			// aapt resource value: 0x7F0E012E
-			public const int Theme_Design = 2131624238;
+			// aapt resource value: 0x7f0b0117
+			public const int ThemeOverlay_AppCompat_Light = 2131427607;
 			
-			// aapt resource value: 0x7F0E012F
-			public const int Theme_Design_BottomSheetDialog = 2131624239;
+			// aapt resource value: 0x7f0b0118
+			public const int Widget_AppCompat_ActionBar = 2131427608;
 			
-			// aapt resource value: 0x7F0E0130
-			public const int Theme_Design_Light = 2131624240;
+			// aapt resource value: 0x7f0b0119
+			public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
 			
-			// aapt resource value: 0x7F0E0131
-			public const int Theme_Design_Light_BottomSheetDialog = 2131624241;
+			// aapt resource value: 0x7f0b011a
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
 			
-			// aapt resource value: 0x7F0E0132
-			public const int Theme_Design_Light_NoActionBar = 2131624242;
+			// aapt resource value: 0x7f0b011b
+			public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
 			
-			// aapt resource value: 0x7F0E0133
-			public const int Theme_Design_NoActionBar = 2131624243;
+			// aapt resource value: 0x7f0b011c
+			public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
 			
-			// aapt resource value: 0x7F0E013B
-			public const int Widget_AppCompat_ActionBar = 2131624251;
+			// aapt resource value: 0x7f0b011d
+			public const int Widget_AppCompat_ActionButton = 2131427613;
 			
-			// aapt resource value: 0x7F0E013C
-			public const int Widget_AppCompat_ActionBar_Solid = 2131624252;
+			// aapt resource value: 0x7f0b011e
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
 			
-			// aapt resource value: 0x7F0E013D
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131624253;
+			// aapt resource value: 0x7f0b011f
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
 			
-			// aapt resource value: 0x7F0E013E
-			public const int Widget_AppCompat_ActionBar_TabText = 2131624254;
+			// aapt resource value: 0x7f0b0120
+			public const int Widget_AppCompat_ActionMode = 2131427616;
 			
-			// aapt resource value: 0x7F0E013F
-			public const int Widget_AppCompat_ActionBar_TabView = 2131624255;
+			// aapt resource value: 0x7f0b0121
+			public const int Widget_AppCompat_ActivityChooserView = 2131427617;
 			
-			// aapt resource value: 0x7F0E0140
-			public const int Widget_AppCompat_ActionButton = 2131624256;
+			// aapt resource value: 0x7f0b0122
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
 			
-			// aapt resource value: 0x7F0E0141
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131624257;
+			// aapt resource value: 0x7f0b0123
+			public const int Widget_AppCompat_Button = 2131427619;
 			
-			// aapt resource value: 0x7F0E0142
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131624258;
+			// aapt resource value: 0x7f0b0124
+			public const int Widget_AppCompat_Button_Borderless = 2131427620;
 			
-			// aapt resource value: 0x7F0E0143
-			public const int Widget_AppCompat_ActionMode = 2131624259;
+			// aapt resource value: 0x7f0b0125
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
 			
-			// aapt resource value: 0x7F0E0144
-			public const int Widget_AppCompat_ActivityChooserView = 2131624260;
+			// aapt resource value: 0x7f0b0126
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
 			
-			// aapt resource value: 0x7F0E0145
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131624261;
+			// aapt resource value: 0x7f0b0127
+			public const int Widget_AppCompat_Button_Colored = 2131427623;
 			
-			// aapt resource value: 0x7F0E0146
-			public const int Widget_AppCompat_Button = 2131624262;
+			// aapt resource value: 0x7f0b0128
+			public const int Widget_AppCompat_Button_Small = 2131427624;
 			
-			// aapt resource value: 0x7F0E014C
-			public const int Widget_AppCompat_ButtonBar = 2131624268;
+			// aapt resource value: 0x7f0b0129
+			public const int Widget_AppCompat_ButtonBar = 2131427625;
 			
-			// aapt resource value: 0x7F0E014D
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624269;
+			// aapt resource value: 0x7f0b012a
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
 			
-			// aapt resource value: 0x7F0E0147
-			public const int Widget_AppCompat_Button_Borderless = 2131624263;
+			// aapt resource value: 0x7f0b012b
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
 			
-			// aapt resource value: 0x7F0E0148
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131624264;
+			// aapt resource value: 0x7f0b012c
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
 			
-			// aapt resource value: 0x7F0E0149
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624265;
+			// aapt resource value: 0x7f0b012d
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
 			
-			// aapt resource value: 0x7F0E014A
-			public const int Widget_AppCompat_Button_Colored = 2131624266;
+			// aapt resource value: 0x7f0b012e
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
 			
-			// aapt resource value: 0x7F0E014B
-			public const int Widget_AppCompat_Button_Small = 2131624267;
+			// aapt resource value: 0x7f0b012f
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
 			
-			// aapt resource value: 0x7F0E014E
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624270;
+			// aapt resource value: 0x7f0b0130
+			public const int Widget_AppCompat_EditText = 2131427632;
 			
-			// aapt resource value: 0x7F0E014F
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624271;
+			// aapt resource value: 0x7f0b0131
+			public const int Widget_AppCompat_ImageButton = 2131427633;
 			
-			// aapt resource value: 0x7F0E0150
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131624272;
+			// aapt resource value: 0x7f0b0132
+			public const int Widget_AppCompat_Light_ActionBar = 2131427634;
 			
-			// aapt resource value: 0x7F0E0151
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131624273;
+			// aapt resource value: 0x7f0b0133
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
 			
-			// aapt resource value: 0x7F0E0152
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131624274;
+			// aapt resource value: 0x7f0b0134
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
 			
-			// aapt resource value: 0x7F0E0153
-			public const int Widget_AppCompat_EditText = 2131624275;
+			// aapt resource value: 0x7f0b0135
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
 			
-			// aapt resource value: 0x7F0E0154
-			public const int Widget_AppCompat_ImageButton = 2131624276;
+			// aapt resource value: 0x7f0b0136
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
 			
-			// aapt resource value: 0x7F0E0155
-			public const int Widget_AppCompat_Light_ActionBar = 2131624277;
+			// aapt resource value: 0x7f0b0137
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
 			
-			// aapt resource value: 0x7F0E0156
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624278;
+			// aapt resource value: 0x7f0b0138
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
 			
-			// aapt resource value: 0x7F0E0157
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624279;
+			// aapt resource value: 0x7f0b0139
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
 			
-			// aapt resource value: 0x7F0E0158
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624280;
+			// aapt resource value: 0x7f0b013a
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
 			
-			// aapt resource value: 0x7F0E0159
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624281;
+			// aapt resource value: 0x7f0b013b
+			public const int Widget_AppCompat_Light_ActionButton = 2131427643;
 			
-			// aapt resource value: 0x7F0E015A
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624282;
+			// aapt resource value: 0x7f0b013c
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
 			
-			// aapt resource value: 0x7F0E015B
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624283;
+			// aapt resource value: 0x7f0b013d
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
 			
-			// aapt resource value: 0x7F0E015C
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624284;
+			// aapt resource value: 0x7f0b013e
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
 			
-			// aapt resource value: 0x7F0E015D
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624285;
+			// aapt resource value: 0x7f0b013f
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
 			
-			// aapt resource value: 0x7F0E015E
-			public const int Widget_AppCompat_Light_ActionButton = 2131624286;
+			// aapt resource value: 0x7f0b0140
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
 			
-			// aapt resource value: 0x7F0E015F
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624287;
+			// aapt resource value: 0x7f0b0141
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
 			
-			// aapt resource value: 0x7F0E0160
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624288;
+			// aapt resource value: 0x7f0b0142
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
 			
-			// aapt resource value: 0x7F0E0161
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624289;
+			// aapt resource value: 0x7f0b0143
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
 			
-			// aapt resource value: 0x7F0E0162
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131624290;
+			// aapt resource value: 0x7f0b0144
+			public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
 			
-			// aapt resource value: 0x7F0E0163
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624291;
+			// aapt resource value: 0x7f0b0145
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
 			
-			// aapt resource value: 0x7F0E0164
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624292;
+			// aapt resource value: 0x7f0b0146
+			public const int Widget_AppCompat_Light_SearchView = 2131427654;
 			
-			// aapt resource value: 0x7F0E0165
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131624293;
+			// aapt resource value: 0x7f0b0147
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
 			
-			// aapt resource value: 0x7F0E0166
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131624294;
+			// aapt resource value: 0x7f0b0148
+			public const int Widget_AppCompat_ListMenuView = 2131427656;
 			
-			// aapt resource value: 0x7F0E0167
-			public const int Widget_AppCompat_Light_PopupMenu = 2131624295;
+			// aapt resource value: 0x7f0b0149
+			public const int Widget_AppCompat_ListPopupWindow = 2131427657;
 			
-			// aapt resource value: 0x7F0E0168
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624296;
+			// aapt resource value: 0x7f0b014a
+			public const int Widget_AppCompat_ListView = 2131427658;
 			
-			// aapt resource value: 0x7F0E0169
-			public const int Widget_AppCompat_Light_SearchView = 2131624297;
+			// aapt resource value: 0x7f0b014b
+			public const int Widget_AppCompat_ListView_DropDown = 2131427659;
 			
-			// aapt resource value: 0x7F0E016A
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624298;
+			// aapt resource value: 0x7f0b014c
+			public const int Widget_AppCompat_ListView_Menu = 2131427660;
 			
-			// aapt resource value: 0x7F0E016B
-			public const int Widget_AppCompat_ListMenuView = 2131624299;
+			// aapt resource value: 0x7f0b014d
+			public const int Widget_AppCompat_PopupMenu = 2131427661;
 			
-			// aapt resource value: 0x7F0E016C
-			public const int Widget_AppCompat_ListPopupWindow = 2131624300;
+			// aapt resource value: 0x7f0b014e
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
 			
-			// aapt resource value: 0x7F0E016D
-			public const int Widget_AppCompat_ListView = 2131624301;
+			// aapt resource value: 0x7f0b014f
+			public const int Widget_AppCompat_PopupWindow = 2131427663;
 			
-			// aapt resource value: 0x7F0E016E
-			public const int Widget_AppCompat_ListView_DropDown = 2131624302;
+			// aapt resource value: 0x7f0b0150
+			public const int Widget_AppCompat_ProgressBar = 2131427664;
 			
-			// aapt resource value: 0x7F0E016F
-			public const int Widget_AppCompat_ListView_Menu = 2131624303;
+			// aapt resource value: 0x7f0b0151
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
 			
-			// aapt resource value: 0x7F0E0170
-			public const int Widget_AppCompat_PopupMenu = 2131624304;
+			// aapt resource value: 0x7f0b0152
+			public const int Widget_AppCompat_RatingBar = 2131427666;
 			
-			// aapt resource value: 0x7F0E0171
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131624305;
+			// aapt resource value: 0x7f0b0153
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
 			
-			// aapt resource value: 0x7F0E0172
-			public const int Widget_AppCompat_PopupWindow = 2131624306;
+			// aapt resource value: 0x7f0b0154
+			public const int Widget_AppCompat_RatingBar_Small = 2131427668;
 			
-			// aapt resource value: 0x7F0E0173
-			public const int Widget_AppCompat_ProgressBar = 2131624307;
+			// aapt resource value: 0x7f0b0155
+			public const int Widget_AppCompat_SearchView = 2131427669;
 			
-			// aapt resource value: 0x7F0E0174
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624308;
+			// aapt resource value: 0x7f0b0156
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
 			
-			// aapt resource value: 0x7F0E0175
-			public const int Widget_AppCompat_RatingBar = 2131624309;
+			// aapt resource value: 0x7f0b0157
+			public const int Widget_AppCompat_SeekBar = 2131427671;
 			
-			// aapt resource value: 0x7F0E0176
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131624310;
+			// aapt resource value: 0x7f0b0158
+			public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
 			
-			// aapt resource value: 0x7F0E0177
-			public const int Widget_AppCompat_RatingBar_Small = 2131624311;
+			// aapt resource value: 0x7f0b0159
+			public const int Widget_AppCompat_Spinner = 2131427673;
 			
-			// aapt resource value: 0x7F0E0178
-			public const int Widget_AppCompat_SearchView = 2131624312;
+			// aapt resource value: 0x7f0b015a
+			public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
 			
-			// aapt resource value: 0x7F0E0179
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131624313;
+			// aapt resource value: 0x7f0b015b
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
 			
-			// aapt resource value: 0x7F0E017A
-			public const int Widget_AppCompat_SeekBar = 2131624314;
+			// aapt resource value: 0x7f0b015c
+			public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
 			
-			// aapt resource value: 0x7F0E017B
-			public const int Widget_AppCompat_SeekBar_Discrete = 2131624315;
+			// aapt resource value: 0x7f0b015d
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
 			
-			// aapt resource value: 0x7F0E017C
-			public const int Widget_AppCompat_Spinner = 2131624316;
+			// aapt resource value: 0x7f0b015e
+			public const int Widget_AppCompat_Toolbar = 2131427678;
 			
-			// aapt resource value: 0x7F0E017D
-			public const int Widget_AppCompat_Spinner_DropDown = 2131624317;
+			// aapt resource value: 0x7f0b015f
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
 			
-			// aapt resource value: 0x7F0E017E
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624318;
+			// aapt resource value: 0x7f0b0187
+			public const int Widget_Compat_NotificationActionContainer = 2131427719;
 			
-			// aapt resource value: 0x7F0E017F
-			public const int Widget_AppCompat_Spinner_Underlined = 2131624319;
+			// aapt resource value: 0x7f0b0188
+			public const int Widget_Compat_NotificationActionText = 2131427720;
 			
-			// aapt resource value: 0x7F0E0180
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131624320;
+			// aapt resource value: 0x7f0b0179
+			public const int Widget_Design_AppBarLayout = 2131427705;
 			
-			// aapt resource value: 0x7F0E0181
-			public const int Widget_AppCompat_Toolbar = 2131624321;
+			// aapt resource value: 0x7f0b017a
+			public const int Widget_Design_BottomNavigationView = 2131427706;
 			
-			// aapt resource value: 0x7F0E0182
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624322;
+			// aapt resource value: 0x7f0b017b
+			public const int Widget_Design_BottomSheet_Modal = 2131427707;
 			
-			// aapt resource value: 0x7F0E0183
-			public const int Widget_Compat_NotificationActionContainer = 2131624323;
+			// aapt resource value: 0x7f0b017c
+			public const int Widget_Design_CollapsingToolbar = 2131427708;
 			
-			// aapt resource value: 0x7F0E0184
-			public const int Widget_Compat_NotificationActionText = 2131624324;
+			// aapt resource value: 0x7f0b017d
+			public const int Widget_Design_CoordinatorLayout = 2131427709;
 			
-			// aapt resource value: 0x7F0E0185
-			public const int Widget_Design_AppBarLayout = 2131624325;
+			// aapt resource value: 0x7f0b017e
+			public const int Widget_Design_FloatingActionButton = 2131427710;
 			
-			// aapt resource value: 0x7F0E0186
-			public const int Widget_Design_BottomNavigationView = 2131624326;
+			// aapt resource value: 0x7f0b017f
+			public const int Widget_Design_NavigationView = 2131427711;
 			
-			// aapt resource value: 0x7F0E0187
-			public const int Widget_Design_BottomSheet_Modal = 2131624327;
+			// aapt resource value: 0x7f0b0180
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
 			
-			// aapt resource value: 0x7F0E0188
-			public const int Widget_Design_CollapsingToolbar = 2131624328;
+			// aapt resource value: 0x7f0b0181
+			public const int Widget_Design_Snackbar = 2131427713;
 			
-			// aapt resource value: 0x7F0E0189
-			public const int Widget_Design_CoordinatorLayout = 2131624329;
+			// aapt resource value: 0x7f0b0165
+			public const int Widget_Design_TabLayout = 2131427685;
 			
-			// aapt resource value: 0x7F0E018A
-			public const int Widget_Design_FloatingActionButton = 2131624330;
+			// aapt resource value: 0x7f0b0182
+			public const int Widget_Design_TextInputLayout = 2131427714;
 			
-			// aapt resource value: 0x7F0E018B
-			public const int Widget_Design_NavigationView = 2131624331;
+			// aapt resource value: 0x7f0b018d
+			public const int custom_dialog2 = 2131427725;
 			
-			// aapt resource value: 0x7F0E018C
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131624332;
+			// aapt resource value: 0x7f0b0190
+			public const int leak_canary_LeakCanary_Base = 2131427728;
 			
-			// aapt resource value: 0x7F0E018D
-			public const int Widget_Design_Snackbar = 2131624333;
+			// aapt resource value: 0x7f0b0191
+			public const int leak_canary_Theme_Transparent = 2131427729;
 			
-			// aapt resource value: 0x7F0E018E
-			public const int Widget_Design_TabLayout = 2131624334;
+			// aapt resource value: 0x7f0b018e
+			public const int picker_view_scale_anim = 2131427726;
 			
-			// aapt resource value: 0x7F0E018F
-			public const int Widget_Design_TextInputLayout = 2131624335;
+			// aapt resource value: 0x7f0b018f
+			public const int picker_view_slide_anim = 2131427727;
 			
 			static Style()
 			{
@@ -5814,193 +5955,204 @@
 			}
 		}
 		
+		public partial class Xml
+		{
+			
+			// aapt resource value: 0x7f070000
+			public const int file_paths = 2131165184;
+			
+			// aapt resource value: 0x7f070001
+			public const int hdl_filepaths = 2131165185;
+			
+			static Xml()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Xml()
+			{
+			}
+		}
+		
 		public partial class Styleable
 		{
 			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040044,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F040083,0x7F040087,0x7F040088,0x7F040093,0x7F0400B4,0x7F0400B5,0x7F0400B9,0x7F0400BA,0x7F0400BB,0x7F0400C0,0x7F0400C6,0x7F0400E3,0x7F0400EC,0x7F0400FC,0x7F040100,0x7F040101,0x7F040168,0x7F04016B,0x7F040197,0x7F0401A1 }
 			public static int[] ActionBar = new int[] {
-					2130968642,
-					2130968643,
-					2130968644,
-					2130968690,
-					2130968691,
-					2130968692,
-					2130968693,
-					2130968694,
-					2130968695,
-					2130968707,
-					2130968711,
-					2130968712,
-					2130968723,
-					2130968756,
-					2130968757,
-					2130968761,
-					2130968762,
-					2130968763,
-					2130968768,
-					2130968774,
-					2130968803,
-					2130968812,
-					2130968828,
-					2130968832,
-					2130968833,
-					2130968936,
-					2130968939,
-					2130968983,
-					2130968993};
+					2130771978,
+					2130771980,
+					2130771981,
+					2130771982,
+					2130771983,
+					2130771984,
+					2130771985,
+					2130771986,
+					2130771987,
+					2130771988,
+					2130771989,
+					2130771990,
+					2130771991,
+					2130771992,
+					2130771993,
+					2130771994,
+					2130771995,
+					2130771996,
+					2130771997,
+					2130771998,
+					2130771999,
+					2130772000,
+					2130772001,
+					2130772002,
+					2130772003,
+					2130772004,
+					2130772005,
+					2130772006,
+					2130772076};
 			
-			// aapt resource value: { 0x10100B3 }
+			// aapt resource value: 10
+			public const int ActionBar_background = 10;
+			
+			// aapt resource value: 12
+			public const int ActionBar_backgroundSplit = 12;
+			
+			// aapt resource value: 11
+			public const int ActionBar_backgroundStacked = 11;
+			
+			// aapt resource value: 21
+			public const int ActionBar_contentInsetEnd = 21;
+			
+			// aapt resource value: 25
+			public const int ActionBar_contentInsetEndWithActions = 25;
+			
+			// aapt resource value: 22
+			public const int ActionBar_contentInsetLeft = 22;
+			
+			// aapt resource value: 23
+			public const int ActionBar_contentInsetRight = 23;
+			
+			// aapt resource value: 20
+			public const int ActionBar_contentInsetStart = 20;
+			
+			// aapt resource value: 24
+			public const int ActionBar_contentInsetStartWithNavigation = 24;
+			
+			// aapt resource value: 13
+			public const int ActionBar_customNavigationLayout = 13;
+			
+			// aapt resource value: 3
+			public const int ActionBar_displayOptions = 3;
+			
+			// aapt resource value: 9
+			public const int ActionBar_divider = 9;
+			
+			// aapt resource value: 26
+			public const int ActionBar_elevation = 26;
+			
+			// aapt resource value: 0
+			public const int ActionBar_height = 0;
+			
+			// aapt resource value: 19
+			public const int ActionBar_hideOnContentScroll = 19;
+			
+			// aapt resource value: 28
+			public const int ActionBar_homeAsUpIndicator = 28;
+			
+			// aapt resource value: 14
+			public const int ActionBar_homeLayout = 14;
+			
+			// aapt resource value: 7
+			public const int ActionBar_icon = 7;
+			
+			// aapt resource value: 16
+			public const int ActionBar_indeterminateProgressStyle = 16;
+			
+			// aapt resource value: 18
+			public const int ActionBar_itemPadding = 18;
+			
+			// aapt resource value: 8
+			public const int ActionBar_logo = 8;
+			
+			// aapt resource value: 2
+			public const int ActionBar_navigationMode = 2;
+			
+			// aapt resource value: 27
+			public const int ActionBar_popupTheme = 27;
+			
+			// aapt resource value: 17
+			public const int ActionBar_progressBarPadding = 17;
+			
+			// aapt resource value: 15
+			public const int ActionBar_progressBarStyle = 15;
+			
+			// aapt resource value: 4
+			public const int ActionBar_subtitle = 4;
+			
+			// aapt resource value: 6
+			public const int ActionBar_subtitleTextStyle = 6;
+			
+			// aapt resource value: 1
+			public const int ActionBar_title = 1;
+			
+			// aapt resource value: 5
+			public const int ActionBar_titleTextStyle = 5;
+			
 			public static int[] ActionBarLayout = new int[] {
 					16842931};
 			
 			// aapt resource value: 0
 			public const int ActionBarLayout_android_layout_gravity = 0;
 			
-			// aapt resource value: 0
-			public const int ActionBar_background = 0;
-			
-			// aapt resource value: 1
-			public const int ActionBar_backgroundSplit = 1;
-			
-			// aapt resource value: 2
-			public const int ActionBar_backgroundStacked = 2;
-			
-			// aapt resource value: 3
-			public const int ActionBar_contentInsetEnd = 3;
-			
-			// aapt resource value: 4
-			public const int ActionBar_contentInsetEndWithActions = 4;
-			
-			// aapt resource value: 5
-			public const int ActionBar_contentInsetLeft = 5;
-			
-			// aapt resource value: 6
-			public const int ActionBar_contentInsetRight = 6;
-			
-			// aapt resource value: 7
-			public const int ActionBar_contentInsetStart = 7;
-			
-			// aapt resource value: 8
-			public const int ActionBar_contentInsetStartWithNavigation = 8;
-			
-			// aapt resource value: 9
-			public const int ActionBar_customNavigationLayout = 9;
-			
-			// aapt resource value: 10
-			public const int ActionBar_displayOptions = 10;
-			
-			// aapt resource value: 11
-			public const int ActionBar_divider = 11;
-			
-			// aapt resource value: 12
-			public const int ActionBar_elevation = 12;
-			
-			// aapt resource value: 13
-			public const int ActionBar_height = 13;
-			
-			// aapt resource value: 14
-			public const int ActionBar_hideOnContentScroll = 14;
-			
-			// aapt resource value: 15
-			public const int ActionBar_homeAsUpIndicator = 15;
-			
-			// aapt resource value: 16
-			public const int ActionBar_homeLayout = 16;
-			
-			// aapt resource value: 17
-			public const int ActionBar_icon = 17;
-			
-			// aapt resource value: 18
-			public const int ActionBar_indeterminateProgressStyle = 18;
-			
-			// aapt resource value: 19
-			public const int ActionBar_itemPadding = 19;
-			
-			// aapt resource value: 20
-			public const int ActionBar_logo = 20;
-			
-			// aapt resource value: 21
-			public const int ActionBar_navigationMode = 21;
-			
-			// aapt resource value: 22
-			public const int ActionBar_popupTheme = 22;
-			
-			// aapt resource value: 23
-			public const int ActionBar_progressBarPadding = 23;
-			
-			// aapt resource value: 24
-			public const int ActionBar_progressBarStyle = 24;
-			
-			// aapt resource value: 25
-			public const int ActionBar_subtitle = 25;
-			
-			// aapt resource value: 26
-			public const int ActionBar_subtitleTextStyle = 26;
-			
-			// aapt resource value: 27
-			public const int ActionBar_title = 27;
-			
-			// aapt resource value: 28
-			public const int ActionBar_titleTextStyle = 28;
-			
-			// aapt resource value: { 0x101013F }
 			public static int[] ActionMenuItemView = new int[] {
 					16843071};
 			
 			// aapt resource value: 0
 			public const int ActionMenuItemView_android_minWidth = 0;
 			
-			// aapt resource value: { 0xFFFFFFFF }
-			public static int[] ActionMenuView = new int[] {
-					-1};
+			public static int[] ActionMenuView;
 			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
 			public static int[] ActionMode = new int[] {
-					2130968642,
-					2130968643,
-					2130968672,
-					2130968756,
-					2130968939,
-					2130968993};
-			
-			// aapt resource value: 0
-			public const int ActionMode_background = 0;
-			
-			// aapt resource value: 1
-			public const int ActionMode_backgroundSplit = 1;
-			
-			// aapt resource value: 2
-			public const int ActionMode_closeItemLayout = 2;
+					2130771978,
+					2130771984,
+					2130771985,
+					2130771989,
+					2130771991,
+					2130772007};
 			
 			// aapt resource value: 3
-			public const int ActionMode_height = 3;
+			public const int ActionMode_background = 3;
 			
 			// aapt resource value: 4
-			public const int ActionMode_subtitleTextStyle = 4;
+			public const int ActionMode_backgroundSplit = 4;
 			
 			// aapt resource value: 5
-			public const int ActionMode_titleTextStyle = 5;
-			
-			// aapt resource value: { 0x7F040096,0x7F0400C1 }
-			public static int[] ActivityChooserView = new int[] {
-					2130968726,
-					2130968769};
+			public const int ActionMode_closeItemLayout = 5;
 			
 			// aapt resource value: 0
-			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+			public const int ActionMode_height = 0;
+			
+			// aapt resource value: 2
+			public const int ActionMode_subtitleTextStyle = 2;
 			
 			// aapt resource value: 1
-			public const int ActivityChooserView_initialActivityCount = 1;
+			public const int ActionMode_titleTextStyle = 1;
 			
-			// aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
+			public static int[] ActivityChooserView = new int[] {
+					2130772008,
+					2130772009};
+			
+			// aapt resource value: 1
+			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+			
+			// aapt resource value: 0
+			public const int ActivityChooserView_initialActivityCount = 0;
+			
 			public static int[] AlertDialog = new int[] {
 					16842994,
-					2130968664,
-					2130968794,
-					2130968795,
-					2130968809,
-					2130968855,
-					2130968856};
+					2130772010,
+					2130772011,
+					2130772012,
+					2130772013,
+					2130772014,
+					2130772015};
 			
 			// aapt resource value: 0
 			public const int AlertDialog_android_layout = 0;
@@ -6008,39 +6160,27 @@
 			// aapt resource value: 1
 			public const int AlertDialog_buttonPanelSideLayout = 1;
 			
+			// aapt resource value: 5
+			public const int AlertDialog_listItemLayout = 5;
+			
 			// aapt resource value: 2
-			public const int AlertDialog_listItemLayout = 2;
+			public const int AlertDialog_listLayout = 2;
 			
 			// aapt resource value: 3
-			public const int AlertDialog_listLayout = 3;
-			
-			// aapt resource value: 4
-			public const int AlertDialog_multiChoiceItemLayout = 4;
-			
-			// aapt resource value: 5
-			public const int AlertDialog_showTitle = 5;
+			public const int AlertDialog_multiChoiceItemLayout = 3;
 			
 			// aapt resource value: 6
-			public const int AlertDialog_singleChoiceItemLayout = 6;
+			public const int AlertDialog_showTitle = 6;
 			
-			// aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
+			// aapt resource value: 4
+			public const int AlertDialog_singleChoiceItemLayout = 4;
+			
 			public static int[] AppBarLayout = new int[] {
 					16842964,
 					16843919,
 					16844096,
-					2130968723,
-					2130968727};
-			
-			// aapt resource value: { 0x7F040162,0x7F040163 }
-			public static int[] AppBarLayoutStates = new int[] {
-					2130968930,
-					2130968931};
-			
-			// aapt resource value: 0
-			public const int AppBarLayoutStates_state_collapsed = 0;
-			
-			// aapt resource value: 1
-			public const int AppBarLayoutStates_state_collapsible = 1;
+					2130772005,
+					2130772223};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_android_background = 0;
@@ -6057,10 +6197,19 @@
 			// aapt resource value: 4
 			public const int AppBarLayout_expanded = 4;
 			
-			// aapt resource value: { 0x7F0400D4,0x7F0400D5 }
+			public static int[] AppBarLayoutStates = new int[] {
+					2130772224,
+					2130772225};
+			
+			// aapt resource value: 0
+			public const int AppBarLayoutStates_state_collapsed = 0;
+			
+			// aapt resource value: 1
+			public const int AppBarLayoutStates_state_collapsible = 1;
+			
 			public static int[] AppBarLayout_Layout = new int[] {
-					2130968788,
-					2130968789};
+					2130772226,
+					2130772227};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -6068,12 +6217,11 @@
 			// aapt resource value: 1
 			public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
 			
-			// aapt resource value: { 0x1010119,0x7F04011E,0x7F040195,0x7F040196 }
 			public static int[] AppCompatImageView = new int[] {
 					16843033,
-					2130968862,
-					2130968981,
-					2130968982};
+					2130772016,
+					2130772017,
+					2130772018};
 			
 			// aapt resource value: 0
 			public const int AppCompatImageView_android_src = 0;
@@ -6087,12 +6235,11 @@
 			// aapt resource value: 3
 			public const int AppCompatImageView_tintMode = 3;
 			
-			// aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
 			public static int[] AppCompatSeekBar = new int[] {
 					16843074,
-					2130968978,
-					2130968979,
-					2130968980};
+					2130772019,
+					2130772020,
+					2130772021};
 			
 			// aapt resource value: 0
 			public const int AppCompatSeekBar_android_thumb = 0;
@@ -6106,7 +6253,6 @@
 			// aapt resource value: 3
 			public const int AppCompatSeekBar_tickMarkTintMode = 3;
 			
-			// aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
 			public static int[] AppCompatTextHelper = new int[] {
 					16842804,
 					16843117,
@@ -6137,267 +6283,265 @@
 			// aapt resource value: 0
 			public const int AppCompatTextHelper_android_textAppearance = 0;
 			
-			// aapt resource value: { 0x1010034,0x7F04003D,0x7F04003E,0x7F04003F,0x7F040040,0x7F040041,0x7F0400A6,0x7F040181 }
 			public static int[] AppCompatTextView = new int[] {
 					16842804,
-					2130968637,
-					2130968638,
-					2130968639,
-					2130968640,
-					2130968641,
-					2130968742,
-					2130968961};
+					2130772022,
+					2130772023,
+					2130772024,
+					2130772025,
+					2130772026,
+					2130772027,
+					2130772028};
 			
 			// aapt resource value: 0
 			public const int AppCompatTextView_android_textAppearance = 0;
 			
-			// aapt resource value: 1
-			public const int AppCompatTextView_autoSizeMaxTextSize = 1;
-			
-			// aapt resource value: 2
-			public const int AppCompatTextView_autoSizeMinTextSize = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatTextView_autoSizePresetSizes = 3;
-			
-			// aapt resource value: 4
-			public const int AppCompatTextView_autoSizeStepGranularity = 4;
+			// aapt resource value: 6
+			public const int AppCompatTextView_autoSizeMaxTextSize = 6;
 			
 			// aapt resource value: 5
-			public const int AppCompatTextView_autoSizeTextType = 5;
+			public const int AppCompatTextView_autoSizeMinTextSize = 5;
 			
-			// aapt resource value: 6
-			public const int AppCompatTextView_fontFamily = 6;
+			// aapt resource value: 4
+			public const int AppCompatTextView_autoSizePresetSizes = 4;
+			
+			// aapt resource value: 3
+			public const int AppCompatTextView_autoSizeStepGranularity = 3;
+			
+			// aapt resource value: 2
+			public const int AppCompatTextView_autoSizeTextType = 2;
 			
 			// aapt resource value: 7
-			public const int AppCompatTextView_textAllCaps = 7;
+			public const int AppCompatTextView_fontFamily = 7;
 			
-			// aapt resource value: { 0x1010057,0x10100AE,0x7F040000,0x7F040001,0x7F040002,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000E,0x7F04000F,0x7F040010,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F040021,0x7F040022,0x7F040023,0x7F040024,0x7F040025,0x7F04003C,0x7F04004F,0x7F040052,0x7F040053,0x7F040054,0x7F040055,0x7F040056,0x7F040059,0x7F04005A,0x7F04005D,0x7F04005E,0x7F040066,0x7F040067,0x7F040068,0x7F040069,0x7F04006A,0x7F04006B,0x7F04006C,0x7F04006D,0x7F04006E,0x7F04006F,0x7F040079,0x7F040085,0x7F040086,0x7F040089,0x7F04008B,0x7F04008E,0x7F04008F,0x7F040090,0x7F040091,0x7F040092,0x7F0400B9,0x7F0400BF,0x7F0400D8,0x7F0400D9,0x7F0400DC,0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400F3,0x7F0400F4,0x7F0400F5,0x7F0400FB,0x7F0400FD,0x7F040104,0x7F040105,0x7F040106,0x7F040107,0x7F04010E,0x7F040111,0x7F040112,0x7F040113,0x7F04011B,0x7F04011C,0x7F04016F,0x7F040182,0x7F040183,0x7F040184,0x7F040185,0x7F040186,0x7F040187,0x7F040188,0x7F040189,0x7F04018A,0x7F04018C,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401B8,0x7F0401B9,0x7F0401BA,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401BE,0x7F0401BF,0x7F0401C0,0x7F0401C1 }
+			// aapt resource value: 1
+			public const int AppCompatTextView_textAllCaps = 1;
+			
 			public static int[] AppCompatTheme = new int[] {
 					16842839,
 					16842926,
-					2130968576,
-					2130968577,
-					2130968578,
-					2130968579,
-					2130968580,
-					2130968581,
-					2130968582,
-					2130968583,
-					2130968584,
-					2130968585,
-					2130968586,
-					2130968587,
-					2130968588,
-					2130968590,
-					2130968591,
-					2130968592,
-					2130968593,
-					2130968594,
-					2130968595,
-					2130968596,
-					2130968597,
-					2130968598,
-					2130968599,
-					2130968600,
-					2130968601,
-					2130968602,
-					2130968603,
-					2130968604,
-					2130968605,
-					2130968606,
-					2130968609,
-					2130968610,
-					2130968611,
-					2130968612,
-					2130968613,
-					2130968636,
-					2130968655,
-					2130968658,
-					2130968659,
-					2130968660,
-					2130968661,
-					2130968662,
-					2130968665,
-					2130968666,
-					2130968669,
-					2130968670,
-					2130968678,
-					2130968679,
-					2130968680,
-					2130968681,
-					2130968682,
-					2130968683,
-					2130968684,
-					2130968685,
-					2130968686,
-					2130968687,
-					2130968697,
-					2130968709,
-					2130968710,
-					2130968713,
-					2130968715,
-					2130968718,
-					2130968719,
-					2130968720,
-					2130968721,
-					2130968722,
-					2130968761,
-					2130968767,
-					2130968792,
-					2130968793,
-					2130968796,
-					2130968797,
-					2130968798,
-					2130968799,
-					2130968800,
-					2130968801,
-					2130968802,
-					2130968819,
-					2130968820,
-					2130968821,
-					2130968827,
-					2130968829,
-					2130968836,
-					2130968837,
-					2130968838,
-					2130968839,
-					2130968846,
-					2130968849,
-					2130968850,
-					2130968851,
-					2130968859,
-					2130968860,
-					2130968943,
-					2130968962,
-					2130968963,
-					2130968964,
-					2130968965,
-					2130968966,
-					2130968967,
-					2130968968,
-					2130968969,
-					2130968970,
-					2130968972,
-					2130968995,
-					2130968996,
-					2130968997,
-					2130968998,
-					2130969016,
-					2130969017,
-					2130969018,
-					2130969019,
-					2130969020,
-					2130969021,
-					2130969022,
-					2130969023,
-					2130969024,
-					2130969025};
-			
-			// aapt resource value: 2
-			public const int AppCompatTheme_actionBarDivider = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatTheme_actionBarItemBackground = 3;
-			
-			// aapt resource value: 4
-			public const int AppCompatTheme_actionBarPopupTheme = 4;
-			
-			// aapt resource value: 5
-			public const int AppCompatTheme_actionBarSize = 5;
-			
-			// aapt resource value: 6
-			public const int AppCompatTheme_actionBarSplitStyle = 6;
-			
-			// aapt resource value: 7
-			public const int AppCompatTheme_actionBarStyle = 7;
-			
-			// aapt resource value: 8
-			public const int AppCompatTheme_actionBarTabBarStyle = 8;
-			
-			// aapt resource value: 9
-			public const int AppCompatTheme_actionBarTabStyle = 9;
-			
-			// aapt resource value: 10
-			public const int AppCompatTheme_actionBarTabTextStyle = 10;
-			
-			// aapt resource value: 11
-			public const int AppCompatTheme_actionBarTheme = 11;
-			
-			// aapt resource value: 12
-			public const int AppCompatTheme_actionBarWidgetTheme = 12;
-			
-			// aapt resource value: 13
-			public const int AppCompatTheme_actionButtonStyle = 13;
-			
-			// aapt resource value: 14
-			public const int AppCompatTheme_actionDropDownStyle = 14;
-			
-			// aapt resource value: 15
-			public const int AppCompatTheme_actionMenuTextAppearance = 15;
-			
-			// aapt resource value: 16
-			public const int AppCompatTheme_actionMenuTextColor = 16;
-			
-			// aapt resource value: 17
-			public const int AppCompatTheme_actionModeBackground = 17;
-			
-			// aapt resource value: 18
-			public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
-			
-			// aapt resource value: 19
-			public const int AppCompatTheme_actionModeCloseDrawable = 19;
-			
-			// aapt resource value: 20
-			public const int AppCompatTheme_actionModeCopyDrawable = 20;
-			
-			// aapt resource value: 21
-			public const int AppCompatTheme_actionModeCutDrawable = 21;
-			
-			// aapt resource value: 22
-			public const int AppCompatTheme_actionModeFindDrawable = 22;
+					2130772029,
+					2130772030,
+					2130772031,
+					2130772032,
+					2130772033,
+					2130772034,
+					2130772035,
+					2130772036,
+					2130772037,
+					2130772038,
+					2130772039,
+					2130772040,
+					2130772041,
+					2130772042,
+					2130772043,
+					2130772044,
+					2130772045,
+					2130772046,
+					2130772047,
+					2130772048,
+					2130772049,
+					2130772050,
+					2130772051,
+					2130772052,
+					2130772053,
+					2130772054,
+					2130772055,
+					2130772056,
+					2130772057,
+					2130772058,
+					2130772059,
+					2130772060,
+					2130772061,
+					2130772062,
+					2130772063,
+					2130772064,
+					2130772065,
+					2130772066,
+					2130772067,
+					2130772068,
+					2130772069,
+					2130772070,
+					2130772071,
+					2130772072,
+					2130772073,
+					2130772074,
+					2130772075,
+					2130772076,
+					2130772077,
+					2130772078,
+					2130772079,
+					2130772080,
+					2130772081,
+					2130772082,
+					2130772083,
+					2130772084,
+					2130772085,
+					2130772086,
+					2130772087,
+					2130772088,
+					2130772089,
+					2130772090,
+					2130772091,
+					2130772092,
+					2130772093,
+					2130772094,
+					2130772095,
+					2130772096,
+					2130772097,
+					2130772098,
+					2130772099,
+					2130772100,
+					2130772101,
+					2130772102,
+					2130772103,
+					2130772104,
+					2130772105,
+					2130772106,
+					2130772107,
+					2130772108,
+					2130772109,
+					2130772110,
+					2130772111,
+					2130772112,
+					2130772113,
+					2130772114,
+					2130772115,
+					2130772116,
+					2130772117,
+					2130772118,
+					2130772119,
+					2130772120,
+					2130772121,
+					2130772122,
+					2130772123,
+					2130772124,
+					2130772125,
+					2130772126,
+					2130772127,
+					2130772128,
+					2130772129,
+					2130772130,
+					2130772131,
+					2130772132,
+					2130772133,
+					2130772134,
+					2130772135,
+					2130772136,
+					2130772137,
+					2130772138,
+					2130772139,
+					2130772140,
+					2130772141,
+					2130772142,
+					2130772143,
+					2130772144,
+					2130772145};
 			
 			// aapt resource value: 23
-			public const int AppCompatTheme_actionModePasteDrawable = 23;
+			public const int AppCompatTheme_actionBarDivider = 23;
 			
 			// aapt resource value: 24
-			public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+			public const int AppCompatTheme_actionBarItemBackground = 24;
+			
+			// aapt resource value: 17
+			public const int AppCompatTheme_actionBarPopupTheme = 17;
+			
+			// aapt resource value: 22
+			public const int AppCompatTheme_actionBarSize = 22;
+			
+			// aapt resource value: 19
+			public const int AppCompatTheme_actionBarSplitStyle = 19;
+			
+			// aapt resource value: 18
+			public const int AppCompatTheme_actionBarStyle = 18;
+			
+			// aapt resource value: 13
+			public const int AppCompatTheme_actionBarTabBarStyle = 13;
+			
+			// aapt resource value: 12
+			public const int AppCompatTheme_actionBarTabStyle = 12;
+			
+			// aapt resource value: 14
+			public const int AppCompatTheme_actionBarTabTextStyle = 14;
+			
+			// aapt resource value: 20
+			public const int AppCompatTheme_actionBarTheme = 20;
+			
+			// aapt resource value: 21
+			public const int AppCompatTheme_actionBarWidgetTheme = 21;
+			
+			// aapt resource value: 50
+			public const int AppCompatTheme_actionButtonStyle = 50;
+			
+			// aapt resource value: 46
+			public const int AppCompatTheme_actionDropDownStyle = 46;
 			
 			// aapt resource value: 25
-			public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+			public const int AppCompatTheme_actionMenuTextAppearance = 25;
 			
 			// aapt resource value: 26
-			public const int AppCompatTheme_actionModeShareDrawable = 26;
-			
-			// aapt resource value: 27
-			public const int AppCompatTheme_actionModeSplitBackground = 27;
-			
-			// aapt resource value: 28
-			public const int AppCompatTheme_actionModeStyle = 28;
+			public const int AppCompatTheme_actionMenuTextColor = 26;
 			
 			// aapt resource value: 29
-			public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+			public const int AppCompatTheme_actionModeBackground = 29;
 			
-			// aapt resource value: 30
-			public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+			// aapt resource value: 28
+			public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
 			
 			// aapt resource value: 31
-			public const int AppCompatTheme_actionOverflowMenuStyle = 31;
-			
-			// aapt resource value: 32
-			public const int AppCompatTheme_activityChooserViewStyle = 32;
+			public const int AppCompatTheme_actionModeCloseDrawable = 31;
 			
 			// aapt resource value: 33
-			public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+			public const int AppCompatTheme_actionModeCopyDrawable = 33;
+			
+			// aapt resource value: 32
+			public const int AppCompatTheme_actionModeCutDrawable = 32;
+			
+			// aapt resource value: 37
+			public const int AppCompatTheme_actionModeFindDrawable = 37;
 			
 			// aapt resource value: 34
-			public const int AppCompatTheme_alertDialogCenterButtons = 34;
+			public const int AppCompatTheme_actionModePasteDrawable = 34;
+			
+			// aapt resource value: 39
+			public const int AppCompatTheme_actionModePopupWindowStyle = 39;
 			
 			// aapt resource value: 35
-			public const int AppCompatTheme_alertDialogStyle = 35;
+			public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
 			
 			// aapt resource value: 36
-			public const int AppCompatTheme_alertDialogTheme = 36;
+			public const int AppCompatTheme_actionModeShareDrawable = 36;
+			
+			// aapt resource value: 30
+			public const int AppCompatTheme_actionModeSplitBackground = 30;
+			
+			// aapt resource value: 27
+			public const int AppCompatTheme_actionModeStyle = 27;
+			
+			// aapt resource value: 38
+			public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+			
+			// aapt resource value: 15
+			public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+			
+			// aapt resource value: 16
+			public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+			
+			// aapt resource value: 58
+			public const int AppCompatTheme_activityChooserViewStyle = 58;
+			
+			// aapt resource value: 95
+			public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+			
+			// aapt resource value: 96
+			public const int AppCompatTheme_alertDialogCenterButtons = 96;
+			
+			// aapt resource value: 94
+			public const int AppCompatTheme_alertDialogStyle = 94;
+			
+			// aapt resource value: 97
+			public const int AppCompatTheme_alertDialogTheme = 97;
 			
 			// aapt resource value: 1
 			public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -6405,272 +6549,270 @@
 			// aapt resource value: 0
 			public const int AppCompatTheme_android_windowIsFloating = 0;
 			
-			// aapt resource value: 37
-			public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
-			
-			// aapt resource value: 38
-			public const int AppCompatTheme_borderlessButtonStyle = 38;
-			
-			// aapt resource value: 39
-			public const int AppCompatTheme_buttonBarButtonStyle = 39;
-			
-			// aapt resource value: 40
-			public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
-			
-			// aapt resource value: 41
-			public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
-			
-			// aapt resource value: 42
-			public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
-			
-			// aapt resource value: 43
-			public const int AppCompatTheme_buttonBarStyle = 43;
-			
-			// aapt resource value: 44
-			public const int AppCompatTheme_buttonStyle = 44;
-			
-			// aapt resource value: 45
-			public const int AppCompatTheme_buttonStyleSmall = 45;
-			
-			// aapt resource value: 46
-			public const int AppCompatTheme_checkboxStyle = 46;
-			
-			// aapt resource value: 47
-			public const int AppCompatTheme_checkedTextViewStyle = 47;
-			
-			// aapt resource value: 48
-			public const int AppCompatTheme_colorAccent = 48;
-			
-			// aapt resource value: 49
-			public const int AppCompatTheme_colorBackgroundFloating = 49;
-			
-			// aapt resource value: 50
-			public const int AppCompatTheme_colorButtonNormal = 50;
-			
-			// aapt resource value: 51
-			public const int AppCompatTheme_colorControlActivated = 51;
-			
-			// aapt resource value: 52
-			public const int AppCompatTheme_colorControlHighlight = 52;
-			
-			// aapt resource value: 53
-			public const int AppCompatTheme_colorControlNormal = 53;
-			
-			// aapt resource value: 54
-			public const int AppCompatTheme_colorError = 54;
+			// aapt resource value: 102
+			public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
 			
 			// aapt resource value: 55
-			public const int AppCompatTheme_colorPrimary = 55;
+			public const int AppCompatTheme_borderlessButtonStyle = 55;
 			
-			// aapt resource value: 56
-			public const int AppCompatTheme_colorPrimaryDark = 56;
+			// aapt resource value: 52
+			public const int AppCompatTheme_buttonBarButtonStyle = 52;
+			
+			// aapt resource value: 100
+			public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+			
+			// aapt resource value: 101
+			public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+			
+			// aapt resource value: 99
+			public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
+			
+			// aapt resource value: 51
+			public const int AppCompatTheme_buttonBarStyle = 51;
+			
+			// aapt resource value: 103
+			public const int AppCompatTheme_buttonStyle = 103;
+			
+			// aapt resource value: 104
+			public const int AppCompatTheme_buttonStyleSmall = 104;
+			
+			// aapt resource value: 105
+			public const int AppCompatTheme_checkboxStyle = 105;
+			
+			// aapt resource value: 106
+			public const int AppCompatTheme_checkedTextViewStyle = 106;
+			
+			// aapt resource value: 86
+			public const int AppCompatTheme_colorAccent = 86;
+			
+			// aapt resource value: 93
+			public const int AppCompatTheme_colorBackgroundFloating = 93;
+			
+			// aapt resource value: 90
+			public const int AppCompatTheme_colorButtonNormal = 90;
+			
+			// aapt resource value: 88
+			public const int AppCompatTheme_colorControlActivated = 88;
+			
+			// aapt resource value: 89
+			public const int AppCompatTheme_colorControlHighlight = 89;
+			
+			// aapt resource value: 87
+			public const int AppCompatTheme_colorControlNormal = 87;
+			
+			// aapt resource value: 118
+			public const int AppCompatTheme_colorError = 118;
+			
+			// aapt resource value: 84
+			public const int AppCompatTheme_colorPrimary = 84;
+			
+			// aapt resource value: 85
+			public const int AppCompatTheme_colorPrimaryDark = 85;
+			
+			// aapt resource value: 91
+			public const int AppCompatTheme_colorSwitchThumbNormal = 91;
+			
+			// aapt resource value: 92
+			public const int AppCompatTheme_controlBackground = 92;
+			
+			// aapt resource value: 44
+			public const int AppCompatTheme_dialogPreferredPadding = 44;
+			
+			// aapt resource value: 43
+			public const int AppCompatTheme_dialogTheme = 43;
 			
 			// aapt resource value: 57
-			public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+			public const int AppCompatTheme_dividerHorizontal = 57;
 			
-			// aapt resource value: 58
-			public const int AppCompatTheme_controlBackground = 58;
-			
-			// aapt resource value: 59
-			public const int AppCompatTheme_dialogPreferredPadding = 59;
-			
-			// aapt resource value: 60
-			public const int AppCompatTheme_dialogTheme = 60;
-			
-			// aapt resource value: 61
-			public const int AppCompatTheme_dividerHorizontal = 61;
-			
-			// aapt resource value: 62
-			public const int AppCompatTheme_dividerVertical = 62;
-			
-			// aapt resource value: 64
-			public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
-			
-			// aapt resource value: 63
-			public const int AppCompatTheme_dropDownListViewStyle = 63;
-			
-			// aapt resource value: 65
-			public const int AppCompatTheme_editTextBackground = 65;
-			
-			// aapt resource value: 66
-			public const int AppCompatTheme_editTextColor = 66;
-			
-			// aapt resource value: 67
-			public const int AppCompatTheme_editTextStyle = 67;
-			
-			// aapt resource value: 68
-			public const int AppCompatTheme_homeAsUpIndicator = 68;
-			
-			// aapt resource value: 69
-			public const int AppCompatTheme_imageButtonStyle = 69;
-			
-			// aapt resource value: 70
-			public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
-			
-			// aapt resource value: 71
-			public const int AppCompatTheme_listDividerAlertDialog = 71;
-			
-			// aapt resource value: 72
-			public const int AppCompatTheme_listMenuViewStyle = 72;
-			
-			// aapt resource value: 73
-			public const int AppCompatTheme_listPopupWindowStyle = 73;
-			
-			// aapt resource value: 74
-			public const int AppCompatTheme_listPreferredItemHeight = 74;
+			// aapt resource value: 56
+			public const int AppCompatTheme_dividerVertical = 56;
 			
 			// aapt resource value: 75
-			public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+			public const int AppCompatTheme_dropDownListViewStyle = 75;
+			
+			// aapt resource value: 47
+			public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
+			
+			// aapt resource value: 64
+			public const int AppCompatTheme_editTextBackground = 64;
+			
+			// aapt resource value: 63
+			public const int AppCompatTheme_editTextColor = 63;
+			
+			// aapt resource value: 107
+			public const int AppCompatTheme_editTextStyle = 107;
+			
+			// aapt resource value: 49
+			public const int AppCompatTheme_homeAsUpIndicator = 49;
+			
+			// aapt resource value: 65
+			public const int AppCompatTheme_imageButtonStyle = 65;
+			
+			// aapt resource value: 83
+			public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+			
+			// aapt resource value: 45
+			public const int AppCompatTheme_listDividerAlertDialog = 45;
+			
+			// aapt resource value: 115
+			public const int AppCompatTheme_listMenuViewStyle = 115;
 			
 			// aapt resource value: 76
-			public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+			public const int AppCompatTheme_listPopupWindowStyle = 76;
 			
-			// aapt resource value: 77
-			public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+			// aapt resource value: 70
+			public const int AppCompatTheme_listPreferredItemHeight = 70;
 			
-			// aapt resource value: 78
-			public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+			// aapt resource value: 72
+			public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
 			
-			// aapt resource value: 79
-			public const int AppCompatTheme_panelBackground = 79;
+			// aapt resource value: 71
+			public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+			
+			// aapt resource value: 73
+			public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+			
+			// aapt resource value: 74
+			public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
 			
 			// aapt resource value: 80
-			public const int AppCompatTheme_panelMenuListTheme = 80;
+			public const int AppCompatTheme_panelBackground = 80;
+			
+			// aapt resource value: 82
+			public const int AppCompatTheme_panelMenuListTheme = 82;
 			
 			// aapt resource value: 81
 			public const int AppCompatTheme_panelMenuListWidth = 81;
 			
-			// aapt resource value: 82
-			public const int AppCompatTheme_popupMenuStyle = 82;
+			// aapt resource value: 61
+			public const int AppCompatTheme_popupMenuStyle = 61;
 			
-			// aapt resource value: 83
-			public const int AppCompatTheme_popupWindowStyle = 83;
-			
-			// aapt resource value: 84
-			public const int AppCompatTheme_radioButtonStyle = 84;
-			
-			// aapt resource value: 85
-			public const int AppCompatTheme_ratingBarStyle = 85;
-			
-			// aapt resource value: 86
-			public const int AppCompatTheme_ratingBarStyleIndicator = 86;
-			
-			// aapt resource value: 87
-			public const int AppCompatTheme_ratingBarStyleSmall = 87;
-			
-			// aapt resource value: 88
-			public const int AppCompatTheme_searchViewStyle = 88;
-			
-			// aapt resource value: 89
-			public const int AppCompatTheme_seekBarStyle = 89;
-			
-			// aapt resource value: 90
-			public const int AppCompatTheme_selectableItemBackground = 90;
-			
-			// aapt resource value: 91
-			public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
-			
-			// aapt resource value: 92
-			public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
-			
-			// aapt resource value: 93
-			public const int AppCompatTheme_spinnerStyle = 93;
-			
-			// aapt resource value: 94
-			public const int AppCompatTheme_switchStyle = 94;
-			
-			// aapt resource value: 95
-			public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
-			
-			// aapt resource value: 96
-			public const int AppCompatTheme_textAppearanceListItem = 96;
-			
-			// aapt resource value: 97
-			public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
-			
-			// aapt resource value: 98
-			public const int AppCompatTheme_textAppearanceListItemSmall = 98;
-			
-			// aapt resource value: 99
-			public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
-			
-			// aapt resource value: 100
-			public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
-			
-			// aapt resource value: 101
-			public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
-			
-			// aapt resource value: 102
-			public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
-			
-			// aapt resource value: 103
-			public const int AppCompatTheme_textColorAlertDialogListItem = 103;
-			
-			// aapt resource value: 104
-			public const int AppCompatTheme_textColorSearchUrl = 104;
-			
-			// aapt resource value: 105
-			public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
-			
-			// aapt resource value: 106
-			public const int AppCompatTheme_toolbarStyle = 106;
-			
-			// aapt resource value: 107
-			public const int AppCompatTheme_tooltipForegroundColor = 107;
+			// aapt resource value: 62
+			public const int AppCompatTheme_popupWindowStyle = 62;
 			
 			// aapt resource value: 108
-			public const int AppCompatTheme_tooltipFrameBackground = 108;
+			public const int AppCompatTheme_radioButtonStyle = 108;
 			
 			// aapt resource value: 109
-			public const int AppCompatTheme_windowActionBar = 109;
+			public const int AppCompatTheme_ratingBarStyle = 109;
 			
 			// aapt resource value: 110
-			public const int AppCompatTheme_windowActionBarOverlay = 110;
+			public const int AppCompatTheme_ratingBarStyleIndicator = 110;
 			
 			// aapt resource value: 111
-			public const int AppCompatTheme_windowActionModeOverlay = 111;
+			public const int AppCompatTheme_ratingBarStyleSmall = 111;
+			
+			// aapt resource value: 69
+			public const int AppCompatTheme_searchViewStyle = 69;
 			
 			// aapt resource value: 112
-			public const int AppCompatTheme_windowFixedHeightMajor = 112;
+			public const int AppCompatTheme_seekBarStyle = 112;
+			
+			// aapt resource value: 53
+			public const int AppCompatTheme_selectableItemBackground = 53;
+			
+			// aapt resource value: 54
+			public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+			
+			// aapt resource value: 48
+			public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
 			
 			// aapt resource value: 113
-			public const int AppCompatTheme_windowFixedHeightMinor = 113;
+			public const int AppCompatTheme_spinnerStyle = 113;
 			
 			// aapt resource value: 114
-			public const int AppCompatTheme_windowFixedWidthMajor = 114;
+			public const int AppCompatTheme_switchStyle = 114;
 			
-			// aapt resource value: 115
-			public const int AppCompatTheme_windowFixedWidthMinor = 115;
+			// aapt resource value: 40
+			public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
 			
-			// aapt resource value: 116
-			public const int AppCompatTheme_windowMinWidthMajor = 116;
+			// aapt resource value: 77
+			public const int AppCompatTheme_textAppearanceListItem = 77;
+			
+			// aapt resource value: 78
+			public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
+			
+			// aapt resource value: 79
+			public const int AppCompatTheme_textAppearanceListItemSmall = 79;
+			
+			// aapt resource value: 42
+			public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
+			
+			// aapt resource value: 67
+			public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
+			
+			// aapt resource value: 66
+			public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
+			
+			// aapt resource value: 41
+			public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+			
+			// aapt resource value: 98
+			public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+			
+			// aapt resource value: 68
+			public const int AppCompatTheme_textColorSearchUrl = 68;
+			
+			// aapt resource value: 60
+			public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+			
+			// aapt resource value: 59
+			public const int AppCompatTheme_toolbarStyle = 59;
 			
 			// aapt resource value: 117
-			public const int AppCompatTheme_windowMinWidthMinor = 117;
+			public const int AppCompatTheme_tooltipForegroundColor = 117;
 			
-			// aapt resource value: 118
-			public const int AppCompatTheme_windowNoTitle = 118;
+			// aapt resource value: 116
+			public const int AppCompatTheme_tooltipFrameBackground = 116;
 			
-			// aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
+			// aapt resource value: 2
+			public const int AppCompatTheme_windowActionBar = 2;
+			
+			// aapt resource value: 4
+			public const int AppCompatTheme_windowActionBarOverlay = 4;
+			
+			// aapt resource value: 5
+			public const int AppCompatTheme_windowActionModeOverlay = 5;
+			
+			// aapt resource value: 9
+			public const int AppCompatTheme_windowFixedHeightMajor = 9;
+			
+			// aapt resource value: 7
+			public const int AppCompatTheme_windowFixedHeightMinor = 7;
+			
+			// aapt resource value: 6
+			public const int AppCompatTheme_windowFixedWidthMajor = 6;
+			
+			// aapt resource value: 8
+			public const int AppCompatTheme_windowFixedWidthMinor = 8;
+			
+			// aapt resource value: 10
+			public const int AppCompatTheme_windowMinWidthMajor = 10;
+			
+			// aapt resource value: 11
+			public const int AppCompatTheme_windowMinWidthMinor = 11;
+			
+			// aapt resource value: 3
+			public const int AppCompatTheme_windowNoTitle = 3;
+			
 			public static int[] BallPulseFooter = new int[] {
-					2130968864,
-					2130968865,
-					2130968912};
-			
-			// aapt resource value: 0
-			public const int BallPulseFooter_srlAnimatingColor = 0;
+					2130772317,
+					2130772338,
+					2130772339};
 			
 			// aapt resource value: 1
-			public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
+			public const int BallPulseFooter_srlAnimatingColor = 1;
+			
+			// aapt resource value: 0
+			public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
 			
 			// aapt resource value: 2
 			public const int BallPulseFooter_srlNormalColor = 2;
 			
-			// aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
 			public static int[] BezierRadarHeader = new int[] {
-					2130968863,
-					2130968882,
-					2130968913};
+					2130772316,
+					2130772324,
+					2130772326};
 			
 			// aapt resource value: 0
 			public const int BezierRadarHeader_srlAccentColor = 0;
@@ -6681,19 +6823,18 @@
 			// aapt resource value: 2
 			public const int BezierRadarHeader_srlPrimaryColor = 2;
 			
-			// aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
 			public static int[] BottomNavigationView = new int[] {
-					2130968723,
-					2130968772,
-					2130968773,
-					2130968776,
-					2130968808};
+					2130772005,
+					2130772266,
+					2130772267,
+					2130772268,
+					2130772269};
 			
 			// aapt resource value: 0
 			public const int BottomNavigationView_elevation = 0;
 			
-			// aapt resource value: 1
-			public const int BottomNavigationView_itemBackground = 1;
+			// aapt resource value: 4
+			public const int BottomNavigationView_itemBackground = 4;
 			
 			// aapt resource value: 2
 			public const int BottomNavigationView_itemIconTint = 2;
@@ -6701,51 +6842,48 @@
 			// aapt resource value: 3
 			public const int BottomNavigationView_itemTextColor = 3;
 			
-			// aapt resource value: 4
-			public const int BottomNavigationView_menu = 4;
+			// aapt resource value: 1
+			public const int BottomNavigationView_menu = 1;
 			
-			// aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
 			public static int[] BottomSheetBehavior_Layout = new int[] {
-					2130968649,
-					2130968651,
-					2130968652};
-			
-			// aapt resource value: 0
-			public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
+					2130772228,
+					2130772229,
+					2130772230};
 			
 			// aapt resource value: 1
-			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
+			public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+			
+			// aapt resource value: 0
+			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
 			
 			// aapt resource value: 2
 			public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
 			
-			// aapt resource value: { 0x7F040026 }
 			public static int[] ButtonBarLayout = new int[] {
-					2130968614};
+					2130772146};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
 			
-			// aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015D }
 			public static int[] ClassicsFooter = new int[] {
-					2130968863,
-					2130968865,
-					2130968869,
-					2130968870,
-					2130968871,
-					2130968872,
-					2130968873,
-					2130968874,
-					2130968896,
-					2130968913,
-					2130968916,
-					2130968917,
-					2130968918,
-					2130968919,
-					2130968920,
-					2130968921,
-					2130968922,
-					2130968925};
+					2130772316,
+					2130772317,
+					2130772318,
+					2130772319,
+					2130772320,
+					2130772321,
+					2130772322,
+					2130772323,
+					2130772325,
+					2130772326,
+					2130772327,
+					2130772328,
+					2130772329,
+					2130772330,
+					2130772331,
+					2130772332,
+					2130772333,
+					2130772336};
 			
 			// aapt resource value: 0
 			public const int ClassicsFooter_srlAccentColor = 0;
@@ -6801,30 +6939,29 @@
 			// aapt resource value: 17
 			public const int ClassicsFooter_srlTextSizeTitle = 17;
 			
-			// aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040133,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015C,0x7F04015D,0x7F04015E,0x7F04015F }
 			public static int[] ClassicsHeader = new int[] {
-					2130968863,
-					2130968865,
-					2130968869,
-					2130968870,
-					2130968871,
-					2130968872,
-					2130968873,
-					2130968874,
-					2130968883,
-					2130968896,
-					2130968913,
-					2130968916,
-					2130968917,
-					2130968918,
-					2130968920,
-					2130968921,
-					2130968922,
-					2130968923,
-					2130968924,
-					2130968925,
-					2130968926,
-					2130968927};
+					2130772316,
+					2130772317,
+					2130772318,
+					2130772319,
+					2130772320,
+					2130772321,
+					2130772322,
+					2130772323,
+					2130772325,
+					2130772326,
+					2130772327,
+					2130772328,
+					2130772329,
+					2130772331,
+					2130772332,
+					2130772333,
+					2130772334,
+					2130772335,
+					2130772336,
+					2130772337,
+					2130772340,
+					2130772341};
 			
 			// aapt resource value: 0
 			public const int ClassicsHeader_srlAccentColor = 0;
@@ -6850,101 +6987,117 @@
 			// aapt resource value: 7
 			public const int ClassicsHeader_srlDrawableSize = 7;
 			
+			// aapt resource value: 21
+			public const int ClassicsHeader_srlEnableLastTime = 21;
+			
 			// aapt resource value: 8
-			public const int ClassicsHeader_srlEnableLastTime = 8;
+			public const int ClassicsHeader_srlFinishDuration = 8;
 			
 			// aapt resource value: 9
-			public const int ClassicsHeader_srlFinishDuration = 9;
+			public const int ClassicsHeader_srlPrimaryColor = 9;
 			
 			// aapt resource value: 10
-			public const int ClassicsHeader_srlPrimaryColor = 10;
+			public const int ClassicsHeader_srlTextFailed = 10;
 			
 			// aapt resource value: 11
-			public const int ClassicsHeader_srlTextFailed = 11;
+			public const int ClassicsHeader_srlTextFinish = 11;
 			
 			// aapt resource value: 12
-			public const int ClassicsHeader_srlTextFinish = 12;
+			public const int ClassicsHeader_srlTextLoading = 12;
 			
 			// aapt resource value: 13
-			public const int ClassicsHeader_srlTextLoading = 13;
+			public const int ClassicsHeader_srlTextPulling = 13;
 			
 			// aapt resource value: 14
-			public const int ClassicsHeader_srlTextPulling = 14;
+			public const int ClassicsHeader_srlTextRefreshing = 14;
 			
 			// aapt resource value: 15
-			public const int ClassicsHeader_srlTextRefreshing = 15;
+			public const int ClassicsHeader_srlTextRelease = 15;
 			
 			// aapt resource value: 16
-			public const int ClassicsHeader_srlTextRelease = 16;
+			public const int ClassicsHeader_srlTextSecondary = 16;
 			
 			// aapt resource value: 17
-			public const int ClassicsHeader_srlTextSecondary = 17;
+			public const int ClassicsHeader_srlTextSizeTime = 17;
 			
 			// aapt resource value: 18
-			public const int ClassicsHeader_srlTextSizeTime = 18;
-			
-			// aapt resource value: 19
-			public const int ClassicsHeader_srlTextSizeTitle = 19;
+			public const int ClassicsHeader_srlTextSizeTitle = 18;
 			
 			// aapt resource value: 20
 			public const int ClassicsHeader_srlTextTimeMarginTop = 20;
 			
-			// aapt resource value: 21
-			public const int ClassicsHeader_srlTextUpdate = 21;
+			// aapt resource value: 19
+			public const int ClassicsHeader_srlTextUpdate = 19;
 			
-			// aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
 			public static int[] CollapsingToolbarLayout = new int[] {
-					2130968675,
-					2130968676,
-					2130968696,
-					2130968728,
-					2130968729,
-					2130968730,
-					2130968731,
-					2130968732,
-					2130968733,
-					2130968734,
-					2130968842,
-					2130968843,
-					2130968933,
-					2130968983,
-					2130968984,
-					2130968994};
+					2130771980,
+					2130772231,
+					2130772232,
+					2130772233,
+					2130772234,
+					2130772235,
+					2130772236,
+					2130772237,
+					2130772238,
+					2130772239,
+					2130772240,
+					2130772241,
+					2130772242,
+					2130772243,
+					2130772244,
+					2130772245};
 			
-			// aapt resource value: 0
-			public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
+			// aapt resource value: 13
+			public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
+			
+			// aapt resource value: 7
+			public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
+			
+			// aapt resource value: 8
+			public const int CollapsingToolbarLayout_contentScrim = 8;
+			
+			// aapt resource value: 14
+			public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
 			
 			// aapt resource value: 1
-			public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 1;
-			
-			// aapt resource value: 2
-			public const int CollapsingToolbarLayout_contentScrim = 2;
-			
-			// aapt resource value: 3
-			public const int CollapsingToolbarLayout_expandedTitleGravity = 3;
-			
-			// aapt resource value: 4
-			public const int CollapsingToolbarLayout_expandedTitleMargin = 4;
+			public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
 			
 			// aapt resource value: 5
 			public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
 			
+			// aapt resource value: 4
+			public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
+			
+			// aapt resource value: 2
+			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
+			
+			// aapt resource value: 3
+			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
+			
 			// aapt resource value: 6
-			public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
+			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
 			
-			// aapt resource value: 7
-			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
+			// aapt resource value: 12
+			public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
 			
-			// aapt resource value: 8
-			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
+			// aapt resource value: 11
+			public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
 			
 			// aapt resource value: 9
-			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
+			public const int CollapsingToolbarLayout_statusBarScrim = 9;
 			
-			// aapt resource value: { 0x7F0400CF,0x7F0400D0 }
+			// aapt resource value: 0
+			public const int CollapsingToolbarLayout_title = 0;
+			
+			// aapt resource value: 15
+			public const int CollapsingToolbarLayout_titleEnabled = 15;
+			
+			// aapt resource value: 10
+			public const int CollapsingToolbarLayout_toolbarId = 10;
+			
 			public static int[] CollapsingToolbarLayout_Layout = new int[] {
-					2130968783,
-					2130968784};
+					2130772246,
+					2130772247};
 			
 			// aapt resource value: 0
 			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -6952,29 +7105,10 @@
 			// aapt resource value: 1
 			public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
 			
-			// aapt resource value: 10
-			public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
-			
-			// aapt resource value: 11
-			public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
-			
-			// aapt resource value: 12
-			public const int CollapsingToolbarLayout_statusBarScrim = 12;
-			
-			// aapt resource value: 13
-			public const int CollapsingToolbarLayout_title = 13;
-			
-			// aapt resource value: 14
-			public const int CollapsingToolbarLayout_titleEnabled = 14;
-			
-			// aapt resource value: 15
-			public const int CollapsingToolbarLayout_toolbarId = 15;
-			
-			// aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
 			public static int[] ColorStateListItem = new int[] {
 					16843173,
 					16843551,
-					2130968615};
+					2130772147};
 			
 			// aapt resource value: 2
 			public const int ColorStateListItem_alpha = 2;
@@ -6985,11 +7119,10 @@
 			// aapt resource value: 0
 			public const int ColorStateListItem_android_color = 0;
 			
-			// aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
 			public static int[] CompoundButton = new int[] {
 					16843015,
-					2130968667,
-					2130968668};
+					2130772148,
+					2130772149};
 			
 			// aapt resource value: 0
 			public const int CompoundButton_android_button = 0;
@@ -7000,53 +7133,50 @@
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			// aapt resource value: { 0x7F0400C9,0x7F040164 }
 			public static int[] CoordinatorLayout = new int[] {
-					2130968777,
-					2130968932};
+					2130772248,
+					2130772249};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_keylines = 0;
 			
-			// aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
+			// aapt resource value: 1
+			public const int CoordinatorLayout_statusBarBackground = 1;
+			
 			public static int[] CoordinatorLayout_Layout = new int[] {
 					16842931,
-					2130968780,
-					2130968781,
-					2130968782,
-					2130968785,
-					2130968786,
-					2130968787};
+					2130772250,
+					2130772251,
+					2130772252,
+					2130772253,
+					2130772254,
+					2130772255};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
 			
-			// aapt resource value: 1
-			public const int CoordinatorLayout_Layout_layout_anchor = 1;
-			
 			// aapt resource value: 2
-			public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
-			
-			// aapt resource value: 3
-			public const int CoordinatorLayout_Layout_layout_behavior = 3;
+			public const int CoordinatorLayout_Layout_layout_anchor = 2;
 			
 			// aapt resource value: 4
-			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
+			public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
+			
+			// aapt resource value: 1
+			public const int CoordinatorLayout_Layout_layout_behavior = 1;
+			
+			// aapt resource value: 6
+			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
 			
 			// aapt resource value: 5
 			public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
 			
-			// aapt resource value: 6
-			public const int CoordinatorLayout_Layout_layout_keyline = 6;
+			// aapt resource value: 3
+			public const int CoordinatorLayout_Layout_layout_keyline = 3;
 			
-			// aapt resource value: 1
-			public const int CoordinatorLayout_statusBarBackground = 1;
-			
-			// aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
 			public static int[] DesignTheme = new int[] {
-					2130968656,
-					2130968657,
-					2130968971};
+					2130772256,
+					2130772257,
+					2130772258};
 			
 			// aapt resource value: 0
 			public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -7057,70 +7187,61 @@
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			// aapt resource value: { 0x7F04003A,0x7F04003B,0x7F040047,0x7F040065,0x7F04008C,0x7F0400B0,0x7F04011A,0x7F04018E }
 			public static int[] DrawerArrowToggle = new int[] {
-					2130968634,
-					2130968635,
-					2130968647,
-					2130968677,
-					2130968716,
-					2130968752,
-					2130968858,
-					2130968974};
-			
-			// aapt resource value: 0
-			public const int DrawerArrowToggle_arrowHeadLength = 0;
-			
-			// aapt resource value: 1
-			public const int DrawerArrowToggle_arrowShaftLength = 1;
-			
-			// aapt resource value: 2
-			public const int DrawerArrowToggle_barLength = 2;
-			
-			// aapt resource value: 3
-			public const int DrawerArrowToggle_color = 3;
+					2130772150,
+					2130772151,
+					2130772152,
+					2130772153,
+					2130772154,
+					2130772155,
+					2130772156,
+					2130772157};
 			
 			// aapt resource value: 4
-			public const int DrawerArrowToggle_drawableSize = 4;
+			public const int DrawerArrowToggle_arrowHeadLength = 4;
 			
 			// aapt resource value: 5
-			public const int DrawerArrowToggle_gapBetweenBars = 5;
+			public const int DrawerArrowToggle_arrowShaftLength = 5;
 			
 			// aapt resource value: 6
-			public const int DrawerArrowToggle_spinBars = 6;
+			public const int DrawerArrowToggle_barLength = 6;
+			
+			// aapt resource value: 0
+			public const int DrawerArrowToggle_color = 0;
+			
+			// aapt resource value: 2
+			public const int DrawerArrowToggle_drawableSize = 2;
+			
+			// aapt resource value: 3
+			public const int DrawerArrowToggle_gapBetweenBars = 3;
+			
+			// aapt resource value: 1
+			public const int DrawerArrowToggle_spinBars = 1;
 			
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			// aapt resource value: { 0x7F040045,0x7F040046,0x7F04004E,0x7F040093,0x7F04009F,0x7F0400FF,0x7F040109,0x7F0401AB }
 			public static int[] FloatingActionButton = new int[] {
-					2130968645,
-					2130968646,
-					2130968654,
-					2130968723,
-					2130968735,
-					2130968831,
-					2130968841,
-					2130969003};
-			
-			// aapt resource value: 0
-			public const int FloatingActionButton_backgroundTint = 0;
+					2130772005,
+					2130772221,
+					2130772222,
+					2130772259,
+					2130772260,
+					2130772261,
+					2130772262,
+					2130772263};
 			
 			// aapt resource value: 1
-			public const int FloatingActionButton_backgroundTintMode = 1;
-			
-			// aapt resource value: { 0x7F040048 }
-			public static int[] FloatingActionButton_Behavior_Layout = new int[] {
-					2130968648};
-			
-			// aapt resource value: 0
-			public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+			public const int FloatingActionButton_backgroundTint = 1;
 			
 			// aapt resource value: 2
-			public const int FloatingActionButton_borderWidth = 2;
+			public const int FloatingActionButton_backgroundTintMode = 2;
 			
-			// aapt resource value: 3
-			public const int FloatingActionButton_elevation = 3;
+			// aapt resource value: 6
+			public const int FloatingActionButton_borderWidth = 6;
+			
+			// aapt resource value: 0
+			public const int FloatingActionButton_elevation = 0;
 			
 			// aapt resource value: 4
 			public const int FloatingActionButton_fabSize = 4;
@@ -7128,59 +7249,62 @@
 			// aapt resource value: 5
 			public const int FloatingActionButton_pressedTranslationZ = 5;
 			
-			// aapt resource value: 6
-			public const int FloatingActionButton_rippleColor = 6;
+			// aapt resource value: 3
+			public const int FloatingActionButton_rippleColor = 3;
 			
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			// aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
-			public static int[] FontFamily = new int[] {
-					2130968743,
-					2130968744,
-					2130968745,
-					2130968746,
-					2130968747,
-					2130968748};
-			
-			// aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
-			public static int[] FontFamilyFont = new int[] {
-					2130968741,
-					2130968749,
-					2130968750};
+			public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+					2130772264};
 			
 			// aapt resource value: 0
-			public const int FontFamilyFont_font = 0;
+			public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
 			
-			// aapt resource value: 1
-			public const int FontFamilyFont_fontStyle = 1;
-			
-			// aapt resource value: 2
-			public const int FontFamilyFont_fontWeight = 2;
+			public static int[] FontFamily = new int[] {
+					2130772305,
+					2130772306,
+					2130772307,
+					2130772308,
+					2130772309,
+					2130772310};
 			
 			// aapt resource value: 0
 			public const int FontFamily_fontProviderAuthority = 0;
 			
-			// aapt resource value: 1
-			public const int FontFamily_fontProviderCerts = 1;
-			
-			// aapt resource value: 2
-			public const int FontFamily_fontProviderFetchStrategy = 2;
-			
 			// aapt resource value: 3
-			public const int FontFamily_fontProviderFetchTimeout = 3;
+			public const int FontFamily_fontProviderCerts = 3;
 			
 			// aapt resource value: 4
-			public const int FontFamily_fontProviderPackage = 4;
+			public const int FontFamily_fontProviderFetchStrategy = 4;
 			
 			// aapt resource value: 5
-			public const int FontFamily_fontProviderQuery = 5;
+			public const int FontFamily_fontProviderFetchTimeout = 5;
 			
-			// aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
+			// aapt resource value: 1
+			public const int FontFamily_fontProviderPackage = 1;
+			
+			// aapt resource value: 2
+			public const int FontFamily_fontProviderQuery = 2;
+			
+			public static int[] FontFamilyFont = new int[] {
+					2130772311,
+					2130772312,
+					2130772313};
+			
+			// aapt resource value: 1
+			public const int FontFamilyFont_font = 1;
+			
+			// aapt resource value: 0
+			public const int FontFamilyFont_fontStyle = 0;
+			
+			// aapt resource value: 2
+			public const int FontFamilyFont_fontWeight = 2;
+			
 			public static int[] ForegroundLinearLayout = new int[] {
 					16843017,
 					16843264,
-					2130968751};
+					2130772265};
 			
 			// aapt resource value: 0
 			public const int ForegroundLinearLayout_android_foreground = 0;
@@ -7191,146 +7315,142 @@
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			// aapt resource value: { 0x7F040029,0x7F04002A,0x7F04002B,0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F0400B2 }
 			public static int[] HDLArcSeekBar = new int[] {
-					2130968617,
-					2130968618,
-					2130968619,
-					2130968620,
-					2130968621,
-					2130968622,
-					2130968623,
-					2130968624,
-					2130968625,
-					2130968626,
-					2130968627,
-					2130968628,
-					2130968629,
-					2130968630,
-					2130968631,
-					2130968632,
-					2130968633,
-					2130968754};
-			
-			// aapt resource value: 0
-			public const int HDLArcSeekBar_arc_border_color = 0;
-			
-			// aapt resource value: 1
-			public const int HDLArcSeekBar_arc_border_width = 1;
-			
-			// aapt resource value: 2
-			public const int HDLArcSeekBar_arc_colors = 2;
-			
-			// aapt resource value: 3
-			public const int HDLArcSeekBar_arc_max = 3;
-			
-			// aapt resource value: 4
-			public const int HDLArcSeekBar_arc_min = 4;
+					2130772382,
+					2130772383,
+					2130772384,
+					2130772385,
+					2130772386,
+					2130772387,
+					2130772388,
+					2130772389,
+					2130772390,
+					2130772391,
+					2130772392,
+					2130772393,
+					2130772394,
+					2130772395,
+					2130772396,
+					2130772397,
+					2130772398,
+					2130772399};
 			
 			// aapt resource value: 5
-			public const int HDLArcSeekBar_arc_open_angle = 5;
+			public const int HDLArcSeekBar_arc_border_color = 5;
+			
+			// aapt resource value: 4
+			public const int HDLArcSeekBar_arc_border_width = 4;
+			
+			// aapt resource value: 3
+			public const int HDLArcSeekBar_arc_colors = 3;
 			
 			// aapt resource value: 6
-			public const int HDLArcSeekBar_arc_progress = 6;
+			public const int HDLArcSeekBar_arc_max = 6;
 			
 			// aapt resource value: 7
-			public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+			public const int HDLArcSeekBar_arc_min = 7;
+			
+			// aapt resource value: 1
+			public const int HDLArcSeekBar_arc_open_angle = 1;
 			
 			// aapt resource value: 8
-			public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+			public const int HDLArcSeekBar_arc_progress = 8;
 			
-			// aapt resource value: 9
-			public const int HDLArcSeekBar_arc_rotate_angle = 9;
+			// aapt resource value: 16
+			public const int HDLArcSeekBar_arc_progress_bar_color = 16;
+			
+			// aapt resource value: 17
+			public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+			
+			// aapt resource value: 2
+			public const int HDLArcSeekBar_arc_rotate_angle = 2;
+			
+			// aapt resource value: 15
+			public const int HDLArcSeekBar_arc_shadow_radius = 15;
 			
 			// aapt resource value: 10
-			public const int HDLArcSeekBar_arc_shadow_radius = 10;
+			public const int HDLArcSeekBar_arc_thumb_color = 10;
 			
 			// aapt resource value: 11
-			public const int HDLArcSeekBar_arc_thumb_color = 11;
-			
-			// aapt resource value: 12
-			public const int HDLArcSeekBar_arc_thumb_radius = 12;
+			public const int HDLArcSeekBar_arc_thumb_radius = 11;
 			
 			// aapt resource value: 13
 			public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
 			
-			// aapt resource value: 14
-			public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
+			// aapt resource value: 12
+			public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
 			
-			// aapt resource value: 15
-			public const int HDLArcSeekBar_arc_thumb_width = 15;
-			
-			// aapt resource value: 16
-			public const int HDLArcSeekBar_arc_width = 16;
-			
-			// aapt resource value: 17
-			public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
-			
-			// aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
-			public static int[] HDLCurtainSeekBar = new int[] {
-					2130968702,
-					2130968703,
-					2130968704,
-					2130968705,
-					2130968706,
-					2130968847};
+			// aapt resource value: 9
+			public const int HDLArcSeekBar_arc_thumb_width = 9;
 			
 			// aapt resource value: 0
-			public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
+			public const int HDLArcSeekBar_arc_width = 0;
 			
-			// aapt resource value: 1
-			public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
+			// aapt resource value: 14
+			public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
+			
+			public static int[] HDLCurtainSeekBar = new int[] {
+					2130772400,
+					2130772401,
+					2130772402,
+					2130772403,
+					2130772404,
+					2130772405};
 			
 			// aapt resource value: 2
-			public const int HDLCurtainSeekBar_curtain_bar_color = 2;
+			public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
 			
 			// aapt resource value: 3
-			public const int HDLCurtainSeekBar_curtain_bar_height = 3;
+			public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
+			
+			// aapt resource value: 0
+			public const int HDLCurtainSeekBar_curtain_bar_color = 0;
+			
+			// aapt resource value: 5
+			public const int HDLCurtainSeekBar_curtain_bar_height = 5;
 			
 			// aapt resource value: 4
 			public const int HDLCurtainSeekBar_curtain_bar_width = 4;
 			
-			// aapt resource value: 5
-			public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+			// aapt resource value: 1
+			public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
 			
-			// aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
 			public static int[] HDLWaveSeekBar = new int[] {
-					2130968848,
-					2130969005,
-					2130969006,
-					2130969007,
-					2130969008,
-					2130969009};
-			
-			// aapt resource value: 0
-			public const int HDLWaveSeekBar_second_wave_color = 0;
+					2130772406,
+					2130772407,
+					2130772408,
+					2130772409,
+					2130772410,
+					2130772411};
 			
 			// aapt resource value: 1
-			public const int HDLWaveSeekBar_wave_bg_color = 1;
+			public const int HDLWaveSeekBar_second_wave_color = 1;
 			
 			// aapt resource value: 2
-			public const int HDLWaveSeekBar_wave_border_color = 2;
+			public const int HDLWaveSeekBar_wave_bg_color = 2;
 			
 			// aapt resource value: 3
-			public const int HDLWaveSeekBar_wave_color = 3;
+			public const int HDLWaveSeekBar_wave_border_color = 3;
 			
-			// aapt resource value: 4
-			public const int HDLWaveSeekBar_wave_height = 4;
+			// aapt resource value: 0
+			public const int HDLWaveSeekBar_wave_color = 0;
 			
 			// aapt resource value: 5
-			public const int HDLWaveSeekBar_wave_width = 5;
+			public const int HDLWaveSeekBar_wave_height = 5;
 			
-			// aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
+			// aapt resource value: 4
+			public const int HDLWaveSeekBar_wave_width = 4;
+			
 			public static int[] LinearLayoutCompat = new int[] {
 					16842927,
 					16842948,
 					16843046,
 					16843047,
 					16843048,
-					2130968712,
-					2130968714,
-					2130968807,
-					2130968853};
+					2130771988,
+					2130772158,
+					2130772159,
+					2130772160};
 			
 			// aapt resource value: 2
 			public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -7350,10 +7470,15 @@
 			// aapt resource value: 5
 			public const int LinearLayoutCompat_divider = 5;
 			
-			// aapt resource value: 6
-			public const int LinearLayoutCompat_dividerPadding = 6;
+			// aapt resource value: 8
+			public const int LinearLayoutCompat_dividerPadding = 8;
 			
-			// aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
+			// aapt resource value: 6
+			public const int LinearLayoutCompat_measureWithLargestChild = 6;
+			
+			// aapt resource value: 7
+			public const int LinearLayoutCompat_showDividers = 7;
+			
 			public static int[] LinearLayoutCompat_Layout = new int[] {
 					16842931,
 					16842996,
@@ -7372,13 +7497,6 @@
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
 			
-			// aapt resource value: 7
-			public const int LinearLayoutCompat_measureWithLargestChild = 7;
-			
-			// aapt resource value: 8
-			public const int LinearLayoutCompat_showDividers = 8;
-			
-			// aapt resource value: { 0x10102AC,0x10102AD }
 			public static int[] ListPopupWindow = new int[] {
 					16843436,
 					16843437};
@@ -7389,7 +7507,6 @@
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			// aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
 			public static int[] MenuGroup = new int[] {
 					16842766,
 					16842960,
@@ -7416,7 +7533,6 @@
 			// aapt resource value: 2
 			public const int MenuGroup_android_visible = 2;
 			
-			// aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
 			public static int[] MenuItem = new int[] {
 					16842754,
 					16842766,
@@ -7431,28 +7547,28 @@
 					16843236,
 					16843237,
 					16843375,
-					2130968589,
-					2130968607,
-					2130968608,
-					2130968616,
-					2130968689,
-					2130968764,
-					2130968765,
-					2130968813,
-					2130968852,
-					2130968999};
-			
-			// aapt resource value: 13
-			public const int MenuItem_actionLayout = 13;
-			
-			// aapt resource value: 14
-			public const int MenuItem_actionProviderClass = 14;
-			
-			// aapt resource value: 15
-			public const int MenuItem_actionViewClass = 15;
+					2130772161,
+					2130772162,
+					2130772163,
+					2130772164,
+					2130772165,
+					2130772166,
+					2130772167,
+					2130772168,
+					2130772169,
+					2130772170};
 			
 			// aapt resource value: 16
-			public const int MenuItem_alphabeticModifiers = 16;
+			public const int MenuItem_actionLayout = 16;
+			
+			// aapt resource value: 18
+			public const int MenuItem_actionProviderClass = 18;
+			
+			// aapt resource value: 17
+			public const int MenuItem_actionViewClass = 17;
+			
+			// aapt resource value: 13
+			public const int MenuItem_alphabeticModifiers = 13;
 			
 			// aapt resource value: 9
 			public const int MenuItem_android_alphabeticShortcut = 9;
@@ -7493,25 +7609,24 @@
 			// aapt resource value: 4
 			public const int MenuItem_android_visible = 4;
 			
-			// aapt resource value: 17
-			public const int MenuItem_contentDescription = 17;
-			
-			// aapt resource value: 18
-			public const int MenuItem_iconTint = 18;
-			
 			// aapt resource value: 19
-			public const int MenuItem_iconTintMode = 19;
-			
-			// aapt resource value: 20
-			public const int MenuItem_numericModifiers = 20;
+			public const int MenuItem_contentDescription = 19;
 			
 			// aapt resource value: 21
-			public const int MenuItem_showAsAction = 21;
+			public const int MenuItem_iconTint = 21;
 			
 			// aapt resource value: 22
-			public const int MenuItem_tooltipText = 22;
+			public const int MenuItem_iconTintMode = 22;
 			
-			// aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
+			// aapt resource value: 14
+			public const int MenuItem_numericModifiers = 14;
+			
+			// aapt resource value: 15
+			public const int MenuItem_showAsAction = 15;
+			
+			// aapt resource value: 20
+			public const int MenuItem_tooltipText = 20;
+			
 			public static int[] MenuView = new int[] {
 					16842926,
 					16843052,
@@ -7520,8 +7635,8 @@
 					16843055,
 					16843056,
 					16843057,
-					2130968830,
-					2130968934};
+					2130772171,
+					2130772172};
 			
 			// aapt resource value: 4
 			public const int MenuView_android_headerBackground = 4;
@@ -7550,18 +7665,17 @@
 			// aapt resource value: 8
 			public const int MenuView_subMenuArrow = 8;
 			
-			// aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F040093,0x7F0400B3,0x7F0400C4,0x7F0400C5,0x7F0400C7,0x7F0400C8,0x7F0400E8 }
 			public static int[] NavigationView = new int[] {
 					16842964,
 					16842973,
 					16843039,
-					2130968723,
-					2130968755,
-					2130968772,
-					2130968773,
-					2130968775,
-					2130968776,
-					2130968808};
+					2130772005,
+					2130772266,
+					2130772267,
+					2130772268,
+					2130772269,
+					2130772270,
+					2130772271};
 			
 			// aapt resource value: 0
 			public const int NavigationView_android_background = 0;
@@ -7575,63 +7689,28 @@
 			// aapt resource value: 3
 			public const int NavigationView_elevation = 3;
 			
-			// aapt resource value: 4
-			public const int NavigationView_headerLayout = 4;
-			
-			// aapt resource value: 5
-			public const int NavigationView_itemBackground = 5;
-			
-			// aapt resource value: 6
-			public const int NavigationView_itemIconTint = 6;
+			// aapt resource value: 9
+			public const int NavigationView_headerLayout = 9;
 			
 			// aapt resource value: 7
-			public const int NavigationView_itemTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int NavigationView_itemTextColor = 8;
-			
-			// aapt resource value: 9
-			public const int NavigationView_menu = 9;
-			
-			// aapt resource value: { 0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6,0x7F0401B7 }
-			public static int[] pickerview = new int[] {
-					2130969010,
-					2130969011,
-					2130969012,
-					2130969013,
-					2130969014,
-					2130969015};
-			
-			// aapt resource value: 0
-			public const int pickerview_wheelview_dividerColor = 0;
-			
-			// aapt resource value: 1
-			public const int pickerview_wheelview_gravity = 1;
-			
-			// aapt resource value: 2
-			public const int pickerview_wheelview_lineSpacingMultiplier = 2;
-			
-			// aapt resource value: 3
-			public const int pickerview_wheelview_textColorCenter = 3;
-			
-			// aapt resource value: 4
-			public const int pickerview_wheelview_textColorOut = 4;
+			public const int NavigationView_itemBackground = 7;
 			
 			// aapt resource value: 5
-			public const int pickerview_wheelview_textSize = 5;
+			public const int NavigationView_itemIconTint = 5;
 			
-			// aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
+			// aapt resource value: 8
+			public const int NavigationView_itemTextAppearance = 8;
+			
+			// aapt resource value: 6
+			public const int NavigationView_itemTextColor = 6;
+			
+			// aapt resource value: 4
+			public const int NavigationView_menu = 4;
+			
 			public static int[] PopupWindow = new int[] {
 					16843126,
 					16843465,
-					2130968814};
-			
-			// aapt resource value: { 0x7F040161 }
-			public static int[] PopupWindowBackgroundState = new int[] {
-					2130968929};
-			
-			// aapt resource value: 0
-			public const int PopupWindowBackgroundState_state_above_anchor = 0;
+					2130772173};
 			
 			// aapt resource value: 1
 			public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -7642,10 +7721,15 @@
 			// aapt resource value: 2
 			public const int PopupWindow_overlapAnchor = 2;
 			
-			// aapt resource value: { 0x7F0400EF,0x7F0400F2 }
+			public static int[] PopupWindowBackgroundState = new int[] {
+					2130772174};
+			
+			// aapt resource value: 0
+			public const int PopupWindowBackgroundState_state_above_anchor = 0;
+			
 			public static int[] RecycleListView = new int[] {
-					2130968815,
-					2130968818};
+					2130772175,
+					2130772176};
 			
 			// aapt resource value: 0
 			public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -7653,19 +7737,18 @@
 			// aapt resource value: 1
 			public const int RecycleListView_paddingTopNoTitle = 1;
 			
-			// aapt resource value: { 0x10100C4,0x10100F1,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0400CB,0x7F040108,0x7F040119,0x7F040160 }
 			public static int[] RecyclerView = new int[] {
 					16842948,
 					16842993,
-					2130968736,
-					2130968737,
-					2130968738,
-					2130968739,
-					2130968740,
-					2130968779,
-					2130968840,
-					2130968857,
-					2130968928};
+					2130771968,
+					2130771969,
+					2130771970,
+					2130771971,
+					2130771972,
+					2130771973,
+					2130771974,
+					2130771975,
+					2130771976};
 			
 			// aapt resource value: 1
 			public const int RecyclerView_android_descendantFocusability = 1;
@@ -7673,66 +7756,63 @@
 			// aapt resource value: 0
 			public const int RecyclerView_android_orientation = 0;
 			
-			// aapt resource value: 2
-			public const int RecyclerView_fastScrollEnabled = 2;
-			
-			// aapt resource value: 3
-			public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
-			
-			// aapt resource value: 4
-			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
-			
-			// aapt resource value: 5
-			public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
-			
 			// aapt resource value: 6
-			public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
-			
-			// aapt resource value: 7
-			public const int RecyclerView_layoutManager = 7;
-			
-			// aapt resource value: 8
-			public const int RecyclerView_reverseLayout = 8;
+			public const int RecyclerView_fastScrollEnabled = 6;
 			
 			// aapt resource value: 9
-			public const int RecyclerView_spanCount = 9;
+			public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
 			
 			// aapt resource value: 10
-			public const int RecyclerView_stackFromEnd = 10;
+			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
 			
-			// aapt resource value: { 0x7F0400C2 }
+			// aapt resource value: 7
+			public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
+			
+			// aapt resource value: 8
+			public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
+			
+			// aapt resource value: 2
+			public const int RecyclerView_layoutManager = 2;
+			
+			// aapt resource value: 4
+			public const int RecyclerView_reverseLayout = 4;
+			
+			// aapt resource value: 3
+			public const int RecyclerView_spanCount = 3;
+			
+			// aapt resource value: 5
+			public const int RecyclerView_stackFromEnd = 5;
+			
 			public static int[] ScrimInsetsFrameLayout = new int[] {
-					2130968770};
+					2130772272};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
-			// aapt resource value: { 0x7F04004A }
 			public static int[] ScrollingViewBehavior_Layout = new int[] {
-					2130968650};
+					2130772273};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
 			
-			// aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F04005F,0x7F040070,0x7F040084,0x7F0400B1,0x7F0400BE,0x7F0400CA,0x7F040102,0x7F040103,0x7F04010C,0x7F04010D,0x7F040167,0x7F04016C,0x7F0401AC }
 			public static int[] SearchView = new int[] {
 					16842970,
 					16843039,
 					16843296,
 					16843364,
-					2130968671,
-					2130968688,
-					2130968708,
-					2130968753,
-					2130968766,
-					2130968778,
-					2130968834,
-					2130968835,
-					2130968844,
-					2130968845,
-					2130968935,
-					2130968940,
-					2130969004};
+					2130772177,
+					2130772178,
+					2130772179,
+					2130772180,
+					2130772181,
+					2130772182,
+					2130772183,
+					2130772184,
+					2130772185,
+					2130772186,
+					2130772187,
+					2130772188,
+					2130772189};
 			
 			// aapt resource value: 0
 			public const int SearchView_android_focusable = 0;
@@ -7746,84 +7826,83 @@
 			// aapt resource value: 1
 			public const int SearchView_android_maxWidth = 1;
 			
-			// aapt resource value: 4
-			public const int SearchView_closeIcon = 4;
-			
-			// aapt resource value: 5
-			public const int SearchView_commitIcon = 5;
-			
-			// aapt resource value: 6
-			public const int SearchView_defaultQueryHint = 6;
-			
-			// aapt resource value: 7
-			public const int SearchView_goIcon = 7;
-			
 			// aapt resource value: 8
-			public const int SearchView_iconifiedByDefault = 8;
-			
-			// aapt resource value: 9
-			public const int SearchView_layout = 9;
-			
-			// aapt resource value: 10
-			public const int SearchView_queryBackground = 10;
-			
-			// aapt resource value: 11
-			public const int SearchView_queryHint = 11;
-			
-			// aapt resource value: 12
-			public const int SearchView_searchHintIcon = 12;
+			public const int SearchView_closeIcon = 8;
 			
 			// aapt resource value: 13
-			public const int SearchView_searchIcon = 13;
+			public const int SearchView_commitIcon = 13;
 			
-			// aapt resource value: 14
-			public const int SearchView_submitBackground = 14;
+			// aapt resource value: 7
+			public const int SearchView_defaultQueryHint = 7;
+			
+			// aapt resource value: 9
+			public const int SearchView_goIcon = 9;
+			
+			// aapt resource value: 5
+			public const int SearchView_iconifiedByDefault = 5;
+			
+			// aapt resource value: 4
+			public const int SearchView_layout = 4;
 			
 			// aapt resource value: 15
-			public const int SearchView_suggestionRowLayout = 15;
+			public const int SearchView_queryBackground = 15;
+			
+			// aapt resource value: 6
+			public const int SearchView_queryHint = 6;
+			
+			// aapt resource value: 11
+			public const int SearchView_searchHintIcon = 11;
+			
+			// aapt resource value: 10
+			public const int SearchView_searchIcon = 10;
 			
 			// aapt resource value: 16
-			public const int SearchView_voiceIcon = 16;
+			public const int SearchView_submitBackground = 16;
 			
-			// aapt resource value: { 0x10100EA,0x10100EB,0x7F04011F,0x7F040122,0x7F040123,0x7F040124,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F040141,0x7F040142,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F040151,0x7F040152 }
+			// aapt resource value: 14
+			public const int SearchView_suggestionRowLayout = 14;
+			
+			// aapt resource value: 12
+			public const int SearchView_voiceIcon = 12;
+			
 			public static int[] SmartRefreshLayout = new int[] {
 					16842986,
 					16842987,
-					2130968863,
-					2130968866,
-					2130968867,
-					2130968868,
-					2130968875,
-					2130968876,
-					2130968877,
-					2130968878,
-					2130968879,
-					2130968880,
-					2130968881,
-					2130968884,
-					2130968885,
-					2130968886,
-					2130968887,
-					2130968888,
-					2130968889,
-					2130968891,
-					2130968892,
-					2130968893,
-					2130968894,
-					2130968897,
-					2130968898,
-					2130968901,
-					2130968902,
-					2130968903,
-					2130968904,
-					2130968905,
-					2130968906,
-					2130968907,
-					2130968908,
-					2130968909,
-					2130968910,
-					2130968913,
-					2130968914};
+					2130772316,
+					2130772326,
+					2130772342,
+					2130772343,
+					2130772344,
+					2130772345,
+					2130772346,
+					2130772347,
+					2130772348,
+					2130772349,
+					2130772350,
+					2130772351,
+					2130772352,
+					2130772353,
+					2130772354,
+					2130772355,
+					2130772356,
+					2130772357,
+					2130772358,
+					2130772359,
+					2130772360,
+					2130772361,
+					2130772362,
+					2130772363,
+					2130772364,
+					2130772365,
+					2130772366,
+					2130772367,
+					2130772368,
+					2130772369,
+					2130772370,
+					2130772371,
+					2130772372,
+					2130772373,
+					2130772374};
 			
 			// aapt resource value: 0
 			public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -7831,127 +7910,125 @@
 			// aapt resource value: 1
 			public const int SmartRefreshLayout_android_clipToPadding = 1;
 			
-			// aapt resource value: { 0x7F0400D6,0x7F0400D7 }
-			public static int[] SmartRefreshLayout_Layout = new int[] {
-					2130968790,
-					2130968791};
-			
-			// aapt resource value: 0
-			public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
-			
-			// aapt resource value: 1
-			public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
-			
 			// aapt resource value: 2
 			public const int SmartRefreshLayout_srlAccentColor = 2;
 			
-			// aapt resource value: 3
-			public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
-			
-			// aapt resource value: 4
-			public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
-			
-			// aapt resource value: 5
-			public const int SmartRefreshLayout_srlDragRate = 5;
-			
-			// aapt resource value: 6
-			public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
-			
-			// aapt resource value: 7
-			public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
-			
-			// aapt resource value: 8
-			public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
-			
-			// aapt resource value: 9
-			public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
-			
-			// aapt resource value: 10
-			public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
-			
-			// aapt resource value: 11
-			public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
-			
-			// aapt resource value: 12
-			public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
-			
-			// aapt resource value: 13
-			public const int SmartRefreshLayout_srlEnableLoadMore = 13;
-			
-			// aapt resource value: 14
-			public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
-			
-			// aapt resource value: 15
-			public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
-			
-			// aapt resource value: 16
-			public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
-			
-			// aapt resource value: 17
-			public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
-			
-			// aapt resource value: 18
-			public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
-			
-			// aapt resource value: 19
-			public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
-			
-			// aapt resource value: 20
-			public const int SmartRefreshLayout_srlEnableRefresh = 20;
-			
-			// aapt resource value: 21
-			public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
-			
-			// aapt resource value: 22
-			public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
-			
-			// aapt resource value: 23
-			public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
-			
-			// aapt resource value: 24
-			public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
-			
-			// aapt resource value: 25
-			public const int SmartRefreshLayout_srlFooterHeight = 25;
-			
-			// aapt resource value: 26
-			public const int SmartRefreshLayout_srlFooterInsetStart = 26;
-			
-			// aapt resource value: 27
-			public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
-			
-			// aapt resource value: 28
-			public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
-			
-			// aapt resource value: 29
-			public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
-			
-			// aapt resource value: 30
-			public const int SmartRefreshLayout_srlHeaderHeight = 30;
-			
-			// aapt resource value: 31
-			public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
-			
-			// aapt resource value: 32
-			public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+			// aapt resource value: 34
+			public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
 			
 			// aapt resource value: 33
-			public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+			public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
 			
-			// aapt resource value: 34
-			public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+			// aapt resource value: 9
+			public const int SmartRefreshLayout_srlDragRate = 9;
 			
-			// aapt resource value: 35
-			public const int SmartRefreshLayout_srlPrimaryColor = 35;
+			// aapt resource value: 21
+			public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
+			
+			// aapt resource value: 31
+			public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
+			
+			// aapt resource value: 30
+			public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
+			
+			// aapt resource value: 28
+			public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
+			
+			// aapt resource value: 29
+			public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
+			
+			// aapt resource value: 17
+			public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
+			
+			// aapt resource value: 16
+			public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
+			
+			// aapt resource value: 15
+			public const int SmartRefreshLayout_srlEnableLoadMore = 15;
+			
+			// aapt resource value: 27
+			public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
+			
+			// aapt resource value: 24
+			public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
+			
+			// aapt resource value: 22
+			public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
+			
+			// aapt resource value: 32
+			public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
+			
+			// aapt resource value: 20
+			public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
+			
+			// aapt resource value: 23
+			public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
+			
+			// aapt resource value: 14
+			public const int SmartRefreshLayout_srlEnableRefresh = 14;
+			
+			// aapt resource value: 25
+			public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
+			
+			// aapt resource value: 26
+			public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
 			
 			// aapt resource value: 36
-			public const int SmartRefreshLayout_srlReboundDuration = 36;
+			public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
 			
-			// aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
+			// aapt resource value: 35
+			public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
+			
+			// aapt resource value: 6
+			public const int SmartRefreshLayout_srlFooterHeight = 6;
+			
+			// aapt resource value: 8
+			public const int SmartRefreshLayout_srlFooterInsetStart = 8;
+			
+			// aapt resource value: 11
+			public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
+			
+			// aapt resource value: 19
+			public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
+			
+			// aapt resource value: 13
+			public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
+			
+			// aapt resource value: 5
+			public const int SmartRefreshLayout_srlHeaderHeight = 5;
+			
+			// aapt resource value: 7
+			public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
+			
+			// aapt resource value: 10
+			public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
+			
+			// aapt resource value: 18
+			public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
+			
+			// aapt resource value: 12
+			public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
+			
+			// aapt resource value: 3
+			public const int SmartRefreshLayout_srlPrimaryColor = 3;
+			
+			// aapt resource value: 4
+			public const int SmartRefreshLayout_srlReboundDuration = 4;
+			
+			public static int[] SmartRefreshLayout_Layout = new int[] {
+					2130772315,
+					2130772375};
+			
+			// aapt resource value: 1
+			public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+			
+			// aapt resource value: 0
+			public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+			
 			public static int[] SnackbarLayout = new int[] {
 					16843039,
-					2130968723,
-					2130968805};
+					2130772005,
+					2130772274};
 			
 			// aapt resource value: 0
 			public const int SnackbarLayout_android_maxWidth = 0;
@@ -7962,13 +8039,12 @@
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			// aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0400FC }
 			public static int[] Spinner = new int[] {
 					16842930,
 					16843126,
 					16843131,
 					16843362,
-					2130968828};
+					2130772006};
 			
 			// aapt resource value: 3
 			public const int Spinner_android_dropDownWidth = 3;
@@ -7985,22 +8061,21 @@
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			// aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F040116,0x7F04011D,0x7F04016D,0x7F04016E,0x7F040170,0x7F04018F,0x7F040190,0x7F040191,0x7F0401A8,0x7F0401A9,0x7F0401AA }
 			public static int[] SwitchCompat = new int[] {
 					16843044,
 					16843045,
 					16843074,
-					2130968854,
-					2130968861,
-					2130968941,
-					2130968942,
-					2130968944,
-					2130968975,
-					2130968976,
-					2130968977,
-					2130969000,
-					2130969001,
-					2130969002};
+					2130772190,
+					2130772191,
+					2130772192,
+					2130772193,
+					2130772194,
+					2130772195,
+					2130772196,
+					2130772197,
+					2130772198,
+					2130772199,
+					2130772200};
 			
 			// aapt resource value: 1
 			public const int SwitchCompat_android_textOff = 1;
@@ -8011,40 +8086,39 @@
 			// aapt resource value: 2
 			public const int SwitchCompat_android_thumb = 2;
 			
-			// aapt resource value: 3
-			public const int SwitchCompat_showText = 3;
+			// aapt resource value: 13
+			public const int SwitchCompat_showText = 13;
 			
-			// aapt resource value: 4
-			public const int SwitchCompat_splitTrack = 4;
+			// aapt resource value: 12
+			public const int SwitchCompat_splitTrack = 12;
 			
-			// aapt resource value: 5
-			public const int SwitchCompat_switchMinWidth = 5;
+			// aapt resource value: 10
+			public const int SwitchCompat_switchMinWidth = 10;
 			
-			// aapt resource value: 6
-			public const int SwitchCompat_switchPadding = 6;
+			// aapt resource value: 11
+			public const int SwitchCompat_switchPadding = 11;
 			
-			// aapt resource value: 7
-			public const int SwitchCompat_switchTextAppearance = 7;
+			// aapt resource value: 9
+			public const int SwitchCompat_switchTextAppearance = 9;
 			
 			// aapt resource value: 8
 			public const int SwitchCompat_thumbTextPadding = 8;
 			
-			// aapt resource value: 9
-			public const int SwitchCompat_thumbTint = 9;
+			// aapt resource value: 3
+			public const int SwitchCompat_thumbTint = 3;
 			
-			// aapt resource value: 10
-			public const int SwitchCompat_thumbTintMode = 10;
+			// aapt resource value: 4
+			public const int SwitchCompat_thumbTintMode = 4;
 			
-			// aapt resource value: 11
-			public const int SwitchCompat_track = 11;
+			// aapt resource value: 5
+			public const int SwitchCompat_track = 5;
 			
-			// aapt resource value: 12
-			public const int SwitchCompat_trackTint = 12;
+			// aapt resource value: 6
+			public const int SwitchCompat_trackTint = 6;
 			
-			// aapt resource value: 13
-			public const int SwitchCompat_trackTintMode = 13;
+			// aapt resource value: 7
+			public const int SwitchCompat_trackTintMode = 7;
 			
-			// aapt resource value: { 0x1010002,0x10100F2,0x101014F }
 			public static int[] TabItem = new int[] {
 					16842754,
 					16842994,
@@ -8059,57 +8133,56 @@
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			// aapt resource value: { 0x7F040171,0x7F040172,0x7F040173,0x7F040174,0x7F040175,0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B,0x7F04017C,0x7F04017D,0x7F04017E,0x7F04017F,0x7F040180 }
 			public static int[] TabLayout = new int[] {
-					2130968945,
-					2130968946,
-					2130968947,
-					2130968948,
-					2130968949,
-					2130968950,
-					2130968951,
-					2130968952,
-					2130968953,
-					2130968954,
-					2130968955,
-					2130968956,
-					2130968957,
-					2130968958,
-					2130968959,
-					2130968960};
-			
-			// aapt resource value: 0
-			public const int TabLayout_tabBackground = 0;
-			
-			// aapt resource value: 1
-			public const int TabLayout_tabContentStart = 1;
-			
-			// aapt resource value: 2
-			public const int TabLayout_tabGravity = 2;
+					2130772275,
+					2130772276,
+					2130772277,
+					2130772278,
+					2130772279,
+					2130772280,
+					2130772281,
+					2130772282,
+					2130772283,
+					2130772284,
+					2130772285,
+					2130772286,
+					2130772287,
+					2130772288,
+					2130772289,
+					2130772290};
 			
 			// aapt resource value: 3
-			public const int TabLayout_tabIndicatorColor = 3;
+			public const int TabLayout_tabBackground = 3;
 			
-			// aapt resource value: 4
-			public const int TabLayout_tabIndicatorHeight = 4;
+			// aapt resource value: 2
+			public const int TabLayout_tabContentStart = 2;
 			
 			// aapt resource value: 5
-			public const int TabLayout_tabMaxWidth = 5;
+			public const int TabLayout_tabGravity = 5;
+			
+			// aapt resource value: 0
+			public const int TabLayout_tabIndicatorColor = 0;
+			
+			// aapt resource value: 1
+			public const int TabLayout_tabIndicatorHeight = 1;
+			
+			// aapt resource value: 7
+			public const int TabLayout_tabMaxWidth = 7;
 			
 			// aapt resource value: 6
 			public const int TabLayout_tabMinWidth = 6;
 			
-			// aapt resource value: 7
-			public const int TabLayout_tabMode = 7;
+			// aapt resource value: 4
+			public const int TabLayout_tabMode = 4;
 			
-			// aapt resource value: 8
-			public const int TabLayout_tabPadding = 8;
+			// aapt resource value: 15
+			public const int TabLayout_tabPadding = 15;
 			
-			// aapt resource value: 9
-			public const int TabLayout_tabPaddingBottom = 9;
+			// aapt resource value: 14
+			public const int TabLayout_tabPaddingBottom = 14;
 			
-			// aapt resource value: 10
-			public const int TabLayout_tabPaddingEnd = 10;
+			// aapt resource value: 13
+			public const int TabLayout_tabPaddingEnd = 13;
 			
 			// aapt resource value: 11
 			public const int TabLayout_tabPaddingStart = 11;
@@ -8117,16 +8190,15 @@
 			// aapt resource value: 12
 			public const int TabLayout_tabPaddingTop = 12;
 			
-			// aapt resource value: 13
-			public const int TabLayout_tabSelectedTextColor = 13;
+			// aapt resource value: 10
+			public const int TabLayout_tabSelectedTextColor = 10;
 			
-			// aapt resource value: 14
-			public const int TabLayout_tabTextAppearance = 14;
+			// aapt resource value: 8
+			public const int TabLayout_tabTextAppearance = 8;
 			
-			// aapt resource value: 15
-			public const int TabLayout_tabTextColor = 15;
+			// aapt resource value: 9
+			public const int TabLayout_tabTextColor = 9;
 			
-			// aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
 			public static int[] TextAppearance = new int[] {
 					16842901,
 					16842902,
@@ -8139,8 +8211,8 @@
 					16843107,
 					16843108,
 					16843692,
-					2130968742,
-					2130968961};
+					2130772022,
+					2130772028};
 			
 			// aapt resource value: 10
 			public const int TextAppearance_android_fontFamily = 10;
@@ -8175,30 +8247,29 @@
 			// aapt resource value: 1
 			public const int TextAppearance_android_typeface = 1;
 			
-			// aapt resource value: 11
-			public const int TextAppearance_fontFamily = 11;
-			
 			// aapt resource value: 12
-			public const int TextAppearance_textAllCaps = 12;
+			public const int TextAppearance_fontFamily = 12;
 			
-			// aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
+			// aapt resource value: 11
+			public const int TextAppearance_textAllCaps = 11;
+			
 			public static int[] TextInputLayout = new int[] {
 					16842906,
 					16843088,
-					2130968698,
-					2130968699,
-					2130968700,
-					2130968701,
-					2130968724,
-					2130968725,
-					2130968758,
-					2130968759,
-					2130968760,
-					2130968822,
-					2130968823,
-					2130968824,
-					2130968825,
-					2130968826};
+					2130772291,
+					2130772292,
+					2130772293,
+					2130772294,
+					2130772295,
+					2130772296,
+					2130772297,
+					2130772298,
+					2130772299,
+					2130772300,
+					2130772301,
+					2130772302,
+					2130772303,
+					2130772304};
 			
 			// aapt resource value: 1
 			public const int TextInputLayout_android_hint = 1;
@@ -8206,41 +8277,41 @@
 			// aapt resource value: 0
 			public const int TextInputLayout_android_textColorHint = 0;
 			
-			// aapt resource value: 2
-			public const int TextInputLayout_counterEnabled = 2;
-			
-			// aapt resource value: 3
-			public const int TextInputLayout_counterMaxLength = 3;
-			
-			// aapt resource value: 4
-			public const int TextInputLayout_counterOverflowTextAppearance = 4;
-			
-			// aapt resource value: 5
-			public const int TextInputLayout_counterTextAppearance = 5;
-			
 			// aapt resource value: 6
-			public const int TextInputLayout_errorEnabled = 6;
+			public const int TextInputLayout_counterEnabled = 6;
 			
 			// aapt resource value: 7
-			public const int TextInputLayout_errorTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int TextInputLayout_hintAnimationEnabled = 8;
+			public const int TextInputLayout_counterMaxLength = 7;
 			
 			// aapt resource value: 9
-			public const int TextInputLayout_hintEnabled = 9;
+			public const int TextInputLayout_counterOverflowTextAppearance = 9;
+			
+			// aapt resource value: 8
+			public const int TextInputLayout_counterTextAppearance = 8;
+			
+			// aapt resource value: 4
+			public const int TextInputLayout_errorEnabled = 4;
+			
+			// aapt resource value: 5
+			public const int TextInputLayout_errorTextAppearance = 5;
 			
 			// aapt resource value: 10
-			public const int TextInputLayout_hintTextAppearance = 10;
+			public const int TextInputLayout_hintAnimationEnabled = 10;
 			
-			// aapt resource value: 11
-			public const int TextInputLayout_passwordToggleContentDescription = 11;
+			// aapt resource value: 3
+			public const int TextInputLayout_hintEnabled = 3;
+			
+			// aapt resource value: 2
+			public const int TextInputLayout_hintTextAppearance = 2;
+			
+			// aapt resource value: 13
+			public const int TextInputLayout_passwordToggleContentDescription = 13;
 			
 			// aapt resource value: 12
 			public const int TextInputLayout_passwordToggleDrawable = 12;
 			
-			// aapt resource value: 13
-			public const int TextInputLayout_passwordToggleEnabled = 13;
+			// aapt resource value: 11
+			public const int TextInputLayout_passwordToggleEnabled = 11;
 			
 			// aapt resource value: 14
 			public const int TextInputLayout_passwordToggleTint = 14;
@@ -8248,37 +8319,36 @@
 			// aapt resource value: 15
 			public const int TextInputLayout_passwordToggleTintMode = 15;
 			
-			// aapt resource value: { 0x10100AF,0x1010140,0x7F040057,0x7F040061,0x7F040062,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F0400E3,0x7F0400E4,0x7F0400E6,0x7F0400EA,0x7F0400EB,0x7F0400FC,0x7F040168,0x7F040169,0x7F04016A,0x7F040197,0x7F040199,0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0 }
 			public static int[] Toolbar = new int[] {
 					16842927,
 					16843072,
-					2130968663,
-					2130968673,
-					2130968674,
-					2130968690,
-					2130968691,
-					2130968692,
-					2130968693,
-					2130968694,
-					2130968695,
-					2130968803,
-					2130968804,
-					2130968806,
-					2130968810,
-					2130968811,
-					2130968828,
-					2130968936,
-					2130968937,
-					2130968938,
-					2130968983,
-					2130968985,
-					2130968986,
-					2130968987,
-					2130968988,
-					2130968989,
-					2130968990,
-					2130968991,
-					2130968992};
+					2130771980,
+					2130771983,
+					2130771987,
+					2130771999,
+					2130772000,
+					2130772001,
+					2130772002,
+					2130772003,
+					2130772004,
+					2130772006,
+					2130772201,
+					2130772202,
+					2130772203,
+					2130772204,
+					2130772205,
+					2130772206,
+					2130772207,
+					2130772208,
+					2130772209,
+					2130772210,
+					2130772211,
+					2130772212,
+					2130772213,
+					2130772214,
+					2130772215,
+					2130772216,
+					2130772217};
 			
 			// aapt resource value: 0
 			public const int Toolbar_android_gravity = 0;
@@ -8286,20 +8356,20 @@
 			// aapt resource value: 1
 			public const int Toolbar_android_minHeight = 1;
 			
-			// aapt resource value: 2
-			public const int Toolbar_buttonGravity = 2;
+			// aapt resource value: 21
+			public const int Toolbar_buttonGravity = 21;
 			
-			// aapt resource value: 3
-			public const int Toolbar_collapseContentDescription = 3;
+			// aapt resource value: 23
+			public const int Toolbar_collapseContentDescription = 23;
 			
-			// aapt resource value: 4
-			public const int Toolbar_collapseIcon = 4;
-			
-			// aapt resource value: 5
-			public const int Toolbar_contentInsetEnd = 5;
+			// aapt resource value: 22
+			public const int Toolbar_collapseIcon = 22;
 			
 			// aapt resource value: 6
-			public const int Toolbar_contentInsetEndWithActions = 6;
+			public const int Toolbar_contentInsetEnd = 6;
+			
+			// aapt resource value: 10
+			public const int Toolbar_contentInsetEndWithActions = 10;
 			
 			// aapt resource value: 7
 			public const int Toolbar_contentInsetLeft = 7;
@@ -8307,106 +8377,118 @@
 			// aapt resource value: 8
 			public const int Toolbar_contentInsetRight = 8;
 			
+			// aapt resource value: 5
+			public const int Toolbar_contentInsetStart = 5;
+			
 			// aapt resource value: 9
-			public const int Toolbar_contentInsetStart = 9;
-			
-			// aapt resource value: 10
-			public const int Toolbar_contentInsetStartWithNavigation = 10;
-			
-			// aapt resource value: 11
-			public const int Toolbar_logo = 11;
-			
-			// aapt resource value: 12
-			public const int Toolbar_logoDescription = 12;
-			
-			// aapt resource value: 13
-			public const int Toolbar_maxButtonHeight = 13;
-			
-			// aapt resource value: 14
-			public const int Toolbar_navigationContentDescription = 14;
-			
-			// aapt resource value: 15
-			public const int Toolbar_navigationIcon = 15;
-			
-			// aapt resource value: 16
-			public const int Toolbar_popupTheme = 16;
-			
-			// aapt resource value: 17
-			public const int Toolbar_subtitle = 17;
-			
-			// aapt resource value: 18
-			public const int Toolbar_subtitleTextAppearance = 18;
-			
-			// aapt resource value: 19
-			public const int Toolbar_subtitleTextColor = 19;
-			
-			// aapt resource value: 20
-			public const int Toolbar_title = 20;
-			
-			// aapt resource value: 21
-			public const int Toolbar_titleMargin = 21;
-			
-			// aapt resource value: 22
-			public const int Toolbar_titleMarginBottom = 22;
-			
-			// aapt resource value: 23
-			public const int Toolbar_titleMarginEnd = 23;
-			
-			// aapt resource value: 26
-			public const int Toolbar_titleMargins = 26;
-			
-			// aapt resource value: 24
-			public const int Toolbar_titleMarginStart = 24;
-			
-			// aapt resource value: 25
-			public const int Toolbar_titleMarginTop = 25;
-			
-			// aapt resource value: 27
-			public const int Toolbar_titleTextAppearance = 27;
-			
-			// aapt resource value: 28
-			public const int Toolbar_titleTextColor = 28;
-			
-			// aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
-			public static int[] TwoLevelHeader = new int[] {
-					2130968890,
-					2130968895,
-					2130968899,
-					2130968900,
-					2130968911,
-					2130968915};
-			
-			// aapt resource value: 0
-			public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
-			
-			// aapt resource value: 1
-			public const int TwoLevelHeader_srlEnableTwoLevel = 1;
-			
-			// aapt resource value: 2
-			public const int TwoLevelHeader_srlFloorDuration = 2;
-			
-			// aapt resource value: 3
-			public const int TwoLevelHeader_srlFloorRage = 3;
+			public const int Toolbar_contentInsetStartWithNavigation = 9;
 			
 			// aapt resource value: 4
-			public const int TwoLevelHeader_srlMaxRage = 4;
+			public const int Toolbar_logo = 4;
+			
+			// aapt resource value: 26
+			public const int Toolbar_logoDescription = 26;
+			
+			// aapt resource value: 20
+			public const int Toolbar_maxButtonHeight = 20;
+			
+			// aapt resource value: 25
+			public const int Toolbar_navigationContentDescription = 25;
+			
+			// aapt resource value: 24
+			public const int Toolbar_navigationIcon = 24;
+			
+			// aapt resource value: 11
+			public const int Toolbar_popupTheme = 11;
+			
+			// aapt resource value: 3
+			public const int Toolbar_subtitle = 3;
+			
+			// aapt resource value: 13
+			public const int Toolbar_subtitleTextAppearance = 13;
+			
+			// aapt resource value: 28
+			public const int Toolbar_subtitleTextColor = 28;
+			
+			// aapt resource value: 2
+			public const int Toolbar_title = 2;
+			
+			// aapt resource value: 14
+			public const int Toolbar_titleMargin = 14;
+			
+			// aapt resource value: 18
+			public const int Toolbar_titleMarginBottom = 18;
+			
+			// aapt resource value: 16
+			public const int Toolbar_titleMarginEnd = 16;
+			
+			// aapt resource value: 15
+			public const int Toolbar_titleMarginStart = 15;
+			
+			// aapt resource value: 17
+			public const int Toolbar_titleMarginTop = 17;
+			
+			// aapt resource value: 19
+			public const int Toolbar_titleMargins = 19;
+			
+			// aapt resource value: 12
+			public const int Toolbar_titleTextAppearance = 12;
+			
+			// aapt resource value: 27
+			public const int Toolbar_titleTextColor = 27;
+			
+			public static int[] TwoLevelHeader = new int[] {
+					2130772376,
+					2130772377,
+					2130772378,
+					2130772379,
+					2130772380,
+					2130772381};
 			
 			// aapt resource value: 5
-			public const int TwoLevelHeader_srlRefreshRage = 5;
+			public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
 			
-			// aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
+			// aapt resource value: 4
+			public const int TwoLevelHeader_srlEnableTwoLevel = 4;
+			
+			// aapt resource value: 3
+			public const int TwoLevelHeader_srlFloorDuration = 3;
+			
+			// aapt resource value: 1
+			public const int TwoLevelHeader_srlFloorRage = 1;
+			
+			// aapt resource value: 0
+			public const int TwoLevelHeader_srlMaxRage = 0;
+			
+			// aapt resource value: 2
+			public const int TwoLevelHeader_srlRefreshRage = 2;
+			
 			public static int[] View = new int[] {
 					16842752,
 					16842970,
-					2130968816,
-					2130968817,
-					2130968973};
+					2130772218,
+					2130772219,
+					2130772220};
 			
-			// aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
+			// aapt resource value: 1
+			public const int View_android_focusable = 1;
+			
+			// aapt resource value: 0
+			public const int View_android_theme = 0;
+			
+			// aapt resource value: 3
+			public const int View_paddingEnd = 3;
+			
+			// aapt resource value: 2
+			public const int View_paddingStart = 2;
+			
+			// aapt resource value: 4
+			public const int View_theme = 4;
+			
 			public static int[] ViewBackgroundHelper = new int[] {
 					16842964,
-					2130968645,
-					2130968646};
+					2130772221,
+					2130772222};
 			
 			// aapt resource value: 0
 			public const int ViewBackgroundHelper_android_background = 0;
@@ -8417,7 +8499,6 @@
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
 			
-			// aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
 			public static int[] ViewStubCompat = new int[] {
 					16842960,
 					16842994,
@@ -8432,20 +8513,31 @@
 			// aapt resource value: 1
 			public const int ViewStubCompat_android_layout = 1;
 			
-			// aapt resource value: 1
-			public const int View_android_focusable = 1;
-			
-			// aapt resource value: 0
-			public const int View_android_theme = 0;
-			
-			// aapt resource value: 2
-			public const int View_paddingEnd = 2;
-			
-			// aapt resource value: 3
-			public const int View_paddingStart = 3;
+			public static int[] pickerview = new int[] {
+					2130772412,
+					2130772413,
+					2130772414,
+					2130772415,
+					2130772416,
+					2130772417};
 			
 			// aapt resource value: 4
-			public const int View_theme = 4;
+			public const int pickerview_wheelview_dividerColor = 4;
+			
+			// aapt resource value: 0
+			public const int pickerview_wheelview_gravity = 0;
+			
+			// aapt resource value: 5
+			public const int pickerview_wheelview_lineSpacingMultiplier = 5;
+			
+			// aapt resource value: 3
+			public const int pickerview_wheelview_textColorCenter = 3;
+			
+			// aapt resource value: 2
+			public const int pickerview_wheelview_textColorOut = 2;
+			
+			// aapt resource value: 1
+			public const int pickerview_wheelview_textSize = 1;
 			
 			static Styleable()
 			{
@@ -8453,25 +8545,6 @@
 			}
 			
 			private Styleable()
-			{
-			}
-		}
-		
-		public partial class Xml
-		{
-			
-			// aapt resource value: 0x7F100000
-			public const int file_paths = 2131755008;
-			
-			// aapt resource value: 0x7F100001
-			public const int hdl_filepaths = 2131755009;
-			
-			static Xml()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Xml()
 			{
 			}
 		}
diff --git a/ZigbeeApp/GateWay.Droid/packages.config b/ZigbeeApp/GateWay.Droid/packages.config
index 0a84d59..27f5243 100755
--- a/ZigbeeApp/GateWay.Droid/packages.config
+++ b/ZigbeeApp/GateWay.Droid/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="BouncyCastle.Crypto.dll" version="1.8.1" targetFramework="monoandroid60" />
   <package id="FastAndroidCamera" version="2.0.0" targetFramework="monoandroid80" />
+  <package id="LeakCanaryBinding" version="1.5.1.1" targetFramework="monoandroid80" />
   <package id="Microsoft.AppCenter" version="1.14.0" targetFramework="monoandroid60" />
   <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid60" />
   <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid60" />
diff --git a/ZigbeeApp/GateWay.Droid/packages/System.Management.dll.1.0.0/lib/System.Management.dll b/ZigbeeApp/GateWay.Droid/packages/System.Management.dll.1.0.0/lib/System.Management.dll
deleted file mode 100755
index 82a38a6..0000000
--- a/ZigbeeApp/GateWay.Droid/packages/System.Management.dll.1.0.0/lib/System.Management.dll
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/packages/Xamarin.Android.Support.v4.19.1.0/lib/MonoAndroid10/Xamarin.Android.Support.v4.dll b/ZigbeeApp/GateWay.Droid/packages/Xamarin.Android.Support.v4.19.1.0/lib/MonoAndroid10/Xamarin.Android.Support.v4.dll
deleted file mode 100755
index 5866ad8..0000000
--- a/ZigbeeApp/GateWay.Droid/packages/Xamarin.Android.Support.v4.19.1.0/lib/MonoAndroid10/Xamarin.Android.Support.v4.dll
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index cd650b2..5f85200 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -2040,6 +2040,9 @@
 16165=杩囨埛澶辫触
 16166=鎭枩{0}鎴愪负銆寋1}銆嶇鐞嗗憳
 16167=妫�娴嬪埌杩樻病鏈夊浠�,璇峰厛澶囦唤
+16168=鏇挎崲
+16169=鏇挎崲缃戝叧
+16170=璇烽�夋嫨琚浛鎹㈢殑缃戝叧
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 7aabdf2..e1aed24 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -34,7 +34,10 @@
             AddChidren(Phone.UserView.HomePage.Instance);
             Application.MainPage.AddChidren(Loading);
 
-            Phone.UserView.HomePage.Instance.InitPage();
+            Phone.UserView.HomePage.Instance.InitPage();
+
+            //璁剧疆椤堕儴鐘舵�佹爮鏂囧瓧涓洪粦鑹�
+            Application.SetStatusBarTextBlack(true);
         }
 
         //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
@@ -42,7 +45,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string CodeIDString = "1.1.0120101001";
+        public static string CodeIDString = "1.1.0120111601";
         /// <summary>
         /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
         /// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 4d1050a..ff806cc 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -81,10 +81,6 @@
         /// 璁惧鐨勬�诲洖璺�(keys:Mac鍦板潃  value:鍏ㄩ儴绔彛鍙�)
         /// </summary>
         private Dictionary<string, HashSet<int>> dicDeviceEpoint = new Dictionary<string, HashSet<int>>();
-        /// <summary>
-        /// 鐗╃悊璁惧灞炰簬鍝釜鎴块棿鐨勮褰�
-        /// </summary>
-        private Dictionary<string, string> dicDeviceRoomId = null;
 
         #endregion
 
@@ -188,7 +184,7 @@
             //鎴愬憳韬唤鐨勬椂鍊�,鍒犻櫎鎺夐潪娉曠殑缃戝叧鏂囦欢
             this.DeleteGatewayFileByMemberModel();
             //鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
-            this.InitRealDeviceRoomId();
+            HdlRoomLogic.Current.InitRealDeviceRoomId();
 
 #if DEBUG
             if (UserCenterResourse.HideOption.CenterHideMenu == 1)
@@ -363,7 +359,7 @@
             if (listDeleteMac.Count > 0)
             {
                 //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
-                this.DeleteRealDeviceFromRoom(listDeleteMac);
+                HdlRoomLogic.Current.DeleteRealDeviceFromRoom(listDeleteMac);
             }
 
             return statu;
@@ -792,13 +788,9 @@
             {
                 this.DeleteMemmoryDevice(device);
             }
+            //绉婚櫎鐪熷疄璁惧鐨勬埧闂寸储寮�
+            HdlRoomLogic.Current.DeleteRealDeviceFromRoom(listdevice[0]);
 
-            if (this.dicDeviceRoomId.ContainsKey(listdevice[0].DeviceAddr) == true)
-            {
-                //绉婚櫎鐪熷疄璁惧鐨勬埧闂寸储寮�
-                this.dicDeviceRoomId.Remove(listdevice[0].DeviceAddr);
-                this.SaveRealDeviceRoomId(null, null);
-            }
             return true;
         }
 
@@ -2449,176 +2441,6 @@
                 info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
                 info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorDoorWindow);
             }
-        }
-
-        #endregion
-
-        #region 鈻� 鐗╃悊璁惧鎵�灞炴埧闂確__________________
-
-        /// <summary>
-        /// 鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
-        /// </summary>
-        private void InitRealDeviceRoomId()
-        {
-            this.dicDeviceRoomId = new Dictionary<string, string>();
-            string fullName = DirNameResourse.DeviceRoomIdFile;
-            var strData = HdlFileLogic.Current.ReadFileTextContent(fullName);
-            if (strData != null)
-            {
-                this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
-        /// </summary>
-        /// <returns></returns>
-        public Dictionary<string, string> GetAllRealDeviceRoomData()
-        {
-            return this.dicDeviceRoomId;
-        }
-
-        /// <summary>
-        /// 淇濆瓨鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
-        /// </summary>
-        /// <param name="listDevice">闇�瑕佷繚瀛樼殑璁惧瀵硅薄</param>
-        /// <param name="roomId">闇�瑕佷繚瀛樼殑鍝釜璁惧鐨勬埧闂碔D</param>
-        /// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
-        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
-        {
-            if (listDevice == null || listDevice.Count == 0)
-            {
-                return;
-            }
-            //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
-            if (saveRoadDevice == true && listDevice.Count == 1)
-            {
-                if ((listDevice[0] is OTADevice) == false)
-                {
-                    //ota璁惧涓嶉渶瑕佸鐞�
-                    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)
-                    {
-                        this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
-                        save = true;
-                    }
-                }
-            }
-
-            if (save == true)
-            {
-                //淇濆瓨璁板綍
-                HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
-
-                //娣诲姞鑷姩澶囦唤
-                HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇鐪熷疄鐗╃悊璁惧鐨勬埧闂村悕瀛�
-        /// </summary>
-        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
-        /// <returns></returns>
-        public string GeteRealDeviceRoomName(CommonDevice device)
-        {
-            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
-            {
-                //鏈垎閰嶅尯鍩�
-                return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
-            }
-            var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
-            return HdlRoomLogic.Current.GetRoomName(room);
-        }
-
-        /// <summary>
-        /// 鑾峰彇鐪熷疄鐗╃悊璁惧灞炰簬鍝釜鎴块棿
-        /// </summary>
-        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
-        /// <returns></returns>
-        public Room GeteRealDeviceRoom(CommonDevice device)
-        {
-            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
-            {
-                return null;
-            }
-            return HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
-        }
-
-        /// <summary>
-        /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
-        /// </summary>
-        /// <param name="device">闅忎究涓�涓洖璺�</param>
-        public void DeleteRealDeviceFromRoom(CommonDevice device)
-        {
-            //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
-            this.DeleteRealDeviceFromRoom(new List<string>() { device.DeviceAddr });
-        }
-
-        /// <summary>
-        /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
-        /// </summary>
-        /// <param name="listMac">璁惧Mac鍦板潃</param>
-        public void DeleteRealDeviceFromRoom(List<string> listMac)
-        {
-            bool save = false;
-            foreach (var deviceMacAddr in listMac)
-            {
-                if (this.dicDeviceRoomId.ContainsKey(deviceMacAddr) == true)
-                {
-                    this.dicDeviceRoomId.Remove(deviceMacAddr);
-                    save = true;
-                }
-            }
-            if (save == false)
-            {
-                //娌℃湁鏀瑰彉,涓嶉渶瑕佷繚瀛�
-                return;
-            }
-            //淇濆瓨璁板綍
-            HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
-
-            //娣诲姞鑷姩澶囦唤
-            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
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 20b2fd3..c9819b8 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 980ca24..fd7bc2a 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
index 1229952..73afea4 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
@@ -252,6 +252,17 @@
             鍏抽棴瀹氫綅鏈嶅姟
             </summary>
         </member>
+        <member name="F:Shared.Application.IsStatusBarBlack">
+            <summary>
+            褰撳墠鏄惁璁剧疆椤堕儴鐘舵�佹爮瀛椾綋棰滆壊
+            </summary>
+        </member>
+        <member name="M:Shared.Application.SetStatusBarTextBlack(System.Boolean)">
+            <summary>
+            璁剧疆椤堕儴鐘舵�佹爮瀛椾綋棰滆壊
+            </summary>
+            <param name="isBlack">鏄惁璁剧疆榛戣壊</param>
+        </member>
         <member name="T:Shared.Button">
             <summary>
             Button 鎸夐敭
@@ -2071,6 +2082,12 @@
             Y杞村潗鏍�
             </summary>
         </member>
+        <member name="M:Shared.BaseActivity.HideVirtualButtons(Android.App.Activity)">
+            <summary>
+            HideVirtualButtons
+            </summary>
+            <param name="activity"></param>
+        </member>
         <member name="M:Shared.BaseActivity.SetImagePermission(System.Action{System.Boolean})">
             <summary>
             
@@ -3031,16 +3048,6 @@
             </summary>
             <value>鏄惁鍙互婊戝姩</value>
         </member>
-        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingLeftRight">
-            <summary>
-            杩涘害鏉′笌宸﹀彸杈规杈硅窛
-            </summary>
-        </member>
-        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingTop">
-            <summary>
-            椤堕儴padding
-            </summary>
-        </member>
         <member name="P:Shared.CurtainRollSeekBar.IsOffline">
             <summary>
             鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
@@ -3537,6 +3544,11 @@
             </summary>
             <value>X鍧愭爣</value>
         </member>
+        <member name="P:Shared.DiyImageSeekBar.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.DiyImageSeekBar.OnProgressChangedEvent">
             <summary>
             EventHandler
@@ -3854,6 +3866,11 @@
             </summary>
             <value>X鍧愭爣</value>
         </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.CurtainSeekBarOn.OnProgressChangedEvent">
             <summary>
             EventHandler
@@ -3946,6 +3963,11 @@
             璁剧疆鏄惁涓虹櫨鍙剁獥鏍峰紡
             </summary>
         </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.CurtainRollSeekBarOn.OnProgressChangedEvent">
             <summary>
             EventHandler
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index de9322f..6f8ef8f 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 74dd958..2a1c9ee 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
index 23e0121..1fa4c1c 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
@@ -277,6 +277,12 @@
             鍏抽棴瀹氫綅鏈嶅姟
             </summary>
         </member>
+        <member name="M:Shared.Application.SetStatusBarTextBlack(System.Boolean)">
+            <summary>
+            璁剧疆椤堕儴鐘舵�佹爮瀛椾綋棰滆壊
+            </summary>
+            <param name="isBlack">鏄惁璁剧疆榛戣壊</param>
+        </member>
         <member name="T:Shared.Button">
             <summary>
             Button 鎸夐敭
@@ -3241,16 +3247,6 @@
             </summary>
             <value>杩涘害鍊�</value>
         </member>
-        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingLeftRight">
-            <summary>
-            杩涘害鏉′笌宸﹀彸杈规杈硅窛
-            </summary>
-        </member>
-        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingTop">
-            <summary>
-            椤堕儴padding
-            </summary>
-        </member>
         <member name="P:Shared.CurtainRollSeekBar.IsOffline">
             <summary>
             鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
@@ -4285,6 +4281,11 @@
             </summary>
             <value>X鍧愭爣</value>
         </member>
+        <member name="P:Shared.DiyImageSeekBar.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.DiyImageSeekBar.OnProgressChangedEvent">
             <summary>
             EventHandler
@@ -4721,6 +4722,11 @@
             璁剧疆鏄惁涓虹櫨鍙剁獥鏍峰紡
             </summary>
         </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.CurtainRollSeekBarOn.OnProgressChangedEvent">
             <summary>
             EventHandler
@@ -4828,6 +4834,11 @@
             </summary>
             <value>X鍧愭爣</value>
         </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.CurtainSeekBarOn.OnProgressChangedEvent">
             <summary>
             EventHandler
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 0051a5f..a3b8f47 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -582,6 +582,7 @@
                 }
                 HdlThreadLogic.Current.RunThread(() =>
                 {
+                    int sendCount = 0;
                     while (listView.Parent != null)
                     {
                         bool hadSend = false;
@@ -597,7 +598,7 @@
                                 //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
                                 listContr[i].SendStatuComand();
                                 hadSend = true;
-                                System.Threading.Thread.Sleep(200);
+                                System.Threading.Thread.Sleep(300);
                             }
                         }
                         if (hadSend == false)
@@ -605,7 +606,13 @@
                             //濡傛灉宸茬粡鍏ㄩ儴鍥炶矾閮芥帴鏀朵簡缃戝叧鍥炲,鍒欎笉鍐嶄簩娆″彂閫�
                             break;
                         }
-                        System.Threading.Thread.Sleep(2000);
+                        sendCount++;
+                        if (sendCount == 2)
+                        {
+                            //灏卞彂2娆�
+                            break;
+                        }
+                        System.Threading.Thread.Sleep(5000);
                     }
 
                 }, ShowErrorMode.NO);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index adbd012..34909fd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -338,7 +338,8 @@
             #endregion
             string strname = "";
             //鍒拌揪鍦扮偣鐐瑰嚮浜嬩欢
-            athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
+            athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
 
                 strname = athomeView.titleBtn.Text;
                 leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -347,14 +348,15 @@
                 athomeView.selectedIconBtn.Visible = true;
             };
             //绂诲紑鍦扮偣鐐瑰嚮浜嬩欢
-            leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
+            leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
                 strname = leaveView.titleBtn.Text;
                 leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                 athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                 leaveView.selectedIconBtn.Visible = true;
                 athomeView.selectedIconBtn.Visible = false;
-            };
-           
+            };
+
             double latitude = Config.Instance.Home.Latitude;//绾害
             double longitude = Config.Instance.Home.Longitude;//缁忓害
             int r = 500;//鍗婂緞
@@ -441,15 +443,81 @@
                         LocationConditionsInfo.Remove("AtHome");
                     }
                     LocationConditionsInfo.Add("AtHome", "1");
-                }
-
-                //璋冪敤鏂规硶锛岃烦杞〉闈�
-                GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
-                {
-                    //鎴彇瀛楃涓插悗绗�6浣嶏紱
-                    //var len = name.Substring(name.Length - 6, 6);
-
-                    //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+                }
+
+#if Android
+            //鐢宠瀹氫綅鏉冮檺
+            ((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
+            {
+                if (result1 == false) { return; }
+
+                //鐢宠鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍锛屽SD鍗′笂鍐欐枃浠�
+                ((BaseActivity)Application.Activity).SetPermission((result2) =>
+                {
+                    if (result2 == false) { return; }
+                     //璇诲彇鐢佃瘽鐘舵�佹潈闄�
+                     ((BaseActivity)Application.Activity).SetPermission((result3) =>
+                     {
+                         if (result3 == false) { return; }
+
+                         //璋冪敤鏂规硶锛岃烦杞〉闈�
+                         GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+                         {
+                             //鎴彇瀛楃涓插悗绗�6浣嶏紱
+                             //var len = name.Substring(name.Length - 6, 6);
+
+                             //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+                             var latitudW = (int)Math.Truncate(mLatitude * 1000000);
+                             var longitudeH = (int)Math.Truncate(mLongitude * 1000000);
+                             Dictionary<string, string> accounts = new Dictionary<string, string>();
+                             if (accounts.ContainsKey("Account"))
+                             {
+                                 accounts.Remove("Account");
+                             }
+                             if (accounts.ContainsKey("Type"))
+                             {
+                                 accounts.Remove("Type");
+                             }
+                             if (accounts.ContainsKey("Latitude"))
+                             {
+                                 accounts.Remove("latitude");
+                             }
+                             if (accounts.ContainsKey("Longitude"))
+                             {
+                                 accounts.Remove("Longitude");
+                             }
+                             if (accounts.ContainsKey("Radius"))
+                             {
+                                 accounts.Remove("radius");
+                             }
+                             accounts.Add("Account", Config.Instance.Guid);
+                             accounts.Add("Type", "7");
+                             accounts.Add("Latitude", latitudW.ToString());
+                             accounts.Add("Longitude", longitudeH.ToString());
+                             accounts.Add("Radius", mRadius.ToString());
+
+                             LogicIfon.Addaccounts(accounts);
+                             LogicIfon.AddLocationconditions(LocationConditionsInfo);
+
+                             var logicCommunalPage = new LogicCommunalPage();
+                             UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                             UserView.HomePage.Instance.PageIndex += 1;
+                             logicCommunalPage.Show(() => { });
+                         }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+
+                     }, "android.permission.READ_PHONE_STATE");
+
+                }, "android.permission.WRITE_EXTERNAL_STORAGE");
+            });
+#endif
+#if iOS
+                //璋冪敤鏂规硶锛岃烦杞〉闈�
+                GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+                {
+                    //鎴彇瀛楃涓插悗绗�6浣嶏紱
+                    //var len = name.Substring(name.Length - 6, 6);
+
+                    //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
                     var latitudW = (int)Math.Truncate(mLatitude * 1000000);
                     var longitudeH = (int)Math.Truncate(mLongitude * 1000000);
                     Dictionary<string, string> accounts = new Dictionary<string, string>();
@@ -486,7 +554,8 @@
                     UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                     UserView.HomePage.Instance.PageIndex += 1;
                     logicCommunalPage.Show(() => { });
-                }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+                }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+#endif
             };
         }
 
diff --git a/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
index b87c37b..9a0618a 100755
--- a/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
@@ -116,6 +116,14 @@
                 };
                 var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
                 var revertObj = RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
+
+                if (UserCenter.UserCenterResourse.HideOption.WriteGpsPoint == 1)
+                {
+                    string flage = revertObj == null ? "false" : revertObj.StateCode;
+                    string txtvalue = "lon:" + lon + " lat:" + lat + " " + flage;
+                    HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, txtvalue);
+                    UserCenter.HdlLogLogic.Current.WriteLog(-1, "缁忕含搴︿笂鎶�  " + txtvalue);
+                }
             }
             catch { }
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
index 21fd604..290933b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
@@ -186,7 +186,6 @@
             SeekBarSiphonateCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;
             frameWhiteBack.AddChidren(SeekBarSiphonateCurtain);
             SeekBarSiphonateCurtain.IsProgressTextShow = false;
-            SeekBarSiphonateCurtain.CurtainPaddingTop = Application.GetRealHeight(110);
 
             //鍗峰笜鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
             int progressY = SeekBarSiphonateCurtain.Y - Application.GetMinReal(204);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 549615c..4f6be35 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -697,6 +697,7 @@
                         }
                         HdlThreadLogic.Current.RunThread(() =>
                         {
+                            int sendCount = 0;
                             while (listDeviceBackContr.Parent != null)
                             {
                                 bool hadSend = false;
@@ -712,7 +713,7 @@
                                         //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
                                         listContr[i].SendStatuComand();
                                         hadSend = true;
-                                        System.Threading.Thread.Sleep(200);
+                                        System.Threading.Thread.Sleep(300);
                                     }
                                 }
                                 if (hadSend == false)
@@ -720,7 +721,13 @@
                                     //濡傛灉宸茬粡鍏ㄩ儴鍥炶矾閮芥帴鏀朵簡缃戝叧鍥炲,鍒欎笉鍐嶄簩娆″彂閫�
                                     break;
                                 }
-                                System.Threading.Thread.Sleep(2000);
+                                sendCount++;
+                                if (sendCount == 2)
+                                {
+                                    //灏卞彂2娆�
+                                    break;
+                                }
+                                System.Threading.Thread.Sleep(5000);
                             }
                         }, ShowErrorMode.NO);
                     }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index 5cee0ea..35854a4 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -550,8 +550,8 @@
                     var room = HdlRoomLogic.Current.GetRoomById(selectId);
                     this.SaveSelectDeviceAndScene(room);
                     //鍒嗙被鐣岄潰闇�瑕佸埛鏂�
-                    UserPage.Instance.RefreshCategoryForm = true;
-                    //涓婁紶绌洪棿鍖哄煙淇℃伅
+                    UserPage.Instance.RefreshCategoryForm = true;
+                    //涓婁紶绌洪棿鍖哄煙淇℃伅
                     HdlRoomLogic.Current.SetRoomInfoToGateway();
                 });
             };
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index 3772876..64db30b 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -1220,7 +1220,7 @@
                 dicRealRoom[gateway.GwId] = gateway.RoomId;
             }
             //鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
-            var dicDeviceRoom = Common.LocalDevice.Current.GetAllRealDeviceRoomData();
+            var dicDeviceRoom = HdlRoomLogic.Current.GetAllRealDeviceRoomData();
             foreach (var strMac in dicDeviceRoom.Keys)
             {
                 dicRealRoom[strMac] = dicDeviceRoom[strMac];
@@ -1353,7 +1353,7 @@
             //鏇存敼鐗╃悊璁惧鎵�鍦ㄧ殑鎴块棿
             if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetMac) == true)
             {
-                Common.LocalDevice.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);
+                HdlRoomLogic.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);
             }
 
             //璁板綍缂撳瓨
@@ -1496,7 +1496,7 @@
             //鍙樻洿缃戝叧鎴块棿
             if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetGwid) == true)
             {
-                HdlGatewayLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);
+                HdlRoomLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);
             }
             //鍙樻洿缃戝叧鍚嶅瓧
             //if (this.modelData.dicGatewayInfo.ContainsKey(targetGwid) == true)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index 756529e..e03b27b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -225,7 +225,7 @@
                 {
                     return false;
                 }
-                if (int.Parse(versionResult.FirmwareVersion.Replace(".", "")) > int.Parse(CommonPage.CodeIDString.Replace(".", "")))
+                if (versionResult.FirmwareVersion.CompareTo(CommonPage.CodeIDString) > 0)
                 {
                     distributedMark = versionResult.DistributedMark;
                     return true;
@@ -301,7 +301,7 @@
             try
             {
                 var webClient = new WebClient { };
-                var result = await webClient.DownloadDataTaskAsync("https://itunes.apple.com/lookup?id=1461693569");
+                var result = await webClient.DownloadDataTaskAsync("https://itunes.apple.com/lookup?id=1528702586");
                 if (result == null)
                 {
                     return null;
@@ -318,7 +318,7 @@
         /// </summary>
         public void OpenUrl()
         {
-            Uri url = new Uri("https://itunes.apple.com/cn/app/hdl-home/id1461693569?mt=8");
+            Uri url = new Uri("https://itunes.apple.com/cn/app/hdl-home/id1528702586?mt=8");
             UIKit.UIApplication.SharedApplication.OpenUrl(url);
         }
 #elif Android
@@ -382,19 +382,17 @@
                     {
                         return null;
                     }
-                    int MaxIndex = 0;
-                    int NewVersion = 0;
+
+                    Common.ResponseEntity.ApkInfoOBJ apkInfoOBJ = null;
                     for (int i = 0; i < responeData.pageData.Count; i++)
                     {
                         var apkInfo = responeData.pageData[i];
-                        var version = int.Parse(apkInfo.FirmwareVersion.Replace(".", ""));
-                        if (version > NewVersion)
+                        if (apkInfoOBJ == null || apkInfoOBJ.FirmwareVersion.CompareTo(apkInfo.FirmwareVersion) > 0)
                         {
-                            NewVersion = version;
-                            MaxIndex = i;
+                            apkInfoOBJ = apkInfo;
                         }
                     }
-                    return responeData.pageData[MaxIndex];
+                    return apkInfoOBJ;
                 }
                 return null;
             }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 40e999b..5da69b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1343,6 +1343,10 @@
         /// 鏄惁浣跨敤浠ュ墠鏃х殑璁惧鍒楄〃鑾峰彇鏂瑰紡 1->浣跨敤
         /// </summary>
         public int UseOldSearchDeviceMethord = 0;
+        /// <summary>
+        /// 鏄惁璁板綍涓婃姤鐨刧bs鍧愭爣 1->璁板綍
+        /// </summary>
+        public int WriteGpsPoint = 0;
     }
     #endregion
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
index c52b551..c041d10 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
@@ -309,4 +309,19 @@
         /// </summary>
         Admin = 2
     }
+
+    /// <summary>
+    /// 鏄惁鍐橪og
+    /// </summary>
+    public enum WriteLogMode
+    {
+        /// <summary>
+        /// 鍐橪og
+        /// </summary>
+        YES = 1,
+        /// <summary>
+        /// 涓嶅啓Log
+        /// </summary>
+        NO = 2
+    }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index 8489132..a8c760c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -54,7 +54,7 @@
         /// <param name="i_gateway">缃戝叧瀵硅薄</param>
         public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
         {
-            var room = HdlGatewayLogic.Current.GetRoomByGateway(i_gateway);
+            var room = HdlRoomLogic.Current.GetRoomByGateway(i_gateway);
             this.DoInitControl(i_caption, room);
         }
 
@@ -76,7 +76,7 @@
         /// <param name="i_listDevice">璁惧瀵硅薄</param>
         public void InitControl(string i_caption, List<ZigBee.Device.CommonDevice> i_listDevice)
         {
-            var room = Common.LocalDevice.Current.GeteRealDeviceRoom(i_listDevice[0]);
+            var room = HdlRoomLogic.Current.GeteRealDeviceRoom(i_listDevice[0]);
             this.DoInitControl(i_caption, room);
         }
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index 4593695..e09778a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -150,7 +150,10 @@
             //鍥炬爣
             var btnIcon = rowFrame.AddLeftIcon(81);
             btnIcon.UnSelectedImagePath = unSelectPic;
-            btnIcon.SelectedImagePath = selectPic;
+            if (selectPic != null)
+            {
+                btnIcon.SelectedImagePath = selectPic;
+            }
             //鏄剧ず鏂囧瓧
             var btnText = rowFrame.AddLeftCaption(TextValue, RowWidth - 173);
             btnText.X = Application.GetRealWidth(173);
@@ -215,7 +218,14 @@
             var btnIcon = (IconViewControl)frame.GetChildren(0);
             if (btnIcon != null)
             {
-                btnIcon.IsSelected = select;
+                if (select == true && string.IsNullOrEmpty(btnIcon.SelectedImagePath) == true)
+                {
+                    //濡傛灉涓嶈缃繖寮犲浘鐗�,鍒欎粈涔堥兘涓嶅仛
+                }
+                else
+                {
+                    btnIcon.IsSelected = select;
+                }
             }
             //鏂囨湰
             var btnText = (NormalViewControl)frame.GetChildren(1);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
index cc6932b..27f40e9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
@@ -92,7 +92,7 @@
             frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
 
             //鎴块棿
-            string roomName = Common.LocalDevice.Current.GeteRealDeviceRoomName(listDevice[0]);
+            string roomName = HdlRoomLogic.Current.GeteRealDeviceRoomName(listDevice[0]);
             btnDeviceRoom = frameTable.AddBottomView(roomName, 800);
 
             //搴曠嚎
@@ -145,7 +145,7 @@
             //璁惧
             btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
             //璁惧鎴块棿
-            btnDeviceRoom.Text = Common.LocalDevice.Current.GeteRealDeviceRoomName(listDevice[0]);
+            btnDeviceRoom.Text = HdlRoomLogic.Current.GeteRealDeviceRoomName(listDevice[0]);
         }
 
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
index f7c6441..75e2288 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
@@ -326,6 +326,10 @@
 
             //閲嶆柊鍒锋柊浣忓畢瀵硅薄
             UserCenterLogic.RefreshHomeObject();
+            //鏍规嵁妯℃澘鏂囦欢,鎭㈠鏁版嵁
+            TemplateData.TemplateCommonLogic.Current.RecoverDataByTemplateBinFile();
+            //寮哄埗鐢熸垚璁惧鍜岀綉鍏虫枃浠�
+            TemplateData.TemplateCommonLogic.Current.CreatDeviceAndGatewayFileFromMemoryByForce();
 
             //鍏抽棴杩涘害鏉�
             ProgressFormBar.Current.Close();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
index e92d774..d9e3d0c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
@@ -87,8 +87,8 @@
                 listReceiptTopic[i] = gatewayID + "/" + listReceiptTopic[i];
             }
 
-            //鎺ユ敹鏁�
-            int receiptCount = 0;
+            //钃濇墠鍒氭暣浜嗕釜鍚屼竴涓富棰樺彲鑳戒細鎺ㄩ�佸涓繃鏉ョ殑鏈鸿兘
+            var listCheckTopic = new HashSet<string>();
             Action<string, string> receiptAction = (topic, message) =>
             {
                 var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
@@ -104,6 +104,11 @@
                 {
                     if (topic == listReceiptTopic[i])
                     {
+                        if (listCheckTopic.Contains(topic) == true)
+                        {
+                            //杩欓噷鍐欒繖涓笢瑗挎槸鏈夌偣鐢ㄥ鐨�
+                            continue;
+                        }
                         string deviceMac = jobject["DeviceAddr"].ToString();
                         int deviceEpoint = 200;
                         if (jobject.Property("Epoint") != null)
@@ -128,7 +133,11 @@
                             jobject.Remove("Time");
                         }
                         reResult.JsonData[i] = jobject.ToString();
-                        receiptCount++;
+                        if (listCheckTopic.Contains(topic) == false)
+                        {
+                            //鍔犲埌妫�娴嬩富棰樺璞′腑
+                            listCheckTopic.Add(topic);
+                        }
                     }
                 }
 
@@ -140,7 +149,7 @@
             //瓒呮椂鏃堕棿
             int TimeOut = 0;
             waitTime = 20 * waitTime;
-            while (receiptCount != listReceiptTopic.Count && TimeOut < waitTime)
+            while (listCheckTopic.Count != listReceiptTopic.Count && TimeOut < waitTime)
             {
                 //鍏ㄩ儴鎺ユ敹鎵嶉��鍑�
                 System.Threading.Thread.Sleep(50);
@@ -148,7 +157,7 @@
             }
             myGateway.Actions -= receiptAction;
             receiptAction = null;
-            if (receiptCount != listReceiptTopic.Count)
+            if (listCheckTopic.Count != listReceiptTopic.Count)
             {
                 reResult.ErrorMsgDiv = 0;
             }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index 0cd272f..2ad3bcd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -36,6 +36,13 @@
         /// 鐢ㄦ潵閫掑鐢熸垚Mac鐢ㄧ殑
         /// </summary>
         private int DeviceNumber = 0;
+        /// <summary>
+        /// 鏄惁鏄父瀹綋楠�
+        /// </summary>
+        public bool IsExperience
+        {
+            get { return Config.Instance.Guid == "chushiGuid"; }
+        }
 
         #endregion
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 73158b0..b6df0c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -200,16 +200,21 @@
         /// </summary>
         /// <param name="zbGateway">缃戝叧</param>
         /// <param name="mode">鏄惁鏄剧ず閿欒</param>
-        public bool AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
+        /// <param name="logMode">鏄惁鍐橪og</param>
+        public bool AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode, WriteLogMode logMode = WriteLogMode.NO)
         {
             //璁剧疆缃戝叧鐨勭粡绾害
             bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude, ShowErrorMode.NO);
             if (falge == false)
             {
+                if (logMode == WriteLogMode.YES)
+                {
+                    HdlLogLogic.Current.WriteLog(-1, zbGateway.GwIP + " 璁剧疆缁忕含搴﹀け璐�");
+                }
                 return falge;
             }
             //鎵ц娣诲姞缃戝叧鍒板唴瀛�
-            var result = this.DoAddGatewayToMemory(zbGateway, mode);
+            var result = this.DoAddGatewayToMemory(zbGateway, mode, logMode);
             //鍓嶇殑缃戝叧缁戝畾鍦ㄤ簡褰撳墠璐﹀彿涓嬬殑涓嶅悓浣忓畢閲岄潰
             if (result == 0)
             {
@@ -222,6 +227,10 @@
                         msg = string.Format(msg, "\r\n");
                     }
                     this.ShowTipMsg(msg);
+                }
+                if (logMode == WriteLogMode.YES)
+                {
+                    HdlLogLogic.Current.WriteLog(-1, zbGateway.GwIP + " 缃戝叧缁戝畾鍦ㄤ簡褰撳墠璐﹀彿涓嬬殑涓嶅悓浣忓畢閲岄潰,浜戠涓嶇粰缁戝畾");
                 }
                 return false;
             }
@@ -267,8 +276,9 @@
         /// </summary>
         /// <param name="zbGateway">缃戝叧瀵硅薄</param>
         /// <param name="mode">鏄惁鏄剧ず閿欒</param>
+        /// <param name="logMode">鏄惁鍐橪og</param>
         /// <returns></returns>
-        private int DoAddGatewayToMemory(ZbGateway zbGateway, ShowErrorMode mode)
+        private int DoAddGatewayToMemory(ZbGateway zbGateway, ShowErrorMode mode, WriteLogMode logMode = WriteLogMode.NO)
         {
             if (zbGateway == null)
             {
@@ -290,6 +300,10 @@
                     string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);
                     this.ShowTipMsg(msg);
                 }
+                if (logMode == WriteLogMode.YES)
+                {
+                    HdlLogLogic.Current.WriteLog(-1, zbGateway.GwIP + " 鑾峰彇缃戝叧淇℃伅澶辫触");
+                }
                 return -1;
             }
 
@@ -304,6 +318,10 @@
                         //鍚戠綉鍏宠缃綇瀹匢D澶辫触
                         string msg = Language.StringByID(R.MyInternationalizationString.uSetHomeIdToGatewayFail);
                         this.ShowTipMsg(msg);
+                    }
+                    if (logMode == WriteLogMode.YES)
+                    {
+                        HdlLogLogic.Current.WriteLog(-1, zbGateway.GwIP + " 鍚戠綉鍏宠缃綇瀹匢D澶辫触");
                     }
                     return -1;
                 }
@@ -748,7 +766,7 @@
             //鏂紑mqtt杩炴帴
             if (realWay != null)
             {
-                realWay.DisConnectLocalMqttClient("GD");
+                realWay.CloseLocalConnectionOnForce();
             }
 
             return true;
@@ -847,8 +865,8 @@
         {
             foreach (var zbway in listGateway)
             {
-                //鏄惁瀛樺湪缃戝叧瀛樺湪浜嶹IFI涓�
-                if (this.CheckGatewayOnlineByFlage(zbway) == true)
+                //濡傛灉骞挎挱寰楀埌缃戝叧,鍒欎細鍒锋柊OnlineTime,濡傛灉涓庡綋鍓嶆椂闂寸浉宸皯浜庢寚瀹氱鏁�,鍒欏垽鏂负瀛樺湪缃戝叧瀛樺湪浜嶹IFI涓�
+                if ((DateTime.Now - zbway.OnlineTime).TotalSeconds <= ZigBee.Common.Application.SendTime * 2)
                 {
                     return true;
                 }
@@ -903,13 +921,29 @@
             }
 
             return this.CheckGatewayOnlineByFlage(zbGateway);
-        }
-
+        }
+
+        /// <summary>
+        /// 鍒锋柊缃戝叧鐨勫湪绾挎椂闂寸偣
+        /// </summary>
+        /// <param name="i_gatewayId">缃戝叧ID</param>
+        public void RefreshGatewayOnlineTime(string i_gatewayId)
+        {
+            try
+            {
+                if (this.dicGateway.ContainsKey(i_gatewayId) == true)
+                {
+                    this.dicGateway[i_gatewayId].OnlineTime = DateTime.Now;
+                }
+            }
+            catch { }
+        }
+
         /// <summary>
         /// 鏍规嵁鎸囧畾鏍囪瘑,鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎
         /// </summary>
         /// <param name="zbGateway"></param>
-        /// <returns></returns>
+        /// <returns></returns>
         private bool CheckGatewayOnlineByFlage(ZbGateway zbGateway)
         {
             if (this.nowGwConnectMode == GatewayConnectMode.Remote)
@@ -1487,52 +1521,6 @@
 
         #endregion
 
-        #region 鈻� 缃戝叧鎴块棿鐩稿叧_______________________
-
-        /// <summary>
-        /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
-        /// </summary>
-        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
-        /// <returns></returns>
-        public Room GetRoomByGateway(ZbGateway zbGateway)
-        {
-            return this.GetRoomByGateway(zbGateway.GwId);
-        }
-
-        /// <summary>
-        /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
-        /// </summary>
-        /// <param name="gatewayId">缃戝叧ID</param>
-        /// <returns></returns>
-        public Room GetRoomByGateway(string gatewayId)
-        {
-            var localGateway = this.GetLocalGateway(gatewayId);
-            if (localGateway == null)
-            {
-                return null;
-            }
-            return HdlRoomLogic.Current.GetRoomById(localGateway.RoomId);
-        }
-
-        /// <summary>
-        /// 鍙樻洿缃戝叧鎴块棿
-        /// </summary>
-        /// <param name="gwId">缃戝叧Id</param>
-        /// <param name="roomId">鎴块棿ID</param>
-        public void ChangedGatewayRoom(string gwId, string roomId)
-        {
-            var localGateway = this.GetLocalGateway(gwId);
-            if (localGateway != null)
-            {
-                localGateway.RoomId = roomId;
-                localGateway.ReSave();
-                //娣诲姞澶囦唤
-                HdlAutoBackupLogic.AddOrEditorFile(localGateway.FilePath);
-            }
-        }
-
-        #endregion
-
         #region 鈻� 娓呯┖鐪熷疄缃戝叧閾炬帴___________________
 
         /// <summary>
@@ -1544,7 +1532,7 @@
             //鏂紑mqtt杩炴帴(鍗充娇淇濆瓨鍦ㄥ唴瀛樺綋涓篃娌¢棶棰�,鍥犱负濡傛灉骞挎挱涓嶅埌,鍒欏畠涓嶄細寤虹珛閾炬帴)
             for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
             {
-                ZbGateway.GateWayList[i].DisConnectLocalMqttClient("G");
+                ZbGateway.GateWayList[i].CloseLocalConnectionOnForce();
             }
             //鍔犺浇鏈湴缃戝叧瀵硅薄
             if (roadGateway == true)
@@ -2056,54 +2044,53 @@
         /// <summary>
         /// 閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
         /// </summary>
-        public void ResetComandToBindBackupGateway()
+        public bool ResetComandToBindBackupGateway()
         {
-            HdlThreadLogic.Current.RunThread(() =>
+            var fileData = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.BackupGatewayIdFile);
+            if (fileData == null)
             {
-                var fileData = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.BackupGatewayIdFile);
-                if (fileData == null)
-                {
-                    return;
-                }
-                this.listBackupGwId = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(System.Text.Encoding.UTF8.GetString(fileData));
-                var listTempId = new List<string>();
-                listTempId.AddRange(this.listBackupGwId);
+                return true;
+            }
+            this.listBackupGwId = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(System.Text.Encoding.UTF8.GetString(fileData));
+            var listTempId = new List<string>();
+            listTempId.AddRange(this.listBackupGwId);
 
-                //璋冪敤鎺ュ彛锛岀粦瀹氱綉鍏�
-                var bindGateway = new BindGatewayPra();
-                //鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
-                bindGateway.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+            //璋冪敤鎺ュ彛锛岀粦瀹氱綉鍏�
+            var bindGateway = new BindGatewayPra();
+            //鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
+            bindGateway.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
 
-                foreach (var gwId in listTempId)
+            foreach (var gwId in listTempId)
+            {
+                bindGateway.BindGateways.Clear();
+                bindGateway.BindGateways.Add(gwId);
+                var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" }, false);
+                if (result == "Success")
                 {
-                    bindGateway.BindGateways.Clear();
-                    bindGateway.BindGateways.Add(gwId);
-                    var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" }, false);
-                    if (result == "Success")
-                    {
-                        this.listBackupGwId.Remove(gwId);
-                    }
-                    if (result == "Error")
-                    {
-                        break;
-                    }
+                    this.listBackupGwId.Remove(gwId);
                 }
+                if (result == "Error")
+                {
+                    break;
+                }
+            }
 
-                if (this.listBackupGwId.Count == 0)
+            if (this.listBackupGwId.Count == 0)
+            {
+                //濡傛灉娌℃湁浜嗗唴瀹�,鍒欏垹闄ゆ枃浠�
+                string file = DirNameResourse.BackupGatewayIdFile;
+                if (System.IO.File.Exists(file) == true)
                 {
-                    //濡傛灉娌℃湁浜嗗唴瀹�,鍒欏垹闄ゆ枃浠�
-                    string file = DirNameResourse.BackupGatewayIdFile;
-                    if (System.IO.File.Exists(file) == true)
-                    {
-                        System.IO.File.Delete(file);
-                    }
+                    System.IO.File.Delete(file);
                 }
-                else
-                {
-                    //澶囦唤
-                    HdlFileLogic.Current.SaveFileContent(DirNameResourse.BackupGatewayIdFile, listBackupGwId);
-                }
-            });
+                return true;
+            }
+            else
+            {
+                //澶囦唤
+                HdlFileLogic.Current.SaveFileContent(DirNameResourse.BackupGatewayIdFile, listBackupGwId);
+                return false;
+            }
         }
 
         #endregion
@@ -2191,9 +2178,9 @@
             if (realWay == null)
             {
                 //濡傛灉缃戝叧瀵硅薄涓㈠け浜�,鍒欏垱寤轰釜鏂扮殑
-                realWay = new ZbGateway { IsVirtual = true, };
-                realWay.GwId = i_gatewayId;
-                realWay.HomeId = Config.Instance.HomeId;
+                realWay = new ZbGateway { IsVirtual = true, };
+                realWay.GwId = i_gatewayId;
+                realWay.HomeId = Config.Instance.HomeId;
                 ZbGateway.GateWayList.Add(realWay);
             }
             if (useLocalConnect == false)
@@ -2290,7 +2277,7 @@
         private void CheckGatewayStatuByWIFI(Dictionary<string, bool> dicOldOnline)
         {
             //浠庣綉鍏宠幏鍙栧叏閮ㄧ殑缃戝叧
-            List<ZbGateway> list = this.GetAllGatewayFromGateway();
+            List<ZbGateway> list = this.GetAllLocalGateway();
 
             //2020.05.25杩藉姞:姝や綇瀹呮槸鍚︽嫢鏈夌綉鍏冲湪绾�
             var hadGwOnline = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index a0e7eac..76c3d28 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -62,6 +62,11 @@
         /// <param name="msgData">鎺ユ敹鐨勬暟鎹�</param>
         public void GatewayOverallMsgReceive(string gatewayId, string topic, string reportTopic, string msgData)
         {
+            //濡傛灉瀹冨湪鐧婚檰鐣岄潰,鍒欎笉鍋氫换浣曞鐞�
+            if (Common.Config.Instance.HomeId == string.Empty)
+            {
+                return;
+            }
             if (topic == "AppNoLogin")
             {
                 HdlThreadLogic.Current.RunMain(() =>
@@ -149,7 +154,11 @@
             {
                 if (HdlGatewayLogic.Current.IsGatewayExist(gatewayId) == false)
                 {
-                    //涓嶆槸鑷繁缁戝畾鐨勭綉鍏筹紝鍒欎笉澶勭悊
+                    //涓嶆槸鑷繁缁戝畾鐨勭綉鍏筹紝鍒欎笉澶勭悊,浣嗘槸涓嬮潰杩欎釜涓滆タ鏈夌偣鐗规畩
+                    if (gatewayId == this.GatewayReceiveId)
+                    {
+                        this.GatewayReceiveEvent?.Invoke(topic, msgData);
+                    }
                     return;
                 }
                 //璁惧灞炴�т笂鎶�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGpsLocationConvertLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGpsLocationConvertLogic.cs
new file mode 100644
index 0000000..930a41d
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGpsLocationConvertLogic.cs
@@ -0,0 +1,693 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+    /// <summary>
+    /// GPS鐨勫潗鏍囪浆鎹㈤�昏緫
+    /// </summary>
+    public class HdlGpsLocationConvertLogic
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
+        /// <summary>
+        /// GPS鐨勫潗鏍囪浆鎹㈤�昏緫
+        /// </summary>
+        private static HdlGpsLocationConvertLogic m_Current = null;
+        /// <summary>
+        /// GPS鐨勫潗鏍囪浆鎹㈤�昏緫
+        /// </summary>
+        public static HdlGpsLocationConvertLogic Current
+        {
+            get
+            {
+                if (m_Current == null)
+                {
+                    m_Current = new HdlGpsLocationConvertLogic();
+                }
+                return m_Current;
+            }
+        }
+
+        // 淇濈暀鐨勫皬鏁颁綅鏁�
+        private const string decimals = "f6";
+
+        // 妞悆鍙傛暟-鍦嗗懆鐜�
+        private const double pi = 3.14159265358979324;
+
+        private const double x_pi = pi * 3000.0 / 180.0;
+
+        // (鍖椾含54)妞悆闀垮崐杞达紝鍗槦妞悆鍧愭爣鎶曞奖鍒板钩闈㈠湴鍥惧潗鏍囩郴鐨勬姇褰卞洜瀛�
+        private const double a = 6378245.0;
+        /*
+            * Krasovsky 1940 (鍖椾含54)妞悆闀垮崐杞寸涓�鍋忓績鐜囧钩鏂�
+            * 璁$畻鏂瑰紡锛�
+            * 闀垮崐杞达細
+            * a = 6378245.0
+            * 鎵佺巼锛�
+            * 1/f = 298.3锛堝彉閲忕浉鍏宠绠椾负锛�(a-b)/a锛�
+            * 鐭崐杞达細
+            * b = 6356863.0188 (鍙橀噺鐩稿叧璁$畻鏂规硶涓猴細b = a * (1 - f))
+            * 绗竴鍋忓績鐜囧钩鏂�:
+            * e2 = (a^2 - b^2) / a^2;
+        */
+        private const double ee = 0.00669342162296594323;
+        // 鍦扮悆鍗婂緞
+        private const double earthR = 6371000.0;
+
+        #endregion
+
+        /// <summary>
+        /// 璁$畻鍋忓樊
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="dLng"></param>
+        /// <param name="dLat"></param>
+        private void CalculateDev(double in_lng, double in_lat, out double dLng, out double dLat)
+        {
+            dLat = TransformLat(in_lng - 105.0, in_lat - 35.0);
+            dLng = TransformLng(in_lng - 105.0, in_lat - 35.0);
+
+            double radLat = in_lat / 180.0 * pi;
+            double magic = Math.Sin(radLat);
+            magic = 1 - ee * magic * magic;
+            double sqrtMagic = Math.Sqrt(magic);
+            dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+            dLng = (dLng * 180.0) / (a / sqrtMagic * Math.Cos(radLat) * pi);
+        }
+
+        #region 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void GCJ02_to_WGS84(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            if (OutOfChina(in_lat, in_lng))
+            {
+                out_lng = in_lng;
+                out_lat = in_lat;
+                return;
+            }
+
+            CalculateDev(in_lng, in_lat, out out_lng, out out_lat);
+            out_lng = in_lng - out_lng;
+            out_lat = in_lat - out_lat;
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        public double[] GCJ02_to_WGS84(double lng, double lat)
+        {
+            double[] lnglat = new double[2];
+            GCJ02_to_WGS84(lng, lat, out lnglat[0], out lnglat[1]);
+            return lnglat;
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="lnglat"></param>
+        /// <returns></returns>
+        public double[] GCJ02_to_WGS84(double[] lnglat)
+        {
+            return GCJ02_to_WGS84(lnglat[0], lnglat[1]);
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        public string[] GCJ02_to_WGS84(string lng, string lat)
+        {
+            double _lng, _lat;
+            GCJ02_to_WGS84(ToDouble(lng), ToDouble(lat), out _lng, out _lat);
+            return new string[] { _lng.ToString(decimals), _lat.ToString(decimals) };
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="_lnglat"></param>
+        /// <returns></returns>
+        public string[] GCJ02_to_WGS84(string[] _lnglat)
+        {
+            return GCJ02_to_WGS84(_lnglat[0], _lnglat[1]);
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void GCJ02_to_WGS84(string in_lng, string in_lat, out string out_lng, out string out_lat)
+        {
+            double _lng, _lat;
+            GCJ02_to_WGS84(ToDouble(in_lng), ToDouble(in_lat), out _lng, out _lat);
+            out_lng = _lng.ToString(decimals);
+            out_lat = _lat.ToString(decimals);
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣 绮剧‘(浜屽垎鏋侀檺娉�)
+        /// 榛樿璁剧疆鐨勬槸绮剧‘鍒板皬鏁扮偣鍚�9浣嶏紝杩欎釜鍊艰秺灏忥紝瓒婄簿纭�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        /// <param name="threshold"></param>
+        public void GCJ02_to_WGS84_Exact(double in_lng, double in_lat, out double out_lng, out double out_lat, double threshold = 0.000000001)
+        {
+            double dLng = 0.01, dLat = 0.01;
+            double mLng = in_lng - dLng, mLat = in_lat - dLat;
+            double pLng = in_lng + dLng, pLat = in_lat + dLat;
+            double wgsLng, wgsLat;
+            int i = 0;
+
+            while (true)
+            {
+                wgsLng = (mLng + pLng) / 2;
+                wgsLat = (mLat + pLat) / 2;
+
+                GCJ02_to_WGS84(wgsLat, wgsLng, out out_lng, out out_lat);
+                dLng = out_lng - in_lng;
+                dLat = out_lat - in_lat;
+
+                if ((Math.Abs(dLat) < threshold) && (Math.Abs(dLng) < threshold))
+                    break;
+
+                if (dLat > 0)
+                    pLat = wgsLat;
+                else
+                    mLat = wgsLat;
+
+                if (dLng > 0)
+                    pLng = wgsLng;
+                else
+                    mLng = wgsLng;
+
+                if (++i > 10000)
+                    break;
+            }
+        }
+        #endregion
+
+        #region 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void GCJ02_to_BD09(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            double x = in_lng, y = in_lat;
+            double z = Math.Sqrt(x * x + y * y) + 0.00002 * Math.Sin(y * x_pi);
+            double theta = Math.Atan2(y, x) + 0.000003 * Math.Cos(x * x_pi);
+            out_lng = z * Math.Cos(theta) + 0.0065;
+            out_lat = z * Math.Sin(theta) + 0.006;
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        public double[] GCJ02_to_BD09(double lng, double lat)
+        {
+            double[] lnglat = new double[2];
+            GCJ02_to_BD09(lng, lat, out lnglat[0], out lnglat[1]);
+            return lnglat;
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="lnglat"></param>
+        /// <returns></returns>
+        public double[] GCJ02_to_BD09(double[] lnglat)
+        {
+            return GCJ02_to_BD09(lnglat[0], lnglat[1]);
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        public string[] GCJ02_to_BD09(string lng, string lat)
+        {
+            double _lng, _lat;
+            GCJ02_to_BD09(ToDouble(lng), ToDouble(lat), out _lng, out _lat);
+            return new string[] { _lng.ToString(decimals), _lat.ToString(decimals) };
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="_lnglat"></param>
+        /// <returns></returns>
+        public string[] GCJ02_to_BD09(string[] _lnglat)
+        {
+            return GCJ02_to_BD09(_lnglat[0], _lnglat[1]);
+        }
+
+        /// <summary>
+        /// 楂樺痉鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void GCJ02_to_BD09(string in_lng, string in_lat, out string out_lng, out string out_lat)
+        {
+            double _lng, _lat;
+            GCJ02_to_BD09(ToDouble(in_lng), ToDouble(in_lat), out _lng, out _lat);
+            out_lng = _lng.ToString(decimals);
+            out_lat = _lat.ToString(decimals);
+        }
+
+        #endregion
+
+        #region 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void BD09_to_GCJ02(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            double x = in_lng - 0.0065, y = in_lat - 0.006;
+            double z = Math.Sqrt(x * x + y * y) - 0.00002 * Math.Sin(y * x_pi);
+            double theta = Math.Atan2(y, x) - 0.000003 * Math.Cos(x * x_pi);
+            out_lng = z * Math.Cos(theta);
+            out_lat = z * Math.Sin(theta);
+        }
+
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        public double[] BD09_to_GCJ02(double lng, double lat)
+        {
+            double[] lnglat = new double[2];
+            BD09_to_GCJ02(lng, lat, out lnglat[0], out lnglat[1]);
+            return lnglat;
+        }
+
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="lnglat"></param>
+        /// <returns></returns>
+        public double[] BD09_to_GCJ02(double[] lnglat)
+        {
+            return BD09_to_GCJ02(lnglat[0], lnglat[1]);
+        }
+
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        public string[] BD09_to_GCJ02(string lng, string lat)
+        {
+            double _lng, _lat;
+            BD09_to_GCJ02(ToDouble(lng), ToDouble(lat), out _lng, out _lat);
+            return new string[] { _lng.ToString(decimals), _lat.ToString(decimals) };
+        }
+
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="_lnglat"></param>
+        /// <returns></returns>
+        public string[] BD09_to_GCJ02(string[] _lnglat)
+        {
+            return BD09_to_GCJ02(_lnglat[0], _lnglat[1]);
+        }
+
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void BD09_to_GCJ02(string in_lng, string in_lat, out string out_lng, out string out_lat)
+        {
+            double _lng, _lat;
+            BD09_to_GCJ02(ToDouble(in_lng), ToDouble(in_lat), out _lng, out _lat);
+            out_lng = _lng.ToString(decimals);
+            out_lat = _lat.ToString(decimals);
+        }
+        #endregion
+
+        #region 鐧惧害鍧愭爣杞琖GS84鍧愭爣
+        /// <summary>
+        /// 鐧惧害鍧愭爣杞琖GS84鍧愭爣
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void BD09_to_WGS84(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            BD09_to_GCJ02(in_lng, in_lat, out out_lng, out out_lat);
+            GCJ02_to_WGS84(out_lng, out_lat, out out_lng, out out_lat);
+        }
+        #endregion
+
+        #region WGS-84 to Web mercator
+        /// <summary>
+        /// WGS-84 to Web mercator
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void WGS84_to_Mercator(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            out_lng = in_lng * 20037508.34 / 180.0;
+            double y = Math.Log(Math.Tan((90.0 + in_lat) * pi / 360.0)) / (pi / 180.0);
+            out_lat = y * 20037508.34 / 180.0;
+        }
+
+        /// <summary>
+        /// WGS-84 to Web mercator
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        public double[] WGS84_to_Mercator(double lng, double lat)
+        {
+            double[] lnglat = new double[2];
+            WGS84_to_Mercator(lng, lat, out lnglat[0], out lnglat[1]);
+            return lnglat;
+        }
+
+        /// <summary>
+        /// WGS-84 to Web mercator
+        /// </summary>
+        /// <param name="lnglat"></param>
+        /// <returns></returns>
+        public double[] WGS84_to_Mercator(double[] lnglat)
+        {
+            return WGS84_to_Mercator(lnglat[0], lnglat[1]);
+        }
+
+        /// <summary>
+        /// WGS-84 to Web mercator
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        public string[] WGS84_to_Mercator(string lng, string lat)
+        {
+            double _lng, _lat;
+            WGS84_to_Mercator(ToDouble(lng), ToDouble(lat), out _lng, out _lat);
+            return new string[] { _lng.ToString(decimals), _lat.ToString(decimals) };
+        }
+
+        /// <summary>
+        /// WGS-84 to Web mercator
+        /// </summary>
+        /// <param name="_lnglat"></param>
+        /// <returns></returns>
+        public string[] WGS84_to_Mercator(string[] _lnglat)
+        {
+            return WGS84_to_Mercator(_lnglat[0], _lnglat[1]);
+        }
+
+        /// <summary>
+        /// WGS-84 to Web mercator
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void WGS84_to_Mercator(string in_lng, string in_lat, out string out_lng, out string out_lat)
+        {
+            double _lng, _lat;
+            WGS84_to_Mercator(ToDouble(in_lng), ToDouble(in_lat), out _lng, out _lat);
+            out_lng = _lng.ToString(decimals);
+            out_lat = _lat.ToString(decimals);
+        }
+        #endregion
+
+        #region Web mercator to WGS-84
+        /// <summary>
+        /// Web mercator to WGS-84
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void Mercator_to_WGS84(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            out_lng = in_lng / 20037508.34 * 180.0;
+            double y = in_lat / 20037508.34 * 180.0;
+            out_lat = 180.0 / pi * (2 * Math.Atan(Math.Exp(y * pi / 180.0)) - pi / 2);
+        }
+
+        /// <summary>
+        /// Web mercator to WGS-84
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        public double[] Mercator_to_WGS84(double lng, double lat)
+        {
+            double[] lnglat = new double[2];
+            Mercator_to_WGS84(lng, lat, out lnglat[0], out lnglat[1]);
+            return lnglat;
+        }
+
+        /// <summary>
+        /// Web mercator to WGS-84
+        /// </summary>
+        /// <param name="lnglat"></param>
+        /// <returns></returns>
+        public double[] Mercator_to_WGS84(double[] lnglat)
+        {
+            return Mercator_to_WGS84(lnglat[0], lnglat[1]);
+        }
+
+        /// <summary>
+        /// Web mercator to WGS-84
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        public string[] Mercator_to_WGS84(string lng, string lat)
+        {
+            double _lng, _lat;
+            Mercator_to_WGS84(ToDouble(lng), ToDouble(lat), out _lng, out _lat);
+            return new string[] { _lng.ToString(decimals), _lat.ToString(decimals) };
+        }
+
+        /// <summary>
+        /// Web mercator to WGS-84
+        /// </summary>
+        /// <param name="_lnglat"></param>
+        /// <returns></returns>
+        public string[] Mercator_to_WGS84(string[] _lnglat)
+        {
+            return Mercator_to_WGS84(_lnglat[0], _lnglat[1]);
+        }
+
+        /// <summary>
+        /// Web mercator to WGS-84
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void Mercator_to_WGS84(string in_lng, string in_lat, out string out_lng, out string out_lat)
+        {
+            double _lng, _lat;
+            Mercator_to_WGS84(ToDouble(in_lng), ToDouble(in_lat), out _lng, out _lat);
+            out_lng = _lng.ToString(decimals);
+            out_lat = _lat.ToString(decimals);
+        }
+        #endregion
+
+        #region WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// <summary>
+        /// WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void WGS84_to_GCJ02(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            if (OutOfChina(in_lat, in_lng))
+            {
+                out_lng = in_lng;
+                out_lat = in_lat;
+                return;
+            }
+
+            CalculateDev(in_lng, in_lat, out out_lng, out out_lat);
+            out_lng = in_lng + out_lng;
+            out_lat = in_lat + out_lat;
+        }
+
+        /// <summary>
+        /// WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        public double[] WGS84_to_GCJ02(double lng, double lat)
+        {
+            double[] lnglat = new double[2];
+            WGS84_to_GCJ02(lng, lat, out lnglat[0], out lnglat[1]);
+            return lnglat;
+        }
+
+        /// <summary>
+        /// WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="lnglat"></param>
+        /// <returns></returns>
+        public double[] WGS84_to_GCJ02(double[] lnglat)
+        {
+            return WGS84_to_GCJ02(lnglat[0], lnglat[1]);
+        }
+
+        /// <summary>
+        /// WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        public string[] WGS84_to_GCJ02(string lng, string lat)
+        {
+            double _lng, _lat;
+            WGS84_to_GCJ02(ToDouble(lng), ToDouble(lat), out _lng, out _lat);
+            return new string[] { _lng.ToString(decimals), _lat.ToString(decimals) };
+        }
+
+        /// <summary>
+        /// WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="_lnglat"></param>
+        /// <returns></returns>
+        public string[] WGS84_to_GCJ02(string[] _lnglat)
+        {
+            return WGS84_to_GCJ02(_lnglat[0], _lnglat[1]);
+        }
+
+        /// <summary>
+        /// WGS84鍧愭爣杞珮寰峰潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void WGS84_to_GCJ02(string in_lng, string in_lat, out string out_lng, out string out_lat)
+        {
+            double _lng, _lat;
+            WGS84_to_GCJ02(ToDouble(in_lng), ToDouble(in_lat), out _lng, out _lat);
+            out_lng = _lng.ToString(decimals);
+            out_lat = _lat.ToString(decimals);
+        }
+        #endregion
+
+        #region WGS84鍧愭爣杞櫨搴﹀潗鏍�
+        /// <summary>
+        /// WGS84鍧愭爣杞櫨搴﹀潗鏍�
+        /// </summary>
+        /// <param name="in_lng"></param>
+        /// <param name="in_lat"></param>
+        /// <param name="out_lng"></param>
+        /// <param name="out_lat"></param>
+        public void WGS84_to_BD09(double in_lng, double in_lat, out double out_lng, out double out_lat)
+        {
+            WGS84_to_GCJ02(in_lng, in_lat, out out_lng, out out_lat);
+            GCJ02_to_BD09(out_lng, out_lat, out out_lng, out out_lat);
+        }
+        #endregion
+
+        /// <summary>
+        /// 涓ょ偣鐩存帴鐨勮窛绂�
+        /// </summary>
+        public double GetDistance(double latA, double lonA, double latB, double lonB)
+        {
+            double x = Math.Cos(latA * pi / 180.0) * Math.Cos(latB * pi / 180.0) * Math.Cos((lonA - lonB) * pi / 180.0);
+            double y = Math.Sin(latA * pi / 180.0) * Math.Sin(latB * pi / 180.0);
+            double s = x + y;
+            if (s > 1) s = 1;
+            if (s < -1) s = -1;
+            double alpha = Math.Acos(s);
+            double distance = alpha * earthR;
+            return distance;
+        }
+
+        /// <summary>
+        /// 鍧愭爣鏄惁鍦ㄤ腑鍥藉鍐�
+        /// </summary>
+        /// <param name="lat"></param>
+        /// <param name="lng"></param>
+        /// <returns></returns>
+        public bool OutOfChina(double lat, double lng)
+        {
+            if (lng < 72.004 || lng > 137.8347)
+                return true;
+            if (lat < 0.8293 || lat > 55.8271)
+                return true;
+            return false;
+        }
+
+        private double TransformLat(double x, double y)
+        {
+            double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.Sqrt(Math.Abs(x));
+            ret += (20.0 * Math.Sin(6.0 * x * pi) + 20.0 * Math.Sin(2.0 * x * pi)) * 2.0 / 3.0;
+            ret += (20.0 * Math.Sin(y * pi) + 40.0 * Math.Sin(y / 3.0 * pi)) * 2.0 / 3.0;
+            ret += (160.0 * Math.Sin(y / 12.0 * pi) + 320 * Math.Sin(y * pi / 30.0)) * 2.0 / 3.0;
+            return ret;
+        }
+
+        private double TransformLng(double x, double y)
+        {
+            double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.Sqrt(Math.Abs(x));
+            ret += (20.0 * Math.Sin(6.0 * x * pi) + 20.0 * Math.Sin(2.0 * x * pi)) * 2.0 / 3.0;
+            ret += (20.0 * Math.Sin(x * pi) + 40.0 * Math.Sin(x / 3.0 * pi)) * 2.0 / 3.0;
+            ret += (150.0 * Math.Sin(x / 12.0 * pi) + 300.0 * Math.Sin(x / 30.0 * pi)) * 2.0 / 3.0;
+            return ret;
+        }
+
+        /// <summary>
+        /// 灏唖tring杞崲涓哄崄杩涘埗鍙岀簿搴︽暟锛屽鏋滄牸寮忛敊璇皢杞崲澶辫触骞惰繑鍥為粯璁ゅ��
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        private double ToDouble(string str, double defaultValue = default)
+        {
+            if (double.TryParse(str, out double result))
+            {
+                return result;
+            }
+
+            return defaultValue;
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlHttpLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlHttpLogic.cs
new file mode 100644
index 0000000..217eedd
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlHttpLogic.cs
@@ -0,0 +1,89 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+    /// <summary>
+    /// Http璁块棶閫昏緫
+    /// </summary>
+    public class HdlHttpLogic
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
+        /// <summary>
+        /// Http璁块棶閫昏緫
+        /// </summary>
+        private static HdlHttpLogic m_Current = null;
+        /// <summary>
+        /// Http璁块棶閫昏緫
+        /// </summary>
+        public static HdlHttpLogic Current
+        {
+            get
+            {
+                if (m_Current == null)
+                {
+                    m_Current = new HdlHttpLogic();
+                }
+                return m_Current;
+            }
+        }
+
+        #endregion
+
+        #region 鈻� 绗笁鏂规帴鍙h闂甠____________________
+
+        /// <summary>
+        /// 绗笁鏂规帴鍙h闂�
+        /// </summary>
+        /// <param name="requestFullUrl">璇锋眰Url鐨勫畬鎴愯矾寰�</param>
+        /// <param name="contentType">text/html 鎴栬�� application/json</param>
+        /// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
+        /// <param name="timeout">瓒呮椂,榛樿5绉�</param>
+        /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
+        public byte[] RequestThridPartyHttps(string requestFullUrl, string contentType = "text/html", string requestMethod = "GET", int timeout = 5)
+        {
+            try
+            {
+                //鍒濆鍖栨柊鐨剋ebRequst
+                //1锛� 鍒涘缓httpWebRequest瀵硅薄
+                var webRequest = (HttpWebRequest)WebRequest.Create(new Uri(requestFullUrl));
+
+                //2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄
+                webRequest.Method = requestMethod;
+                webRequest.Timeout = timeout * 1000;
+                //鍙栨秷浣跨敤浠g悊璁块棶
+                webRequest.Proxy = null;
+                webRequest.UseDefaultCredentials = false;
+                webRequest.ContentType = contentType;
+
+                //4锛� 璇诲彇鏈嶅姟鍣ㄧ殑杩斿洖淇℃伅
+                var response = (HttpWebResponse)webRequest.GetResponse();
+                using (var stream = response.GetResponseStream())
+                {
+                    if (stream == null)
+                    {
+                        return null;
+                    }
+                    var ms = new System.IO.MemoryStream();
+                    var bytes = new byte[1024];
+                    var len = int.MaxValue;
+                    while (stream.CanRead && 0 < len)
+                    {
+                        len = stream.Read(bytes, 0, bytes.Length);
+                        ms.Write(bytes, 0, len);
+                    }
+                    return ms.ToArray();
+                }
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index e0c1f4e..e3836b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -43,6 +43,10 @@
         /// 鎵�鏈夌殑鎴块棿淇℃伅
         /// </summary>
         private Dictionary<string, Room> dicRooms = new Dictionary<string, Room>();
+        /// <summary>
+        /// 鐗╃悊璁惧灞炰簬鍝釜鎴块棿鐨勮褰�
+        /// </summary>
+        private Dictionary<string, string> dicDeviceRoomId = null;
 
         #endregion
 
@@ -295,7 +299,7 @@
             HdlAutoBackupLogic.DeleteFile(roomFilePath);
 
             //鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
-            Common.LocalDevice.Current.DeleteRealDeviceByRoomId(roomId);
+            HdlRoomLogic.Current.DeleteRealDeviceByRoomId(roomId);
             if (refreshLeftView == true)
             {
                 //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
@@ -542,6 +546,219 @@
             return listRoom;
         }
 
+        /// <summary>
+        /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
+        /// </summary>
+        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+        /// <returns></returns>
+        public Room GetRoomByGateway(ZbGateway zbGateway)
+        {
+            return this.GetRoomByGateway(zbGateway.GwId);
+        }
+
+        /// <summary>
+        /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
+        /// </summary>
+        /// <param name="gatewayId">缃戝叧ID</param>
+        /// <returns></returns>
+        public Room GetRoomByGateway(string gatewayId)
+        {
+            var localGateway = HdlGatewayLogic.Current.GetLocalGateway(gatewayId);
+            if (localGateway == null)
+            {
+                return null;
+            }
+            return HdlRoomLogic.Current.GetRoomById(localGateway.RoomId);
+        }
+
+        /// <summary>
+        /// 鍙樻洿缃戝叧鎴块棿
+        /// </summary>
+        /// <param name="gwId">缃戝叧Id</param>
+        /// <param name="roomId">鎴块棿ID</param>
+        public void ChangedGatewayRoom(string gwId, string roomId)
+        {
+            var localGateway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
+            if (localGateway != null)
+            {
+                localGateway.RoomId = roomId;
+                localGateway.ReSave();
+                //娣诲姞澶囦唤
+                HdlAutoBackupLogic.AddOrEditorFile(localGateway.FilePath);
+            }
+        }
+
+        #endregion
+
+
+        #region 鈻� 鐗╃悊璁惧鎵�灞炴埧闂確__________________
+
+        /// <summary>
+        /// 鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
+        /// </summary>
+        public void InitRealDeviceRoomId()
+        {
+            this.dicDeviceRoomId = new Dictionary<string, string>();
+            string fullName = DirNameResourse.DeviceRoomIdFile;
+            var strData = HdlFileLogic.Current.ReadFileTextContent(fullName);
+            if (strData != null)
+            {
+                this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, string> GetAllRealDeviceRoomData()
+        {
+            return this.dicDeviceRoomId;
+        }
+
+        /// <summary>
+        /// 淇濆瓨鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
+        /// </summary>
+        /// <param name="listDevice">闇�瑕佷繚瀛樼殑璁惧瀵硅薄</param>
+        /// <param name="roomId">闇�瑕佷繚瀛樼殑鍝釜璁惧鐨勬埧闂碔D</param>
+        /// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
+        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
+        {
+            if (listDevice == null || listDevice.Count == 0)
+            {
+                return;
+            }
+            //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
+            if (saveRoadDevice == true && listDevice.Count == 1)
+            {
+                if ((listDevice[0] is OTADevice) == false)
+                {
+                    //ota璁惧涓嶉渶瑕佸鐞�
+                    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)
+                    {
+                        this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+                        save = true;
+                    }
+                }
+            }
+
+            if (save == true)
+            {
+                //淇濆瓨璁板綍
+                HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
+
+                //娣诲姞鑷姩澶囦唤
+                HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鐪熷疄鐗╃悊璁惧鐨勬埧闂村悕瀛�
+        /// </summary>
+        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
+        /// <returns></returns>
+        public string GeteRealDeviceRoomName(CommonDevice device)
+        {
+            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
+            {
+                //鏈垎閰嶅尯鍩�
+                return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+            }
+            var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+            return HdlRoomLogic.Current.GetRoomName(room);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鐪熷疄鐗╃悊璁惧灞炰簬鍝釜鎴块棿
+        /// </summary>
+        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
+        /// <returns></returns>
+        public Room GeteRealDeviceRoom(CommonDevice device)
+        {
+            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
+            {
+                return null;
+            }
+            return HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+        }
+
+        /// <summary>
+        /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+        /// </summary>
+        /// <param name="device">闅忎究涓�涓洖璺�</param>
+        public void DeleteRealDeviceFromRoom(CommonDevice device)
+        {
+            //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+            this.DeleteRealDeviceFromRoom(new List<string>() { device.DeviceAddr });
+        }
+
+        /// <summary>
+        /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+        /// </summary>
+        /// <param name="listMac">璁惧Mac鍦板潃</param>
+        public void DeleteRealDeviceFromRoom(List<string> listMac)
+        {
+            bool save = false;
+            foreach (var deviceMacAddr in listMac)
+            {
+                if (this.dicDeviceRoomId.ContainsKey(deviceMacAddr) == true)
+                {
+                    this.dicDeviceRoomId.Remove(deviceMacAddr);
+                    save = true;
+                }
+            }
+            if (save == false)
+            {
+                //娌℃湁鏀瑰彉,涓嶉渶瑕佷繚瀛�
+                return;
+            }
+            //淇濆瓨璁板綍
+            HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
+
+            //娣诲姞鑷姩澶囦唤
+            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
 
         #region 鈻� 鎴块棿鏂规硶___________________________
@@ -628,7 +845,7 @@
                 if (i_room.IsLove == false && saveRealRoom == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
                 {
                     //濡傛灉鍙湁涓�涓洖璺�,鍒欎慨鏀圭湡瀹炵墿鐞嗚澶囩殑鎴块棿
-                    LocalDevice.Current.SaveRealDeviceRoomId(new List<CommonDevice>() { device }, i_room.Id, false);
+                    this.SaveRealDeviceRoomId(new List<CommonDevice>() { device }, i_room.Id, false);
                 }
             }
         }
@@ -678,7 +895,7 @@
             if (deleteReal == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
             {
                 //鍒犻櫎鎺夊畠鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�鍦ㄤ綅缃�
-                LocalDevice.Current.DeleteRealDeviceFromRoom(device);
+                HdlRoomLogic.Current.DeleteRealDeviceFromRoom(device);
             }
 
             //鏍规嵁璁惧锛岃幏鍙栨墍鍦ㄧ殑鎴块棿
@@ -1107,7 +1324,7 @@
             var houseInfo = new AreaSpaceInfo();
             houseInfo.name = Common.Config.Instance.Home.Name;
             houseInfo.uid = Common.Config.Instance.Home.Id;
-            houseInfo.parentId = "null";
+            houseInfo.parentId = null;
             listAreaSpaceInfo.Add(houseInfo);
             //鐒跺悗娣诲姞妤煎眰
             foreach (var floorId in Common.Config.Instance.Home.FloorDics.Keys)
@@ -1150,7 +1367,7 @@
             gatewayInfo.uid = "000101" + gwMac.Substring(2) + "07";
             gatewayInfo.name = HdlGatewayLogic.Current.GetGatewayName(loaclGateway);
 
-            var roomGateway = HdlGatewayLogic.Current.GetRoomByGateway(loaclGateway);
+            var roomGateway = HdlRoomLogic.Current.GetRoomByGateway(loaclGateway);
             if (roomGateway != null)
             {
                 gatewayInfo.parentId = roomGateway.Id;
@@ -1171,8 +1388,13 @@
                 {
                     //鍒涘缓鏂囦欢瀵硅薄
                     var result0 = await realMain.CreateFileAsync("DeviceRoomInfo.json");
-                    if (result0 == null || result0.Result != 0)
+                    if (result0 == null)
                     {
+                        return;
+                    }
+                    if (result0.Result != 0 && result0.Result != 2)
+                    {
+                        //濡傛灉鏄�2,鍏佽涓婁紶
                         return;
                     }
                     //鍙戦�佹暟鎹祦
@@ -1187,10 +1409,15 @@
 
                 //鍒涘缓鏂囦欢瀵硅薄
                 var result3 = await realMain.CreateFileAsync("space.json");
-                if (result3 == null || result3.Result != 0)
+                if (result3 == null)
                 {
                     return;
                 }
+                if (result3.Result != 0 && result3.Result != 2)
+                {
+                    //濡傛灉鏄�2,鍏佽涓婁紶
+                    return;
+                }
 
                 //鍙戦�佸尯鍩熶俊鎭�
                 var byteData2 = ASCIIEncoding.UTF8.GetBytes(strSendRoomInfo);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index c7bc442..2b14197 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -436,7 +436,7 @@
                     //鏂帀鏈湴杩炴帴
                     HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
                     //鏂帀杩滅▼
-                    ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+                    ZigBee.Device.ZbGateway.CloseRemoteConnectionOnForce();
 
                     //濡傛灉鏄痺ifi
                     if (value == 2)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index d8943b3..792151e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -524,7 +524,7 @@
             HdlThreadLogic.Current.RunThread(async () =>
             {
                 HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
-                await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+                await ZigBee.Device.ZbGateway.CloseRemoteConnectionOnForce();
             }, ShowErrorMode.NO);
         }
 
@@ -613,7 +613,7 @@
                 //鏂紑杩滅▼Mqtt杩炴帴
                 HdlThreadLogic.Current.RunThread(async () =>
                 {
-                    await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+                    await ZigBee.Device.ZbGateway.CloseRemoteConnectionOnForce();
                 }, ShowErrorMode.NO);
 
                 HdlThreadLogic.Current.RunMain(() =>
@@ -867,7 +867,7 @@
                 HdlThreadLogic.Current.RunThread(async () =>
                 {
                     HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
-                    await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+                    await ZigBee.Device.ZbGateway.CloseRemoteConnectionOnForce();
                 }, ShowErrorMode.NO);
 
                 //鍒锋柊APP鍓嶄竴娆¢�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
index d2d4fe5..a47dd9c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
@@ -175,7 +175,7 @@
                     }
                 }
                 //淇濆瓨璁惧鎴块棿绱㈠紩
-                Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
+                HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
             };
 
             //鏇村閰嶇疆
@@ -328,7 +328,7 @@
                 HdlRoomLogic.Current.DeleteDevice(device);
                 HdlRoomLogic.Current.DeleteLoveDevice(device);
             }
-            Common.LocalDevice.Current.DeleteRealDeviceFromRoom(this.listNewDevice[0]);
+            HdlRoomLogic.Current.DeleteRealDeviceFromRoom(this.listNewDevice[0]);
         }
 
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
index 0276008..caaab50 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
@@ -116,8 +116,16 @@
             var rowSerial = new FrameRowControl(listView.rowSpace / 2);
             rowSerial.UseClickStatu = false;
             listView.AddChidren(rowSerial);
-            rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 400);
-            rowSerial.AddMostRightView(listDevice[0].SerialNumber != string.Empty ? listDevice[0].SerialNumber : listDevice[0].DeviceAddr, 600);
+            rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 400);
+            if (Common.LocalDevice.Current.IsHdlDevice(listDevice[0]) == false)
+            {
+                //绗笁鏂硅澶囧浐瀹氫娇鐢∕ac
+                rowSerial.AddMostRightView(listDevice[0].DeviceAddr, 600);
+            }
+            else
+            {
+                rowSerial.AddMostRightView(listDevice[0].SerialNumber != string.Empty ? listDevice[0].SerialNumber : listDevice[0].DeviceAddr, 600);
+            }
             rowSerial.AddBottomLine();
 
             //MAC
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 7ab4139..83fbee8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -1224,9 +1224,9 @@
             /// </summary>
             private NormalViewControl btnName = null;
             /// <summary>
-            /// 鍦ㄧ嚎鐘舵��
+            /// 鍦ㄧ嚎鐘舵��(鍒濆鐘舵�佷负鍦ㄧ嚎)
             /// </summary>
-            public bool isOnline = false;
+            public bool isOnline = true;
 
             /// <summary>
             /// 鑷畾涔夌綉鍏虫帶浠�
@@ -1271,11 +1271,11 @@
                 {
                     btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
                     //鍦ㄧ嚎鐘舵��
-                    this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);
-                    if (this.isOnline == false)
-                    {
-                        btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
-                    }
+                    //this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);
+                    //if (this.isOnline == false)
+                    //{
+                    //    btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
+                    //}
                 }
                 else
                 {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 1c5f6ca..41d5c74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -227,7 +227,7 @@
                     }
                 }
                 //淇濆瓨璁惧鎴块棿绱㈠紩
-                Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
+                HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
             };
 
             //娣诲姞鍏ㄩ儴鑿滃崟
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
index 1661741..51e3ab6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -35,7 +35,7 @@
 
             //鍒濆鍖栦腑閮ㄦ帶浠�
             this.InitMiddleFrame();
-
+
             this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId);
         }
 
@@ -211,23 +211,23 @@
             rowThrid.ButtonClickEvent += (sender, e) =>
             {
                 rowThrid.CanClick = false;
-                HdlThreadLogic.Current.RunThread(() =>
+                HdlThreadLogic.Current.RunThread(() =>
                 {
                     //妫�娴嬬綉鍏�
                     var errorMsg = this.CheckGateway();
-                    HdlThreadLogic.Current.RunMain(() =>
+                    HdlThreadLogic.Current.RunMain(() =>
                     {
-                        rowThrid.CanClick = true;
-                        if (errorMsg != null)
-                        {
-                            this.ShowMassage(ShowMsgType.Tip, errorMsg);
-                        }
-                        else
-                        {
-                            var form = new Device.DeviceSearchForm();
-                            form.AddForm(string.Empty);
-                        }
-                    });
+                        rowThrid.CanClick = true;
+                        if (errorMsg != null)
+                        {
+                            this.ShowMassage(ShowMsgType.Tip, errorMsg);
+                        }
+                        else
+                        {
+                            var form = new Device.DeviceSearchForm();
+                            form.AddForm(string.Empty);
+                        }
+                    });
                 });
             };
 
@@ -244,8 +244,8 @@
         /// </summary>
         private string CheckGateway()
         {
-            if (zbGateway != null && zbGateway.LinuxImageType == 11)
-            {
+            if (zbGateway != null && zbGateway.LinuxImageType == 11)
+            {
                 //mini澶滅伅鍙兘闄愬埗鍔犲叆16鍜岃澶�
                 this.ShowProgressBar();
 
@@ -254,7 +254,7 @@
                 var listDevice = Common.LocalDevice.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO);
                 if (statu != 1)
                 {
-                    //濡傛灉
+                    //濡傛灉
                     listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(zbGateway.GwId);
                 }
                 //妫�娴媘ini缃戝叧鐨勮澶囨暟
@@ -266,17 +266,17 @@
                         listMac.Add(device.DeviceAddr);
                     }
                 }
-                this.CloseProgressBar();
-
+                this.CloseProgressBar();
+
                 bool canAdd = listMac.Count < 16;
-                if (canAdd == false)
-                {
-                    //Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
-                    return Language.StringByID(R.MyInternationalizationString.uMiniGatewayMaxDeviceCountMsg);
-                }
-            }
-
-            return null;
+                if (canAdd == false)
+                {
+                    //Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
+                    return Language.StringByID(R.MyInternationalizationString.uMiniGatewayMaxDeviceCountMsg);
+                }
+            }
+
+            return null;
         }
 
         #endregion
@@ -309,25 +309,25 @@
             if (formName != string.Empty)
             {
                 rowLayout.ButtonClickEvent += (sender, e) =>
-                {
+                {
                     rowLayout.CanClick = false;
-                    HdlThreadLogic.Current.RunThread(() =>
+                    HdlThreadLogic.Current.RunThread(() =>
                     {
                         //妫�娴嬬綉鍏�
                         var errorMsg = this.CheckGateway();
-                        HdlThreadLogic.Current.RunMain(() =>
+                        HdlThreadLogic.Current.RunMain(() =>
                         {
-                            rowLayout.CanClick = true;
-                            if (errorMsg != null)
-                            {
-                                this.ShowMassage(ShowMsgType.Tip, errorMsg);
-                            }
-                            else
-                            {
-                                //鍙嶅皠鐩爣鐣岄潰
-                                this.LoadFormByFullName("Shared.Phone.UserCenter.DeviceDirection." + formName);
-                            }
-                        });
+                            rowLayout.CanClick = true;
+                            if (errorMsg != null)
+                            {
+                                this.ShowMassage(ShowMsgType.Tip, errorMsg);
+                            }
+                            else
+                            {
+                                //鍙嶅皠鐩爣鐣岄潰
+                                this.LoadFormByFullName("Shared.Phone.UserCenter.DeviceDirection." + formName);
+                            }
+                        });
                     });
                 };
             }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index eb1ccdc..655759b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -152,7 +152,7 @@
             //璁惧澶囨敞
             string caption = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
             string deviceName = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
-            var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+            var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
             btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
             listview.AddChidren(btnNote);
             btnNote.InitControl();
@@ -207,7 +207,7 @@
                     }
                 }
                 //淇濆瓨璁惧鎴块棿绱㈠紩
-                Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
+                HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
             };
 
             //璁惧妯″潡
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
index d4db8a5..fdf3e45 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
@@ -351,10 +351,17 @@
             {
                 var way = ZbGateway.GateWayList[i];
                 var wayId = way.GwId;
-                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
-                if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false)
+
+                if (dicZbGatewayDiv.ContainsKey(wayId) == true)
                 {
                     //宸茬粡澶勭悊浜�
+                    continue;
+                }
+                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+                if (way.localIsConnected == false)
+                {
+                    string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂  ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+                    HdlLogLogic.Current.WriteLog(-1, strMsg);
                     continue;
                 }
 
@@ -384,7 +391,7 @@
                 if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
-                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
                     if (result == false)
                     {
                         continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 86c7e3c..d8c4356 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -358,9 +358,15 @@
             for (int i = 0; i < listId.Count; i++)
             {
                 ZbGateway way = ZbGateway.GateWayList.Find((obj) => obj.GwId == listId[i]);
-                if (way == null || way.localIsConnected == false)
+                if (way == null)
                 {
-                    //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+                    continue;
+                }
+                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+                if (way.localIsConnected == false)
+                {
+                    string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂  ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+                    HdlLogLogic.Current.WriteLog(-1, strMsg);
                     continue;
                 }
 
@@ -390,7 +396,7 @@
                 if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
-                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
                     if (result == false)
                     {
                         continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index 10c6f79..e98090b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -347,10 +347,16 @@
             {
                 var way = ZbGateway.GateWayList[i];
                 var wayId = way.GwId;
-                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
-                if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false)
+                if (dicZbGatewayDiv.ContainsKey(wayId) == true)
                 {
                     //宸茬粡澶勭悊浜�
+                    continue;
+                }
+                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+                if (way.localIsConnected == false)
+                {
+                    string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂  ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+                    HdlLogLogic.Current.WriteLog(-1, strMsg);
                     continue;
                 }
 
@@ -380,7 +386,7 @@
                 if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
-                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
                     if (result == false)
                     {
                         continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
index b3e43a9..b9ce2cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -347,10 +347,16 @@
             {
                 var way = ZbGateway.GateWayList[i];
                 var wayId = way.GwId;
-                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
-                if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false)
+                if (dicZbGatewayDiv.ContainsKey(wayId) == true)
                 {
                     //宸茬粡澶勭悊浜�
+                    continue;
+                }
+                //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+                if (way.localIsConnected == false)
+                {
+                    string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂  ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+                    HdlLogLogic.Current.WriteLog(-1, strMsg);
                     continue;
                 }
 
@@ -380,7 +386,7 @@
                 if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
-                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
                     if (result == false)
                     {
                         continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index 8ecc85c..b07d110 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -70,7 +70,7 @@
             string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
             string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
             var btnNote = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
-            btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
+            btnNote.txtInput.MaxByte = 32;//闄愬埗鍙兘杈撳叆32涓瓧鑺�
             listview.AddChidren(btnNote);
             btnNote.InitControl();
             //鍒掔嚎
@@ -112,7 +112,7 @@
             rowBeloneArea.SelectRoomEvent += (roomKeys) =>
             {
                 //鍙樻洿缃戝叧鎴块棿
-                HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
+                HdlRoomLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
             };
             //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
             if (Common.Config.Instance.Home.IsShowTemplate == true)
@@ -294,8 +294,29 @@
         /// </summary>
         private void ShowTopRightMenu()
         {
-            bool flage = UserCenterResourse.DicActionForm.ContainsKey("NewGateWayMenuSelectForm");
-            var frame = new TopRightMenuControl(flage == true ? 1 : 3, 1);
+            //鎼滅储缃戝叧鐨勬椂鍊�,涓嶈兘鍒犻櫎,涓嶇粰浠栧垏鎹�,鍙湁瀹氫綅鍔熻兘
+            bool isSearchGw = UserCenterResourse.DicActionForm.ContainsKey("NewGateWayMenuSelectForm");
+            int menuCount = isSearchGw == true ? 1 : 3;
+
+            bool canAddReplaceMenu = false;
+            //鑾峰彇鏈湴缃戝叧
+            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
+            foreach (var gw in listGateway)
+            {
+                if (gw.GwId != this.zbGateway.GwId && gw.LinuxImageType == this.zbGateway.LinuxImageType)
+                {
+                    //濡傛灉鏄悓涓�绉嶇被鍨嬬殑缃戝叧,鍏佽鍑虹幇鏇挎崲鑿滃崟
+                    canAddReplaceMenu = true;
+                    break;
+                }
+            }
+            if (canAddReplaceMenu == true
+                && Common.Config.Instance.Home.IsShowTemplate == false
+                && Common.Config.Instance.Home.IsVirtually == false)
+            {
+                //menuCount++;
+            }
+            var frame = new TopRightMenuControl(menuCount, 1);
             //瀹氫綅
             string MenuName = Language.StringByID(R.MyInternationalizationString.uFixedPosition);
             frame.AddRowMenu(MenuName, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
@@ -303,53 +324,60 @@
                 //鍙戦�佸畾浣嶅姛鑳�
                 HdlGatewayLogic.Current.SetFixedPositionCommand(zbGateway);
             });
-            if (flage == true)
-            {
-                //鎼滅储缃戝叧鐨勬椂鍊�,涓嶈兘鍒犻櫎,涓嶇粰浠栧垏鎹�
-                return;
-            }
 
-            //鍒囨崲
-            MenuName = Language.StringByID(R.MyInternationalizationString.uSwitch1);
-            string strWayId = this.zbGateway.GwId;
-            if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+            //鎼滅储缃戝叧鐨勬椂鍊�,涓嶈兘鍒犻櫎,涓嶇粰浠栧垏鎹�
+            if (isSearchGw == false)
             {
-                MenuName = Language.StringByID(R.MyInternationalizationString.uRefresh);
-            }
-            frame.AddRowMenu(MenuName, "Item/GwSwitchIcon.png", "Item/GwSwitchIconSelected.png", () =>
-            {
-                string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
-                //鏄惁鍒囨崲鍒皗0}缃戝叧?
-                string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + nameValue + "]");
+                //鍒囨崲
+                MenuName = Language.StringByID(R.MyInternationalizationString.uSwitch1);
+                string strWayId = this.zbGateway.GwId;
                 if (strWayId == GatewayResourse.AppOldSelectGatewayId)
                 {
-                    //鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
-                    msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + nameValue + "]");
+                    MenuName = Language.StringByID(R.MyInternationalizationString.uRefresh);
                 }
-                this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+                frame.AddRowMenu(MenuName, "Item/GwSwitchIcon.png", "Item/GwSwitchIconSelected.png", () =>
                 {
-                    HdlThreadLogic.Current.RunThread(() =>
+                    string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
+                    //鏄惁鍒囨崲鍒皗0}缃戝叧?
+                    string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + nameValue + "]");
+                    if (strWayId == GatewayResourse.AppOldSelectGatewayId)
                     {
-                        //鎵ц鍒囨崲缃戝叧鎿嶄綔
-                        this.DoSwitchGateway();
+                        //鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
+                        msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + nameValue + "]");
+                    }
+                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+                    {
+                        HdlThreadLogic.Current.RunThread(() =>
+                        {
+                            //鎵ц鍒囨崲缃戝叧鎿嶄綔
+                            this.DoSwitchGateway();
+                        });
                     });
                 });
-            });
-            //鍒犻櫎
-            MenuName = Language.StringByID(R.MyInternationalizationString.uDelete);
-            frame.AddRowMenu(MenuName, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
-            {
-                //濡傜Щ闄ょ綉鍏筹紝璇ョ綉鍏崇粦瀹氱殑璁惧鍒楄〃{0}灏嗘竻绌猴紝纭缁х画鎵ц璇ユ搷浣滐紵
-                string msg = Language.StringByID(R.MyInternationalizationString.uUnBindedMsg);
-                if (msg.Contains("{0}") == true)
+                //鍒犻櫎
+                MenuName = Language.StringByID(R.MyInternationalizationString.uDelete);
+                frame.AddRowMenu(MenuName, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
                 {
-                    msg = string.Format(msg, "\r\n");
-                }
-                this.ShowMassage(ShowMsgType.Confirm, msg, () =>
-                {
-                    this.DeleteGateway(strWayId);
+                    //濡傜Щ闄ょ綉鍏筹紝璇ョ綉鍏崇粦瀹氱殑璁惧鍒楄〃{0}灏嗘竻绌猴紝纭缁х画鎵ц璇ユ搷浣滐紵
+                    string msg = Language.StringByID(R.MyInternationalizationString.uUnBindedMsg);
+                    if (msg.Contains("{0}") == true)
+                    {
+                        msg = string.Format(msg, "\r\n");
+                    }
+                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+                    {
+                        this.DeleteGateway(strWayId);
+                    });
                 });
-            });
+            }
+            //if (canAddReplaceMenu == true)
+            //{
+            //    //鏇挎崲
+            //    MenuName = Language.StringByID(R.MyInternationalizationString.uReplace);
+            //    frame.AddRowMenu(MenuName, null, "Item/ReplaceIconSelected.png", () =>
+            //    {
+            //    });
+            //}
         }
         #endregion
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index 7e242da..70dd808 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -94,7 +94,7 @@
             if (gateWayExist == true)
             {
                 btnGateName = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
-                btnGateName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
+                btnGateName.txtInput.MaxByte = 32;//闄愬埗鍙兘杈撳叆32涓瓧鑺�
                 listview.AddChidren(btnGateName);
                 btnGateName.InitControl();
                 //鍒掔嚎
@@ -142,7 +142,7 @@
             rowBeloneArea.SelectRoomEvent += (roomKeys) =>
             {
                 //鍙樻洿缃戝叧鎴块棿
-                HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
+                HdlRoomLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
             };
 
             //瀹屾垚鍒濆鍖栨甯�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
new file mode 100644
index 0000000..6219ad7
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
@@ -0,0 +1,184 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.Gateway
+{
+    /// <summary>
+    /// 缃戝叧鏇挎崲鐣岄潰
+    /// </summary>
+    public class GatewayReplaceForm : EditorCommonForm
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
+        /// <summary>
+        /// 褰撳墠缃戝叧瀵硅薄
+        /// </summary>
+        private ZbGateway nowZbGateway = null;
+        /// <summary>
+        /// 鍒楄〃鎺т欢
+        /// </summary>
+        private VerticalListControl listView = null;
+        /// <summary>
+        /// 纭鎸夐挳
+        /// </summary>
+        private BottomClickButton btnConfirm = null;
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勭姸鎬佹帶浠� MainKey鏄綉鍏矷D
+        /// </summary>
+        private MostRightIconControl btnSelectIcon = null;
+
+        #endregion
+
+        #region 鈻� 鍒濆鍖朹____________________________
+
+        /// <summary>
+        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+        /// </summary>
+        /// <param name="i_zbGateway">褰撳墠缃戝叧瀵硅薄</param>
+        public void ShowForm(ZbGateway i_zbGateway)
+        {
+            this.nowZbGateway = i_zbGateway;
+
+            //璁剧疆鏍囬淇℃伅
+            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uReplaceGateway));
+
+            //鍒濆鍖栦腑閮ㄦ帶浠�
+            this.InitMiddleFrame();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄦ帶浠�
+        /// </summary>
+        private void InitMiddleFrame()
+        {
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
+            //纭畾鎸夐挳
+            this.btnConfirm = new BottomClickButton();
+            btnConfirm.TextID = R.MyInternationalizationString.uConfirm1;
+            btnConfirm.oldBackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
+            bodyFrameLayout.AddChidren(btnConfirm);
+            btnConfirm.CanClick = false;
+            btnConfirm.ButtonClickEvent += (sender, e) =>
+            {
+                //鎵ц缃戝叧鏇挎崲鎿嶄綔
+                this.DoReplaceGateway();
+            };
+
+            //璇烽�夋嫨琚浛鎹㈢殑缃戝叧
+            var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+            btnMsg.Y = btnConfirm.Yaxis - Application.GetRealHeight(50 + 35);
+            btnMsg.TextSize = 12;
+            btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnMsg.TextAlignment = TextAlignment.Center;
+            btnMsg.TextID = R.MyInternationalizationString.uPleaseSelectGatewayToBeReplaced;
+            bodyFrameLayout.AddChidren(btnMsg);
+
+            this.listView = new VerticalListControl(29);
+            listView.Height = btnMsg.Y - Application.GetRealHeight(23);
+            listView.BackgroundColor = UserCenterColor.Current.White;
+            bodyFrameLayout.AddChidren(listView);
+
+            HdlThreadLogic.Current.RunMainInThread(() =>
+            {
+                //璁惧畾涓儴淇℃伅
+                this.SetMiddleFrameInfo();
+            });
+        }
+
+        /// <summary>
+        /// 璁惧畾涓儴淇℃伅
+        /// </summary>
+        private void SetMiddleFrameInfo()
+        {
+            //鑾峰彇鏈湴鍏ㄩ儴缃戝叧瀵硅薄
+            List<ZbGateway> listway = HdlGatewayLogic.Current.GetAllLocalGateway();
+            var listShowWay = new List<ZbGateway>();
+            for (int i = 0; i < listway.Count; i++)
+            {
+                //鍙湁绫诲瀷鐩稿悓鐨勭綉鍏�,鎵嶈兘鏄剧ず
+                if (listway[i].GwId != this.nowZbGateway.GwId && listway[i].LinuxImageType == this.nowZbGateway.LinuxImageType)
+                {
+                    listShowWay.Add(listway[i]);
+                }
+            }
+            for (int i = 0; i < listShowWay.Count; i++)
+            {
+                //娣诲姞琛�
+                this.AddRowLayout( listShowWay[i], i != listShowWay.Count - 1);
+            }
+
+            //璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
+            this.listView.AdjustRealHeight(Application.GetRealHeight(23));
+        }
+
+        #endregion
+
+        #region 鈻� 娣诲姞缃戝叧琛宊________________________
+
+        /// <summary>
+        /// 娣诲姞琛�
+        /// </summary>
+        /// <param name="localWay">鏈湴缃戝叧</param>
+        /// <param name="addLine">鏄惁娣诲姞搴曠嚎</param>
+        private void AddRowLayout(ZbGateway localWay, bool addLine)
+        {
+            var frameRow = new FrameRowControl(this.listView.rowSpace / 2);
+            this.listView.AddChidren(frameRow);
+
+            //鍥炬爣
+            var btnIcon = frameRow.AddLeftIcon();
+            HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, localWay);
+
+            //鏄剧ず鏂囨湰
+            var wayName = HdlGatewayLogic.Current.GetGatewayName(localWay);
+            if (wayName == string.Empty)
+            {
+                //鏃犳硶璇嗗埆鐨勭綉鍏宠澶�
+                wayName = Language.StringByID(R.MyInternationalizationString.uUnDistinguishTheGatewayDevice);
+            }
+            frameRow.AddTopView(wayName, 700);
+
+            //鎴块棿
+            var room = HdlRoomLogic.Current.GetRoomByGateway(localWay.GwId);
+            var roomName = HdlRoomLogic.Current.GetRoomName(room);
+            frameRow.AddBottomView(roomName, 700);
+
+            //閫夋嫨鐘舵��
+            var btnSelect = frameRow.AddMostRightEmptyIcon(58, 58);
+            btnSelect.MainKey = localWay.GwId;
+            btnSelect.Visible = false;
+            btnSelect.UnSelectedImagePath = "Item/ItemSelected.png";
+
+            if (addLine == true)
+            {
+                //搴曠嚎
+                frameRow.AddBottomLine();
+            }
+            btnSelect.ButtonClickEvent += (sender, e) =>
+            {
+                if (this.btnSelectIcon != null) { this.btnSelectIcon.IsSelected = false; }
+
+                btnSelect.IsSelected = true;
+                this.btnSelectIcon = btnSelect;
+                this.btnConfirm.CanClick = true;
+            };
+        }
+
+        #endregion
+
+        #region 鈻� 鎵ц缃戝叧鏇挎崲鎿嶄綔___________________
+
+        /// <summary>
+        /// 鎵ц缃戝叧鏇挎崲鎿嶄綔
+        /// </summary>
+        private void DoReplaceGateway()
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index bf22b16..27cbe3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -321,6 +321,14 @@
         {
             HdlThreadLogic.Current.RunThread(() =>
             {
+                //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+                var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+                if (result2 == false)
+                {
+                    //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+                    this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�");
+                    return;
+                }
                 //鍒涘缓涓�涓浠藉悕瀛�
                 string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
                 if (backupClassId == null)
@@ -365,6 +373,14 @@
         {
             HdlThreadLogic.Current.RunThread(() =>
             {
+                //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+                var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+                if (result2 == false)
+                {
+                    //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+                    this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�");
+                    return;
+                }
                 int result = HdlAutoBackupLogic.DoUpLoadAutoBackupDataByHand();
                 if (result == -1)
                 {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 625a70e..678df88 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -269,34 +269,30 @@
                 };
             }
 
-#if Android
             row1 = new FrameRowControl(listView.rowSpace / 2);
             row1.UseClickStatu = false;
             listView.AddChidren(row1);
-            row1.AddLeftCaption("涓婃姤GBS瀹氫綅鍔熻兘", 500);
+            row1.AddLeftCaption("璁板綍瀹氫綅", 500);
             row1.AddBottomLine();
             var btnGbsSwitch = row1.AddMostRightSwitchIcon();
-            if (System.IO.File.Exists(DirNameResourse.OpenGbsFile) == true)
-            {
-                btnGbsSwitch.IsSelected = true;
-            }
             btnGbsSwitch.ButtonClickEvent += (sender, e) =>
             {
-                this.ShowMassage(ShowMsgType.Confirm, "娉ㄦ剰:寮�鍚垨鑰呭叧闂鍔熻兘浼氶噸鍚疉pp", () =>
+                if (btnGbsSwitch.IsSelected == true)
                 {
-                    btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;
-                    if (btnGbsSwitch.IsSelected == true)
-                    {
-                        HdlFileLogic.Current.SaveTextToFile(DirNameResourse.OpenGbsFile, "nmsl");
-                    }
-                    else
-                    {
-                        HdlFileLogic.Current.DeleteFile(DirNameResourse.OpenGbsFile);
-                    }
-                    HDLUtils.RestartApp();
-                });
+                    btnGbsSwitch.IsSelected = false;
+                    UserCenterResourse.HideOption.WriteGpsPoint = 0;
+                    return;
+                }
+                this.ShowDialogInputForm("????", string.Empty, "璇疯緭鍏ヨ瘑鍒爜", (contr, value) =>
+                 {
+                     if (value == "542397")
+                     {
+                         UserCenterResourse.HideOption.WriteGpsPoint = 1;
+                         btnGbsSwitch.IsSelected = true;
+                     }
+                     contr.CloseDialog();
+                 });
             };
-#endif
 
             row1 = new FrameRowControl(listView.rowSpace / 2);
             listView.AddChidren(row1);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
index 3484cb6..d37511f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
@@ -586,6 +586,15 @@
             this.ShowProgressBar();
             HdlThreadLogic.Current.RunThread(() =>
             {
+                //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+                var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+                if (result2 == false)
+                {
+                    //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+                    this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂版搷浣�");
+                    this.CloseProgressBar();
+                    return;
+                }
                 //妫�娴嬪畠鏈夋病鏈夊浠�
                 var listBack = HdlBackupLogic.Current.GetBackupListNameFromDB();
                 this.CloseProgressBar();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 77b8271..02092c1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -750,25 +750,25 @@
         private void CheckAuthorityAndShowMap(NormalViewControl btnLocation)
         {
 #if Android
-            //鏄剧ず鍦板浘
-            this.ShowMap(btnLocation);
-            ////鐢宠瀹氫綅鏉冮檺
-            //((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
-            //{
-            //    if (result1 == false) { return; }
-            //    //鐢宠璇绘潈闄�
-            //    ((BaseActivity)Application.Activity).ReadWriteContact((result2) =>
-            //    {
-            //        if (result2 == false) { return; }
-            //        //鐢宠璇诲彇鎵嬫満鍙锋潈闄�
-            //        ((BaseActivity)Application.Activity).SetPermission((result3) =>
-            //        {
-            //            if (result3 == false) { return; }
-            //            //鏄剧ず鍦板浘
-            //            this.ShowMap(btnLocation);
-            //        }, "android.permission.READ_PHONE_STATE");
-            //    });
-            //});
+            //鐢宠瀹氫綅鏉冮檺
+            ((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
+            {
+                if (result1 == false) { return; }
+
+                //鐢宠鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍锛屽SD鍗′笂鍐欐枃浠�
+                ((BaseActivity)Application.Activity).SetPermission((result2) =>
+                {
+                    if (result2 == false) { return; }
+                     //璇诲彇鐢佃瘽鐘舵�佹潈闄�
+                     ((BaseActivity)Application.Activity).SetPermission((result3) =>
+                     {
+                         if (result3 == false) { return; }
+                         //鏄剧ず鍦板浘
+                         this.ShowMap(btnLocation);
+                     }, "android.permission.READ_PHONE_STATE");
+
+                }, "android.permission.WRITE_EXTERNAL_STORAGE");
+            });
 #endif
 #if iOS
             //鏄剧ず鍦板浘
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index c4691c6..b4ace58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -472,11 +472,6 @@
             btnAbountView.X -= ControlCommonResourse.XXLeft / 2;
             rowAbount.ButtonClickEvent += (sender, e) =>
             {
-                if (Common.Config.Instance.Home.IsVirtually == true)
-                {
-                    //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
-                    return;
-                }
                 var form = new Abount.AbountForm();
                 form.AddForm();
             };
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index e3904ea..09ae903 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -74,8 +74,11 @@
             BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
             Shared.Application.LocationAction += (lon, lat) =>
             {
+                //GPS鍧愭爣杞垚楂樺痉鍧愭爣
+                double out_lng, out_lat;
+                HdlGpsLocationConvertLogic.Current.WGS84_to_GCJ02(lon, lat, out out_lng, out out_lat);
                 //涓婃姤缁忕含搴�
-                Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
+                Login.AccountLogic.Instance.ReceiveAppLatAndLon(out_lng.ToString(), out_lat.ToString());
             };
         }
 
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index beab8a5..b9fc01d 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -19,6 +19,10 @@
         /// 鏄惁姝e湪鎼滅储缃戝叧
         /// </summary>
         public static bool IsSearchingGateway = false;
+        /// <summary>
+        /// 鍙戦�佺殑鏃堕棿闂撮殧(鍗曚綅:绉�)
+        /// </summary>
+        public static int SendTime = 3;
         /// <summary>
         /// 涓婁竴娆$殑浣忓畢ID
         /// </summary>
@@ -64,36 +68,45 @@
         {
             new System.Threading.Thread(() =>
             {
-                var broadBytes = new byte[44];// byteHomeId[0] ,//H
-                broadBytes[0] = 0xfe;
-                broadBytes[1] = 0x29;
-                broadBytes[2] = 0x00;
-                broadBytes[3] = 0x00;
-                broadBytes[4] = 0x00;
-                broadBytes[5] = 0x00;
-                broadBytes[6] = 0x00;
-                broadBytes[43] = 0x02;
+                var broadBytes = new byte[44];
+
                 while (true)
                 {
                     try
-                    {
-                        //妫�娴嬭兘鍚﹀彂閫佸箍鎾�
-                        if (CheckCanSendBroadcast(broadBytes) == false)
-                        {
-                            continue;
+                    {
+                        //妫�娴嬭兘鍚﹀彂閫佸箍鎾� 0:涓嶈兘鍙戦�佸箍鎾� 1:鍙互鍙戦�佸箍鎾� 2:浣忓畢ID鍙樻洿
+                        int result = CheckCanSendBroadcast();
+                        if (result == 0)
+                        {
+                            continue;
+                        }
+                        if (result == 2)
+                        {
+                            //閲嶆柊鍒濆鍖栧箍鎾暟鎹�
+                            broadBytes = new byte[44];
+                            broadBytes[0] = 0xfe;
+                            broadBytes[1] = 0x29;
+                            broadBytes[2] = 0x00;
+                            broadBytes[3] = 0x00;
+                            broadBytes[4] = 0x00;
+                            broadBytes[5] = 0x00;
+                            broadBytes[6] = 0x00;
+                            broadBytes[43] = 0x02;
+                            var tempBytes = System.Text.Encoding.UTF8.GetBytes(oldHomeID);
+                            System.Array.Copy(tempBytes, 0, broadBytes, 7, 36 < tempBytes.Length ? 36 : tempBytes.Length);
                         }
 
                         var broadcastIpAddress = new Shared.Net.NetWiFi().BroadcastIpAddress;
-                        
+                        
                         //娓呯┖鎺ユ敹鍒扮殑IP
-                        listReceiveIP.Clear();
-                        if (broadcastIpAddress.ToString() != "0.0.0.0")
+                        listReceiveIP.Clear();
+                        if (broadcastIpAddress.ToString() != "0.0.0.0")
                         {
-                            //骞挎挱鍑哄幓
-                            FindGateWaySocket.BeginSend(new System.Net.IPEndPoint(broadcastIpAddress, 7624), broadBytes);
-                        }
-                        //绛夊緟3绉�,涓嬮潰鐨勬帴鏀舵柟娉曚細鍘绘帴鏀跺箍鎾�
-                        System.Threading.Thread.Sleep(3000);
+                            //骞挎挱鍑哄幓
+                            FindGateWaySocket.BeginSend(new System.Net.IPEndPoint(broadcastIpAddress, 7624), broadBytes);
+                        }
+                        //绛夊緟3绉�,涓嬮潰鐨勬帴鏀舵柟娉曚細鍘绘帴鏀跺箍鎾�
+                        System.Threading.Thread.Sleep(SendTime * 1000);
 
                         if (listReceiveIP.Count > 0)
                         {
@@ -104,7 +117,7 @@
                         }
                         else
                         {
-                            //灞�鍩熺綉骞挎挱涓嶅埌缃戝叧
+                            //灞�鍩熺綉骞挎挱涓嶅埌缃戝叧
                             ZbGateway.IsRemote = true;
                             //褰撶綉鍏崇殑杩炴帴鏂瑰紡鏀瑰彉鏃�,璁板綍褰撳墠鐨勮繛鎺ユ柟寮�
                             Shared.Phone.UserCenter.HdlGatewayLogic.Current.CheckGatewayByConnectChanged(Shared.Phone.UserCenter.GatewayConnectMode.Remote);
@@ -137,7 +150,7 @@
                             System.Threading.Thread.Sleep(500);
                             continue;
                         }
-                        var ipEndPoint = new System.Net.IPEndPoint(0, 0);
+                        var ipEndPoint = new System.Net.IPEndPoint(IPAddress.Any, 0);
                         var bytes = FindGateWaySocket.udpClient.Receive(ref ipEndPoint);
                         if (bytes[43] == 0xA2)
                         {
@@ -187,15 +200,18 @@
                             var gateWay = ZbGateway.GateWayList.Find(obj => obj.GwId == zbGateWay.GwId);
                             if (gateWay == null)
                             {
-                                zbGateWay.OnlineTime = DateTime.Now;
+                                //鍒锋柊缃戝叧鐨勫湪绾挎椂闂寸偣
+                                Shared.Phone.UserCenter.HdlGatewayLogic.Current.RefreshGatewayOnlineTime(zbGateWay.GwId);
+
                                 ZbGateway.GateWayList.Add(zbGateWay);
                                 await zbGateWay.StartLocalMqtt(ipAddress);
                             }
                             else
-                            {
+                            {
+                                //鍒锋柊缃戝叧鐨勫湪绾挎椂闂寸偣
+                                Shared.Phone.UserCenter.HdlGatewayLogic.Current.RefreshGatewayOnlineTime(gateWay.GwId);
+
                                 gateWay.IsVirtual = false;
-                                //灏嗚缃戝叧鏍囪瘑涓恒�愬彲鎼滅储鍒帮紝鍗筹細鍦ㄧ嚎銆�
-                                gateWay.OnlineTime = DateTime.Now;
                                 if (gateWay.GwIP != ipAddress)
                                 {
                                     await gateWay.DisConnectLocalMqttClient("2");
@@ -260,6 +276,7 @@
                                 Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, data33);
                             }
                         }
+                        await System.Threading.Tasks.Task.Delay(20);
                     }
                     catch (Exception ex)
                     {
@@ -310,59 +327,60 @@
         {
             //涓轰簡閭d箞澶氬皯涓囧垎涔嬩竴鐨勫嚑鐜�,杩欓噷璁剧疆鎴愬埆鐨勫彟涓�绫荤殑鍊�
             oldHomeID = "**";
-        }
-
-        /// <summary>
-        /// 妫�娴嬭兘鍚﹀彂閫佸箍鎾�
-        /// </summary>
-        /// <returns></returns>
-        private static bool CheckCanSendBroadcast(byte[] broadBytes)
-        {
-            if (string.IsNullOrEmpty(Config.Instance.HomeId))
-            {
-                //浣忓畢ID涓虹┖鍙湁涓�绉嶅彲鑳藉氨鏄��鍑轰簡鐧诲綍锛岃繖閲岀殑涓婁竴娆′綇瀹匢D瑕佹竻绌�
-                oldHomeID = "?";
-                System.Threading.Thread.Sleep(1000);
-                return false;
-            }
-            //棣栨杩涘叆缃戝叧锛屽拰鍒囨崲浣忓畢浼氭竻闄ょ綉鍏冲垪琛紝閲嶆柊鎼滅储瀛樺偍
-            if (Config.Instance.HomeId != oldHomeID)
-            {
-                //鍥犱负閭d竴鐬棿锛屾湁鍙兘mqtt浼氬姞鍥炴潵,鎵�浠ュ厛鍔犵紦瀛�
-                var list = new List<ZbGateway>();
-                list.AddRange(ZbGateway.GateWayList);
-                //鐒跺悗娓呯┖鎺�
-                ZbGateway.GateWayList.Clear();
-                //鏈�鍚庡啀鏂紑mqtt杩炴帴
-                for (int i = 0; i < list.Count; i++)
-                {
-                    list[i]?.DisConnectLocalMqttClient("1");
-                }
-                list.Clear();
-                oldHomeID = Shared.Common.Config.Instance.HomeId;
-
-                var tempBytes = System.Text.Encoding.UTF8.GetBytes(Shared.Common.Config.Instance.HomeId);
-                System.Array.Copy(tempBytes, 0, broadBytes, 7, 36 < tempBytes.Length ? 36 : tempBytes.Length);
-
-                //浣忓畢涓凡缁忓瓨鍦ㄧ殑缃戝叧濡傛灉灞�鍩熺綉涓嶅瓨鍦紝闇�瑕佸湪褰撳墠浣忓畢涓櫄鎷熶竴涓綉鍏矷D鐩稿悓鐨勭綉鍏�
-                var gateWayFileList = Global.FileListByHomeId().FindAll(obj => obj.StartsWith("Gateway_"));
-                foreach (var filePath in gateWayFileList)
-                {
-                    var paths = filePath.Split('_');
-                    if (paths.Length < 3)
-                        continue;
-
-                    var gateWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == paths[2]));
-                    if (gateWay == null)
-                    {
-                        gateWay = new ZbGateway { IsVirtual = true };
-                        gateWay.GwId = paths[2];
-                        gateWay.HomeId = Config.Instance.HomeId;
-                        ZbGateway.GateWayList.Add(gateWay);
-                    }
-                }
-            }
-            return true;
+        }
+
+        /// <summary>
+        /// 妫�娴嬭兘鍚﹀彂閫佸箍鎾�(0:涓嶈兘鍙戦�佸箍鎾� 1:鍙互鍙戦�佸箍鎾� 2:浣忓畢ID鍙樻洿)
+        /// </summary>
+        /// <returns></returns>
+        private static int CheckCanSendBroadcast()
+        {
+            if (string.IsNullOrEmpty(Config.Instance.HomeId))
+            {
+                //浣忓畢ID涓虹┖鍙湁涓�绉嶅彲鑳藉氨鏄��鍑轰簡鐧诲綍锛岃繖閲岀殑涓婁竴娆′綇瀹匢D瑕佹竻绌�
+                oldHomeID = "?";
+                System.Threading.Thread.Sleep(1000);
+                return 0;
+            }
+            //棣栨杩涘叆缃戝叧锛屽拰鍒囨崲浣忓畢浼氭竻闄ょ綉鍏冲垪琛紝閲嶆柊鎼滅储瀛樺偍
+            if (Config.Instance.HomeId == oldHomeID)
+            {
+                return 1;
+            }
+
+            //鍥犱负閭d竴鐬棿锛屾湁鍙兘mqtt浼氬姞鍥炴潵,鎵�浠ュ厛鍔犵紦瀛�
+            var list = new List<ZbGateway>();
+            list.AddRange(ZbGateway.GateWayList);
+            //鐒跺悗娓呯┖鎺�
+            ZbGateway.GateWayList.Clear();
+            //鏈�鍚庡啀鏂紑mqtt杩炴帴
+            for (int i = 0; i < list.Count; i++)
+            {
+                list[i]?.DisConnectLocalMqttClient("1");
+            }
+            list.Clear();
+
+            //浣忓畢涓凡缁忓瓨鍦ㄧ殑缃戝叧濡傛灉灞�鍩熺綉涓嶅瓨鍦紝闇�瑕佸湪褰撳墠浣忓畢涓櫄鎷熶竴涓綉鍏矷D鐩稿悓鐨勭綉鍏�
+            var gateWayFileList = Global.FileListByHomeId().FindAll(obj => obj.StartsWith("Gateway_"));
+            foreach (var filePath in gateWayFileList)
+            {
+                var paths = filePath.Split('_');
+                if (paths.Length < 3)
+                    continue;
+
+                var gateWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == paths[2]));
+                if (gateWay == null)
+                {
+                    gateWay = new ZbGateway { IsVirtual = true };
+                    gateWay.GwId = paths[2];
+                    gateWay.HomeId = Config.Instance.HomeId;
+                    ZbGateway.GateWayList.Add(gateWay);
+                }
+            }
+            //浣忓畢ID鍙樻洿
+            oldHomeID = Config.Instance.HomeId;
+
+            return 2;
         }
 
         #endregion
@@ -419,11 +437,11 @@
                         return;
                     }
                     int value = udpClient.Send(bytes, bytes.Length, iPEndPoint);
-                    //璋冭瘯鐢�
-                    if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
-                    {
-                        Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, "鍙戦�侀暱搴�(BeginSendTo)锛�" + value + "  鍙戦�佸唴瀹�:" + System.Text.Encoding.UTF8.GetString(bytes));
-                    }
+                    //璋冭瘯鐢�
+                    if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
+                    {
+                        Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, "鍙戦�侀暱搴�(BeginSendTo)锛�" + value + "  鍙戦�佸唴瀹�:" + System.Text.Encoding.UTF8.GetString(bytes));
+                    }
                 }
                 catch (Exception ex)
                 {
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index b609fbf..d068161 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -123,6 +123,11 @@
         {
             get
             {
+                if (Shared.Phone.UserCenter.HdlExperienceAccountLogic.Current.IsExperience == true)
+                {
+                    //浣撻獙璐﹀彿鐨凾oken
+                    return this.TokenExperience;
+                }
                 string md5Password;
                 if (string.IsNullOrEmpty(Password))
                 {
@@ -141,6 +146,29 @@
                 return Convert.ToBase64String(tokenBytes).Replace("=", "%3D");
             }
 
+        }
+
+        /// <summary>
+        /// 浣撻獙璐﹀彿鐨凾oken
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        private string m_TokenExperience = null;
+        [Newtonsoft.Json.JsonIgnore]
+        public string TokenExperience
+        {
+            get
+            {
+                if (m_TokenExperience != null) { return m_TokenExperience; }
+
+                var result = System.Text.Encoding.UTF8.GetBytes("123456");
+                var md5 = new System.Security.Cryptography.MD5CryptoServiceProvider();
+                var output = md5.ComputeHash(result);
+                var md5Password = BitConverter.ToString(output).Replace("-", "");
+                var account_md5Pssword = "ceyir277@163.com:" + md5Password;
+                var tokenBytes = System.Text.Encoding.UTF8.GetBytes(account_md5Pssword);
+                m_TokenExperience = Convert.ToBase64String(tokenBytes).Replace("=", "%3D");
+                return m_TokenExperience;
+            }
         }
 
         /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 92b8ced..376af66 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -2664,44 +2664,50 @@
                                 //璁㈤槄涓�涓尋涓嬬嚎鐨勪富棰�
                                 await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze");
 
-                                await initGateWayBaseInfomation();
-
-                                //娌℃湁涓荤綉鍏虫椂涓诲姩璇诲彇锛岃幏鍙栦富缃戝叧淇℃伅
-                                var gateWayList = GateWayList.FindAll(obj => obj.HomeId == Shared.Common.Config.Instance.HomeId);
-                                if (gateWayList.Find(obj => obj.IsMainGateWay == true) == null)
+                                //濡傛灉杩欎釜鍑芥暟鍗′箙浜嗙殑璇濓紝浼氭帴鏀跺埌浜戠鎺ㄩ�佺殑鎸や笅绾夸富棰橈紝涓嶇煡閬撲负浠�涔�
+                                new Thread(async () =>
                                 {
-                                    if (gateWayList.Count == 1)
+                                    await initGateWayBaseInfomation();
+
+                                    //娌℃湁涓荤綉鍏虫椂涓诲姩璇诲彇锛岃幏鍙栦富缃戝叧淇℃伅
+                                    var gateWayList = GateWayList.FindAll(obj => obj.HomeId == Shared.Common.Config.Instance.HomeId);
+                                    if (gateWayList.Find(obj => obj.IsMainGateWay == true) == null)
                                     {
-                                        gateWayList[0].IsMainGateWay = true;
-                                    }
-                                    else
-                                    {
-                                        for (int i = 0; i < gateWayList.Count; i++)
+                                        if (gateWayList.Count == 1)
                                         {
-                                            var gateWay = gateWayList[i];
-                                            var info = await gateWay.GetZbGwInfoAsync();
-                                            if (info == null || info.getGwData == null)
+                                            gateWayList[0].IsMainGateWay = true;
+                                        }
+                                        else
+                                        {
+                                            for (int i = 0; i < gateWayList.Count; i++)
                                             {
-                                                continue;
-                                            }
-                                            if (info.getGwData.IsDominant == 1)
-                                            {
-                                                for (int j = 0; j < gateWayList.Count; j++)
+                                                var gateWay = gateWayList[i];
+                                                var info = await gateWay.GetZbGwInfoAsync();
+                                                if (info == null || info.getGwData == null)
                                                 {
-                                                    if (gateWayList[i].GwId == info.getGwData.GwId)
-                                                    {
-                                                        gateWayList[i].IsMainGateWay = true;
-                                                    }
-                                                    else
-                                                    {
-                                                        gateWayList[i].IsMainGateWay = false;
-                                                    }
+                                                    continue;
                                                 }
-                                                break;
+                                                if (info.getGwData.IsDominant == 1)
+                                                {
+                                                    for (int j = 0; j < gateWayList.Count; j++)
+                                                    {
+                                                        if (gateWayList[i].GwId == info.getGwData.GwId)
+                                                        {
+                                                            gateWayList[i].IsMainGateWay = true;
+                                                        }
+                                                        else
+                                                        {
+                                                            gateWayList[i].IsMainGateWay = false;
+                                                        }
+                                                    }
+                                                    break;
+                                                }
                                             }
                                         }
                                     }
-                                }
+                                })
+                                { IsBackground = true }.Start();
+                                
                             });
                         }
                         #endregion
@@ -2816,6 +2822,24 @@
             {
                 DebugPrintLog($"Local鏂紑閫氳杩炴帴鍑哄紓甯�:{ex.Message}");
             }
+        }
+
+        /// <summary>
+        /// 寮哄埗鏂紑鏈湴鐨勭綉鍏宠繛鎺�
+        /// </summary>
+        public async Task CloseLocalConnectionOnForce()
+        {
+            try
+            {
+                await localMqttClient.DisconnectAsync();
+            }
+            catch { }
+            finally
+            {
+                localIsConnected = false;
+                //杩欎釜涓滆タ涔熻寮�
+                localMqttIsConnecting = false;
+            }
         }
 
         /// <summary>
@@ -2838,6 +2862,25 @@
             catch (Exception e)
             {
                 DebugPrintLog($"Remote鏂紑閫氳杩炴帴鍑哄紓甯�:{e.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 寮哄埗鏂紑杩滅▼Mqtt鐨勯摼鎺�
+        /// </summary>
+        /// <returns></returns>
+        public static async Task CloseRemoteConnectionOnForce()
+        {
+            try
+            {
+                await RemoteMqttClient.DisconnectAsync();
+            }
+            catch { }
+            finally
+            {
+                remoteIsConnected = false;
+                //杩欎釜涓滆タ涔熻寮�
+                remoteMqttIsConnecting = false;
             }
         }
 
@@ -3558,7 +3601,7 @@
 #if DEBUG
             if (flage == true)
             {
-                //if (msg.Contains("DeviceStatusReport") == false)
+                //if (msg.Contains("DeviceInfoRespon") == true)
                 {
                     System.Console.WriteLine(msg + "  " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
                 }
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index 1a9e97c..b27483c 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -7,11 +7,7 @@
     public class ZbGatewayData
     {
         #region 涓�鍫嗗彉閲�
-        /// <summary>
-        /// 缃戝叧鍦ㄧ嚎鐨勬椂闂寸偣
-        /// </summary>
-        [Newtonsoft.Json.JsonIgnore]
-        public DateTime OnlineTime = DateTime.Now;
+
         /// <summary>
         /// 浣忓畢ID
         /// </summary>
@@ -23,7 +19,7 @@
         ///<summary>
         ///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑
         /// </summary>
-        public string GwId = string.Empty;
+        public string GwId = string.Empty;
         /// <summary>
         ///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
         /// </summary>
@@ -87,7 +83,29 @@
         /// 鏈�鍚庣殑鏇存柊鏃堕棿
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
-        public DateTime LastDateTime = DateTime.MinValue;
+        public DateTime LastDateTime = DateTime.MinValue;
+        /// <summary>
+        /// 缃戝叧鍦ㄧ嚎鐨勬椂闂寸偣(杩欎釜涓滆タ鏈夌偣鐢ㄥ,褰撶涓�娆¤幏鍙栨椂,闇�瑕佽繑鍥炲綋鍓嶆椂闂村洖鍘�,鐒跺悗鎵嶅紑濮嬭鏃�)
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        private DateTime m_OnlineTime = new DateTime(1970, 1, 1);
+        /// <summary>
+        /// 缃戝叧鍦ㄧ嚎鐨勬椂闂寸偣
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public DateTime OnlineTime
+        {
+            get
+            {
+                if (m_OnlineTime.Year == 1970)
+                {
+                    //褰撶涓�娆¤幏鍙栨椂,闇�瑕佽繑鍥炲綋鍓嶆椂闂村洖鍘�,鐒跺悗鎵嶅紑濮嬭鏃�
+                    m_OnlineTime = DateTime.Now;
+                }
+                return m_OnlineTime;
+            }
+            set { m_OnlineTime = value; }
+        }
 
         #endregion
 
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 27cd21c..71c8f29 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -6484,6 +6484,18 @@
         /// 妫�娴嬪埌杩樻病鏈夊浠�,璇峰厛澶囦唤
         /// </summary>
         public const int uIsNotHadBackupByCheckPleaseBackup = 16167;
+        /// <summary>
+        /// 鏇挎崲
+        /// </summary>
+        public const int uReplace = 16168;
+        /// <summary>
+        /// 鏇挎崲缃戝叧
+        /// </summary>
+        public const int uReplaceGateway = 16169;
+        /// <summary>
+        /// 璇烽�夋嫨琚浛鎹㈢殑缃戝叧
+        /// </summary>
+        public const int uPleaseSelectGatewayToBeReplaced = 16170;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 4969d7a..d934c06 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -187,6 +187,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlFileLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayBackupLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayUpdateLogic.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGpsLocationConvertLogic.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlHttpLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlLogLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlMessageLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlResidenceLogic.cs" />
@@ -278,6 +280,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayAddSuccessForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayBackUpListForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayProductInfoForm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayReplaceForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewaySearchListForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayRebindForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpDirectionForm.cs" />

--
Gitblit v1.8.0