From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码,优化绑定信息

---
 ZigbeeApp/Home.Ios/AppDelegate.cs                                                                       |    1 
 ZigbeeApp/GateWay.Droid/Assets/Language.ini                                                             |   10 
 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs                                                  | 7961 -------------------------------------------------
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs                        |    0 
 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs                                              |    3 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs                            |    4 
 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs                                                           |  121 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPMTwoPointFiveForm.cs                          |    0 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj                                                            |    2 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs                              |    4 
 ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorPMTwoPointFive.png                                    |    0 
 ZigbeeApp/Shared/Common/CommonPage.cs                                                                   |    2 
 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs                                                         |   67 
 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs                                                     |   14 
 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs                                                       |   18 
 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs                                                     |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs                                            |    2 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirDirectionForm.cs                 |   17 
 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs                                                    |  134 
 ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs                                                        |    0 
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml                                                  |    2 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs                                               |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs                             |    4 
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs                             |   18 
 ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs                                                      |    6 
 ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs                                                        |   16 
 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs                                                |   77 
 ZigbeeApp/Home.Ios/Resources/Language.ini                                                               |  204 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs                 |   63 
 ZigbeeApp/Home.Ios/Home.IOS.csproj                                                                      |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs                               |   14 
 ZigbeeApp/Shared/R.cs                                                                                   |  192 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs                         |    8 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirModulDirectionForm.cs            |    0 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs                                           |    2 
 ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs                                                        |    0 
 ZigbeeApp/Shared/Common/Device.cs                                                                       |   24 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs                                    |    2 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs                                      |    4 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs                                        |   73 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs                                   |    6 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs                           |    0 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs                                          |  204 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs              |    8 
 ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs                                                           |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs                                        |    7 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs                             |    5 
 ZigbeeApp/Shared/Shared.projitems                                                                       |   12 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs |    2 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFive.png                                      |    0 
 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs                                                    |    9 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs                       |  212 
 52 files changed, 982 insertions(+), 8,554 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 26e0424..d23cfa6 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -244,7 +244,7 @@
 238=闀挎寜5绉掞紙鎸夐敭锛�
 239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
 ;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
 242=鐢甸噺
 243=甯稿紑妯″紡宸插紑鍚�
 244=澶辨晥璁剧疆
@@ -265,10 +265,10 @@
 259=澶辨晥鏃堕棿涓嶅悎娉曪紝璇烽噸鍐欒缃�
 260=闊抽噺璁剧疆澶辫触
 261=闊抽噺璁剧疆鎴愬姛
-262=褰撳墠鏃跺尯
+262=褰撳墠鏃跺尯 
 263=鍖�
 264=涓�
-265=瑗�
+265=瑗� 
 266=褰撳墠璁惧涓嶅湪绾�
 267=鑾峰彇闊抽噺澶辫触
 268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
@@ -583,7 +583,7 @@
 5390=澶辨晥璁剧疆
 5391=灏忔椂
 5392=闂ㄩ攣濮嬬粓鎵撳紑
-5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
 5394=涓嶈兘灏忎簬1灏忔椂
 5395=澶т簬12灏忔椂
 5396=鎴�
@@ -2072,4 +2072,4 @@
 70023=涓户鍣�
 70024=鏅鸿兘绌哄紑
 70025=鍚搁《鐕冩皵浼犳劅鍣�
-70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 043e0c0..9a06d03 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -2166,4 +2166,4 @@
   <Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 02dbdfd..4bd5c4d 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -167,4 +167,4 @@
 		<!-- 璁剧疆楂樺痉鍦板浘key -->
 		<meta-data android:name="com.amap.api.v2.apikey" android:value="1f753413955012c9594c5df69eaa0aff" />
 	</application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index d393349..2c814cd 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -26,1636 +26,10 @@
 		
 		public static void UpdateIdValues()
 		{
-			global::ZXing.Mobile.Resource.Id.contentFrame = global::GateWay.Droid.Resource.Id.contentFrame;
-			global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::GateWay.Droid.Resource.Layout.zxingscanneractivitylayout;
-			global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::GateWay.Droid.Resource.Layout.zxingscannerfragmentlayout;
-		}
-		
-		public partial class Animation
-		{
-			
-			// aapt resource value: 0x7F010000
-			public const int abc_fade_in = 2130771968;
-			
-			// aapt resource value: 0x7F010001
-			public const int abc_fade_out = 2130771969;
-			
-			// aapt resource value: 0x7F010002
-			public const int abc_grow_fade_in_from_bottom = 2130771970;
-			
-			// aapt resource value: 0x7F010003
-			public const int abc_popup_enter = 2130771971;
-			
-			// aapt resource value: 0x7F010004
-			public const int abc_popup_exit = 2130771972;
-			
-			// aapt resource value: 0x7F010005
-			public const int abc_shrink_fade_out_from_bottom = 2130771973;
-			
-			// aapt resource value: 0x7F010006
-			public const int abc_slide_in_bottom = 2130771974;
-			
-			// aapt resource value: 0x7F010007
-			public const int abc_slide_in_top = 2130771975;
-			
-			// aapt resource value: 0x7F010008
-			public const int abc_slide_out_bottom = 2130771976;
-			
-			// aapt resource value: 0x7F010009
-			public const int abc_slide_out_top = 2130771977;
-			
-			// aapt resource value: 0x7F01000A
-			public const int design_bottom_sheet_slide_in = 2130771978;
-			
-			// aapt resource value: 0x7F01000B
-			public const int design_bottom_sheet_slide_out = 2130771979;
-			
-			// aapt resource value: 0x7F01000C
-			public const int design_snackbar_in = 2130771980;
-			
-			// aapt resource value: 0x7F01000D
-			public const int design_snackbar_out = 2130771981;
-			
-			// aapt resource value: 0x7F01000E
-			public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
-			
-			// aapt resource value: 0x7F01000F
-			public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
-			
-			// aapt resource value: 0x7F010010
-			public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
-			
-			// aapt resource value: 0x7F010011
-			public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
-			
-			// aapt resource value: 0x7F010012
-			public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
-			
-			// aapt resource value: 0x7F010013
-			public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
-			
-			// aapt resource value: 0x7F010014
-			public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
-			
-			// aapt resource value: 0x7F010015
-			public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
-			
-			// aapt resource value: 0x7F010016
-			public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
-			
-			// aapt resource value: 0x7F010017
-			public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
-			
-			// aapt resource value: 0x7F010018
-			public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
-			
-			// aapt resource value: 0x7F010019
-			public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
-			
-			// aapt resource value: 0x7F01001A
-			public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
-			
-			// aapt resource value: 0x7F01001B
-			public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
-			
-			// aapt resource value: 0x7F01001C
-			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
-			
-			// aapt resource value: 0x7F01001D
-			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
-			
-			// aapt resource value: 0x7F01001E
-			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
-			
-			// aapt resource value: 0x7F01001F
-			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
-			
-			// aapt resource value: 0x7F010020
-			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
-			
-			// aapt resource value: 0x7F010021
-			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
-			
-			// aapt resource value: 0x7F010022
-			public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
-			
-			// aapt resource value: 0x7F010023
-			public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
-			
-			// aapt resource value: 0x7F010024
-			public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
-			
-			// aapt resource value: 0x7F010025
-			public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
-			
-			// aapt resource value: 0x7F010026
-			public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
-			
-			// aapt resource value: 0x7F010027
-			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
-			
-			// aapt resource value: 0x7F010028
-			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
-			
-			// aapt resource value: 0x7F010029
-			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
-			
-			// aapt resource value: 0x7F01002A
-			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
-			
-			// aapt resource value: 0x7F01002B
-			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
-			
-			// aapt resource value: 0x7F01002C
-			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
-			
-			// aapt resource value: 0x7F01002D
-			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
-			
-			// aapt resource value: 0x7F01002E
-			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
-			
-			// aapt resource value: 0x7F01002F
-			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
-			
-			// aapt resource value: 0x7F010030
-			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
-			
-			// aapt resource value: 0x7F010031
-			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
-			
-			// aapt resource value: 0x7F010032
-			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
-			
-			// aapt resource value: 0x7F010033
-			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
-			
-			// aapt resource value: 0x7F010034
-			public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
-			
-			// aapt resource value: 0x7F010035
-			public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
-			
-			// aapt resource value: 0x7F010036
-			public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
-			
-			// aapt resource value: 0x7F010037
-			public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
-			
-			// aapt resource value: 0x7F010038
-			public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
-			
-			// aapt resource value: 0x7F010039
-			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
-			
-			// aapt resource value: 0x7F01003A
-			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
-			
-			// aapt resource value: 0x7F01003B
-			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
-			
-			// aapt resource value: 0x7F01003C
-			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
-			
-			// aapt resource value: 0x7F01003D
-			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
-			
-			// aapt resource value: 0x7F01003E
-			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
-			
-			// aapt resource value: 0x7F01003F
-			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
-			
-			// aapt resource value: 0x7F010040
-			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
-			
-			// aapt resource value: 0x7F010041
-			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
-			
-			// aapt resource value: 0x7F010042
-			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
-			
-			// aapt resource value: 0x7F010043
-			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
-			
-			// aapt resource value: 0x7F010044
-			public const int move_in = 2130772036;
-			
-			// aapt resource value: 0x7F010045
-			public const int move_out = 2130772037;
-			
-			// aapt resource value: 0x7F010046
-			public const int pickerview_dialog_scale_in = 2130772038;
-			
-			// aapt resource value: 0x7F010047
-			public const int pickerview_dialog_scale_out = 2130772039;
-			
-			// aapt resource value: 0x7F010048
-			public const int pickerview_slide_in_bottom = 2130772040;
-			
-			// aapt resource value: 0x7F010049
-			public const int pickerview_slide_out_bottom = 2130772041;
-			
-			// aapt resource value: 0x7F01004A
-			public const int tooltip_enter = 2130772042;
-			
-			// aapt resource value: 0x7F01004B
-			public const int tooltip_exit = 2130772043;
-			
-			static Animation()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Animation()
-			{
-			}
-		}
-		
-		public partial class Animator
-		{
-			
-			// aapt resource value: 0x7F020000
-			public const int design_appbar_state_list_animator = 2130837504;
-			
-			static Animator()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Animator()
-			{
-			}
-		}
-		
-		public partial class Array
-		{
-			
-			// aapt resource value: 0x7F030000
-			public const int arc_colors_default = 2130903040;
-			
-			static Array()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Array()
-			{
-			}
 		}
 		
 		public partial class Attribute
 		{
-			
-			// aapt resource value: 0x7F040000
-			public const int actionBarDivider = 2130968576;
-			
-			// aapt resource value: 0x7F040001
-			public const int actionBarItemBackground = 2130968577;
-			
-			// aapt resource value: 0x7F040002
-			public const int actionBarPopupTheme = 2130968578;
-			
-			// aapt resource value: 0x7F040003
-			public const int actionBarSize = 2130968579;
-			
-			// aapt resource value: 0x7F040004
-			public const int actionBarSplitStyle = 2130968580;
-			
-			// aapt resource value: 0x7F040005
-			public const int actionBarStyle = 2130968581;
-			
-			// aapt resource value: 0x7F040006
-			public const int actionBarTabBarStyle = 2130968582;
-			
-			// aapt resource value: 0x7F040007
-			public const int actionBarTabStyle = 2130968583;
-			
-			// aapt resource value: 0x7F040008
-			public const int actionBarTabTextStyle = 2130968584;
-			
-			// aapt resource value: 0x7F040009
-			public const int actionBarTheme = 2130968585;
-			
-			// aapt resource value: 0x7F04000A
-			public const int actionBarWidgetTheme = 2130968586;
-			
-			// aapt resource value: 0x7F04000B
-			public const int actionButtonStyle = 2130968587;
-			
-			// aapt resource value: 0x7F04000C
-			public const int actionDropDownStyle = 2130968588;
-			
-			// aapt resource value: 0x7F04000D
-			public const int actionLayout = 2130968589;
-			
-			// aapt resource value: 0x7F04000E
-			public const int actionMenuTextAppearance = 2130968590;
-			
-			// aapt resource value: 0x7F04000F
-			public const int actionMenuTextColor = 2130968591;
-			
-			// aapt resource value: 0x7F040010
-			public const int actionModeBackground = 2130968592;
-			
-			// aapt resource value: 0x7F040011
-			public const int actionModeCloseButtonStyle = 2130968593;
-			
-			// aapt resource value: 0x7F040012
-			public const int actionModeCloseDrawable = 2130968594;
-			
-			// aapt resource value: 0x7F040013
-			public const int actionModeCopyDrawable = 2130968595;
-			
-			// aapt resource value: 0x7F040014
-			public const int actionModeCutDrawable = 2130968596;
-			
-			// aapt resource value: 0x7F040015
-			public const int actionModeFindDrawable = 2130968597;
-			
-			// aapt resource value: 0x7F040016
-			public const int actionModePasteDrawable = 2130968598;
-			
-			// aapt resource value: 0x7F040017
-			public const int actionModePopupWindowStyle = 2130968599;
-			
-			// aapt resource value: 0x7F040018
-			public const int actionModeSelectAllDrawable = 2130968600;
-			
-			// aapt resource value: 0x7F040019
-			public const int actionModeShareDrawable = 2130968601;
-			
-			// aapt resource value: 0x7F04001A
-			public const int actionModeSplitBackground = 2130968602;
-			
-			// aapt resource value: 0x7F04001B
-			public const int actionModeStyle = 2130968603;
-			
-			// aapt resource value: 0x7F04001C
-			public const int actionModeWebSearchDrawable = 2130968604;
-			
-			// aapt resource value: 0x7F04001D
-			public const int actionOverflowButtonStyle = 2130968605;
-			
-			// aapt resource value: 0x7F04001E
-			public const int actionOverflowMenuStyle = 2130968606;
-			
-			// aapt resource value: 0x7F04001F
-			public const int actionProviderClass = 2130968607;
-			
-			// aapt resource value: 0x7F040020
-			public const int actionViewClass = 2130968608;
-			
-			// aapt resource value: 0x7F040021
-			public const int activityChooserViewStyle = 2130968609;
-			
-			// aapt resource value: 0x7F040022
-			public const int alertDialogButtonGroupStyle = 2130968610;
-			
-			// aapt resource value: 0x7F040023
-			public const int alertDialogCenterButtons = 2130968611;
-			
-			// aapt resource value: 0x7F040024
-			public const int alertDialogStyle = 2130968612;
-			
-			// aapt resource value: 0x7F040025
-			public const int alertDialogTheme = 2130968613;
-			
-			// aapt resource value: 0x7F040026
-			public const int allowStacking = 2130968614;
-			
-			// aapt resource value: 0x7F040027
-			public const int alpha = 2130968615;
-			
-			// aapt resource value: 0x7F040028
-			public const int alphabeticModifiers = 2130968616;
-			
-			// aapt resource value: 0x7F040029
-			public const int arc_border_color = 2130968617;
-			
-			// aapt resource value: 0x7F04002A
-			public const int arc_border_width = 2130968618;
-			
-			// aapt resource value: 0x7F04002B
-			public const int arc_colors = 2130968619;
-			
-			// aapt resource value: 0x7F04002C
-			public const int arc_max = 2130968620;
-			
-			// aapt resource value: 0x7F04002D
-			public const int arc_min = 2130968621;
-			
-			// aapt resource value: 0x7F04002E
-			public const int arc_open_angle = 2130968622;
-			
-			// aapt resource value: 0x7F04002F
-			public const int arc_progress = 2130968623;
-			
-			// aapt resource value: 0x7F040030
-			public const int arc_progress_bar_color = 2130968624;
-			
-			// aapt resource value: 0x7F040031
-			public const int arc_progress_bar_text_unit = 2130968625;
-			
-			// aapt resource value: 0x7F040032
-			public const int arc_rotate_angle = 2130968626;
-			
-			// aapt resource value: 0x7F040033
-			public const int arc_shadow_radius = 2130968627;
-			
-			// aapt resource value: 0x7F040034
-			public const int arc_thumb_color = 2130968628;
-			
-			// aapt resource value: 0x7F040035
-			public const int arc_thumb_radius = 2130968629;
-			
-			// aapt resource value: 0x7F040036
-			public const int arc_thumb_shadow_color = 2130968630;
-			
-			// aapt resource value: 0x7F040037
-			public const int arc_thumb_shadow_radius = 2130968631;
-			
-			// aapt resource value: 0x7F040038
-			public const int arc_thumb_width = 2130968632;
-			
-			// aapt resource value: 0x7F040039
-			public const int arc_width = 2130968633;
-			
-			// aapt resource value: 0x7F04003A
-			public const int arrowHeadLength = 2130968634;
-			
-			// aapt resource value: 0x7F04003B
-			public const int arrowShaftLength = 2130968635;
-			
-			// aapt resource value: 0x7F04003C
-			public const int autoCompleteTextViewStyle = 2130968636;
-			
-			// aapt resource value: 0x7F04003D
-			public const int autoSizeMaxTextSize = 2130968637;
-			
-			// aapt resource value: 0x7F04003E
-			public const int autoSizeMinTextSize = 2130968638;
-			
-			// aapt resource value: 0x7F04003F
-			public const int autoSizePresetSizes = 2130968639;
-			
-			// aapt resource value: 0x7F040040
-			public const int autoSizeStepGranularity = 2130968640;
-			
-			// aapt resource value: 0x7F040041
-			public const int autoSizeTextType = 2130968641;
-			
-			// aapt resource value: 0x7F040042
-			public const int background = 2130968642;
-			
-			// aapt resource value: 0x7F040043
-			public const int backgroundSplit = 2130968643;
-			
-			// aapt resource value: 0x7F040044
-			public const int backgroundStacked = 2130968644;
-			
-			// aapt resource value: 0x7F040045
-			public const int backgroundTint = 2130968645;
-			
-			// aapt resource value: 0x7F040046
-			public const int backgroundTintMode = 2130968646;
-			
-			// aapt resource value: 0x7F040047
-			public const int barLength = 2130968647;
-			
-			// aapt resource value: 0x7F040048
-			public const int behavior_autoHide = 2130968648;
-			
-			// aapt resource value: 0x7F040049
-			public const int behavior_hideable = 2130968649;
-			
-			// aapt resource value: 0x7F04004A
-			public const int behavior_overlapTop = 2130968650;
-			
-			// aapt resource value: 0x7F04004B
-			public const int behavior_peekHeight = 2130968651;
-			
-			// aapt resource value: 0x7F04004C
-			public const int behavior_skipCollapsed = 2130968652;
-			
-			// aapt resource value: 0x7F04004D
-			public const int biometricPromptDialogTheme = 2130968653;
-			
-			// aapt resource value: 0x7F04004F
-			public const int borderlessButtonStyle = 2130968655;
-			
-			// aapt resource value: 0x7F04004E
-			public const int borderWidth = 2130968654;
-			
-			// aapt resource value: 0x7F040050
-			public const int bottomSheetDialogTheme = 2130968656;
-			
-			// aapt resource value: 0x7F040051
-			public const int bottomSheetStyle = 2130968657;
-			
-			// aapt resource value: 0x7F040052
-			public const int buttonBarButtonStyle = 2130968658;
-			
-			// aapt resource value: 0x7F040053
-			public const int buttonBarNegativeButtonStyle = 2130968659;
-			
-			// aapt resource value: 0x7F040054
-			public const int buttonBarNeutralButtonStyle = 2130968660;
-			
-			// aapt resource value: 0x7F040055
-			public const int buttonBarPositiveButtonStyle = 2130968661;
-			
-			// aapt resource value: 0x7F040056
-			public const int buttonBarStyle = 2130968662;
-			
-			// aapt resource value: 0x7F040057
-			public const int buttonGravity = 2130968663;
-			
-			// aapt resource value: 0x7F040058
-			public const int buttonPanelSideLayout = 2130968664;
-			
-			// aapt resource value: 0x7F040059
-			public const int buttonStyle = 2130968665;
-			
-			// aapt resource value: 0x7F04005A
-			public const int buttonStyleSmall = 2130968666;
-			
-			// aapt resource value: 0x7F04005B
-			public const int buttonTint = 2130968667;
-			
-			// aapt resource value: 0x7F04005C
-			public const int buttonTintMode = 2130968668;
-			
-			// aapt resource value: 0x7F04005D
-			public const int checkboxStyle = 2130968669;
-			
-			// aapt resource value: 0x7F04005E
-			public const int checkedTextViewStyle = 2130968670;
-			
-			// aapt resource value: 0x7F04005F
-			public const int closeIcon = 2130968671;
-			
-			// aapt resource value: 0x7F040060
-			public const int closeItemLayout = 2130968672;
-			
-			// aapt resource value: 0x7F040061
-			public const int collapseContentDescription = 2130968673;
-			
-			// aapt resource value: 0x7F040063
-			public const int collapsedTitleGravity = 2130968675;
-			
-			// aapt resource value: 0x7F040064
-			public const int collapsedTitleTextAppearance = 2130968676;
-			
-			// aapt resource value: 0x7F040062
-			public const int collapseIcon = 2130968674;
-			
-			// aapt resource value: 0x7F040065
-			public const int color = 2130968677;
-			
-			// aapt resource value: 0x7F040066
-			public const int colorAccent = 2130968678;
-			
-			// aapt resource value: 0x7F040067
-			public const int colorBackgroundFloating = 2130968679;
-			
-			// aapt resource value: 0x7F040068
-			public const int colorButtonNormal = 2130968680;
-			
-			// aapt resource value: 0x7F040069
-			public const int colorControlActivated = 2130968681;
-			
-			// aapt resource value: 0x7F04006A
-			public const int colorControlHighlight = 2130968682;
-			
-			// aapt resource value: 0x7F04006B
-			public const int colorControlNormal = 2130968683;
-			
-			// aapt resource value: 0x7F04006C
-			public const int colorError = 2130968684;
-			
-			// aapt resource value: 0x7F04006D
-			public const int colorPrimary = 2130968685;
-			
-			// aapt resource value: 0x7F04006E
-			public const int colorPrimaryDark = 2130968686;
-			
-			// aapt resource value: 0x7F04006F
-			public const int colorSwitchThumbNormal = 2130968687;
-			
-			// aapt resource value: 0x7F040070
-			public const int commitIcon = 2130968688;
-			
-			// aapt resource value: 0x7F040071
-			public const int contentDescription = 2130968689;
-			
-			// aapt resource value: 0x7F040072
-			public const int contentInsetEnd = 2130968690;
-			
-			// aapt resource value: 0x7F040073
-			public const int contentInsetEndWithActions = 2130968691;
-			
-			// aapt resource value: 0x7F040074
-			public const int contentInsetLeft = 2130968692;
-			
-			// aapt resource value: 0x7F040075
-			public const int contentInsetRight = 2130968693;
-			
-			// aapt resource value: 0x7F040076
-			public const int contentInsetStart = 2130968694;
-			
-			// aapt resource value: 0x7F040077
-			public const int contentInsetStartWithNavigation = 2130968695;
-			
-			// aapt resource value: 0x7F040078
-			public const int contentScrim = 2130968696;
-			
-			// aapt resource value: 0x7F040079
-			public const int controlBackground = 2130968697;
-			
-			// aapt resource value: 0x7F04007A
-			public const int counterEnabled = 2130968698;
-			
-			// aapt resource value: 0x7F04007B
-			public const int counterMaxLength = 2130968699;
-			
-			// aapt resource value: 0x7F04007C
-			public const int counterOverflowTextAppearance = 2130968700;
-			
-			// aapt resource value: 0x7F04007D
-			public const int counterTextAppearance = 2130968701;
-			
-			// aapt resource value: 0x7F04007E
-			public const int curtain_bar_bg_color = 2130968702;
-			
-			// aapt resource value: 0x7F04007F
-			public const int curtain_bar_border_color = 2130968703;
-			
-			// aapt resource value: 0x7F040080
-			public const int curtain_bar_color = 2130968704;
-			
-			// aapt resource value: 0x7F040081
-			public const int curtain_bar_height = 2130968705;
-			
-			// aapt resource value: 0x7F040082
-			public const int curtain_bar_width = 2130968706;
-			
-			// aapt resource value: 0x7F040083
-			public const int customNavigationLayout = 2130968707;
-			
-			// aapt resource value: 0x7F040084
-			public const int defaultQueryHint = 2130968708;
-			
-			// aapt resource value: 0x7F040085
-			public const int dialogPreferredPadding = 2130968709;
-			
-			// aapt resource value: 0x7F040086
-			public const int dialogTheme = 2130968710;
-			
-			// aapt resource value: 0x7F040087
-			public const int displayOptions = 2130968711;
-			
-			// aapt resource value: 0x7F040088
-			public const int divider = 2130968712;
-			
-			// aapt resource value: 0x7F040089
-			public const int dividerHorizontal = 2130968713;
-			
-			// aapt resource value: 0x7F04008A
-			public const int dividerPadding = 2130968714;
-			
-			// aapt resource value: 0x7F04008B
-			public const int dividerVertical = 2130968715;
-			
-			// aapt resource value: 0x7F04008C
-			public const int drawableSize = 2130968716;
-			
-			// aapt resource value: 0x7F04008D
-			public const int drawerArrowStyle = 2130968717;
-			
-			// aapt resource value: 0x7F04008F
-			public const int dropdownListPreferredItemHeight = 2130968719;
-			
-			// aapt resource value: 0x7F04008E
-			public const int dropDownListViewStyle = 2130968718;
-			
-			// aapt resource value: 0x7F040090
-			public const int editTextBackground = 2130968720;
-			
-			// aapt resource value: 0x7F040091
-			public const int editTextColor = 2130968721;
-			
-			// aapt resource value: 0x7F040092
-			public const int editTextStyle = 2130968722;
-			
-			// aapt resource value: 0x7F040093
-			public const int elevation = 2130968723;
-			
-			// aapt resource value: 0x7F040094
-			public const int errorEnabled = 2130968724;
-			
-			// aapt resource value: 0x7F040095
-			public const int errorTextAppearance = 2130968725;
-			
-			// aapt resource value: 0x7F040096
-			public const int expandActivityOverflowButtonDrawable = 2130968726;
-			
-			// aapt resource value: 0x7F040097
-			public const int expanded = 2130968727;
-			
-			// aapt resource value: 0x7F040098
-			public const int expandedTitleGravity = 2130968728;
-			
-			// aapt resource value: 0x7F040099
-			public const int expandedTitleMargin = 2130968729;
-			
-			// aapt resource value: 0x7F04009A
-			public const int expandedTitleMarginBottom = 2130968730;
-			
-			// aapt resource value: 0x7F04009B
-			public const int expandedTitleMarginEnd = 2130968731;
-			
-			// aapt resource value: 0x7F04009C
-			public const int expandedTitleMarginStart = 2130968732;
-			
-			// aapt resource value: 0x7F04009D
-			public const int expandedTitleMarginTop = 2130968733;
-			
-			// aapt resource value: 0x7F04009E
-			public const int expandedTitleTextAppearance = 2130968734;
-			
-			// aapt resource value: 0x7F04009F
-			public const int fabSize = 2130968735;
-			
-			// aapt resource value: 0x7F0400A0
-			public const int fastScrollEnabled = 2130968736;
-			
-			// aapt resource value: 0x7F0400A1
-			public const int fastScrollHorizontalThumbDrawable = 2130968737;
-			
-			// aapt resource value: 0x7F0400A2
-			public const int fastScrollHorizontalTrackDrawable = 2130968738;
-			
-			// aapt resource value: 0x7F0400A3
-			public const int fastScrollVerticalThumbDrawable = 2130968739;
-			
-			// aapt resource value: 0x7F0400A4
-			public const int fastScrollVerticalTrackDrawable = 2130968740;
-			
-			// aapt resource value: 0x7F0400A5
-			public const int font = 2130968741;
-			
-			// aapt resource value: 0x7F0400A6
-			public const int fontFamily = 2130968742;
-			
-			// aapt resource value: 0x7F0400A7
-			public const int fontProviderAuthority = 2130968743;
-			
-			// aapt resource value: 0x7F0400A8
-			public const int fontProviderCerts = 2130968744;
-			
-			// aapt resource value: 0x7F0400A9
-			public const int fontProviderFetchStrategy = 2130968745;
-			
-			// aapt resource value: 0x7F0400AA
-			public const int fontProviderFetchTimeout = 2130968746;
-			
-			// aapt resource value: 0x7F0400AB
-			public const int fontProviderPackage = 2130968747;
-			
-			// aapt resource value: 0x7F0400AC
-			public const int fontProviderQuery = 2130968748;
-			
-			// aapt resource value: 0x7F0400AD
-			public const int fontStyle = 2130968749;
-			
-			// aapt resource value: 0x7F0400AE
-			public const int fontWeight = 2130968750;
-			
-			// aapt resource value: 0x7F0400AF
-			public const int foregroundInsidePadding = 2130968751;
-			
-			// aapt resource value: 0x7F0400B0
-			public const int gapBetweenBars = 2130968752;
-			
-			// aapt resource value: 0x7F0400B1
-			public const int goIcon = 2130968753;
-			
-			// aapt resource value: 0x7F0400B2
-			public const int hdl_arc_thumb_mode = 2130968754;
-			
-			// aapt resource value: 0x7F0400B3
-			public const int headerLayout = 2130968755;
-			
-			// aapt resource value: 0x7F0400B4
-			public const int height = 2130968756;
-			
-			// aapt resource value: 0x7F0400B5
-			public const int hideOnContentScroll = 2130968757;
-			
-			// aapt resource value: 0x7F0400B6
-			public const int hintAnimationEnabled = 2130968758;
-			
-			// aapt resource value: 0x7F0400B7
-			public const int hintEnabled = 2130968759;
-			
-			// aapt resource value: 0x7F0400B8
-			public const int hintTextAppearance = 2130968760;
-			
-			// aapt resource value: 0x7F0400B9
-			public const int homeAsUpIndicator = 2130968761;
-			
-			// aapt resource value: 0x7F0400BA
-			public const int homeLayout = 2130968762;
-			
-			// aapt resource value: 0x7F0400BB
-			public const int icon = 2130968763;
-			
-			// aapt resource value: 0x7F0400BE
-			public const int iconifiedByDefault = 2130968766;
-			
-			// aapt resource value: 0x7F0400BC
-			public const int iconTint = 2130968764;
-			
-			// aapt resource value: 0x7F0400BD
-			public const int iconTintMode = 2130968765;
-			
-			// aapt resource value: 0x7F0400BF
-			public const int imageButtonStyle = 2130968767;
-			
-			// aapt resource value: 0x7F0400C0
-			public const int indeterminateProgressStyle = 2130968768;
-			
-			// aapt resource value: 0x7F0400C1
-			public const int initialActivityCount = 2130968769;
-			
-			// aapt resource value: 0x7F0400C2
-			public const int insetForeground = 2130968770;
-			
-			// aapt resource value: 0x7F0400C3
-			public const int isLightTheme = 2130968771;
-			
-			// aapt resource value: 0x7F0400C4
-			public const int itemBackground = 2130968772;
-			
-			// aapt resource value: 0x7F0400C5
-			public const int itemIconTint = 2130968773;
-			
-			// aapt resource value: 0x7F0400C6
-			public const int itemPadding = 2130968774;
-			
-			// aapt resource value: 0x7F0400C7
-			public const int itemTextAppearance = 2130968775;
-			
-			// aapt resource value: 0x7F0400C8
-			public const int itemTextColor = 2130968776;
-			
-			// aapt resource value: 0x7F0400C9
-			public const int keylines = 2130968777;
-			
-			// aapt resource value: 0x7F0400CA
-			public const int layout = 2130968778;
-			
-			// aapt resource value: 0x7F0400CB
-			public const int layoutManager = 2130968779;
-			
-			// aapt resource value: 0x7F0400CC
-			public const int layout_anchor = 2130968780;
-			
-			// aapt resource value: 0x7F0400CD
-			public const int layout_anchorGravity = 2130968781;
-			
-			// aapt resource value: 0x7F0400CE
-			public const int layout_behavior = 2130968782;
-			
-			// aapt resource value: 0x7F0400CF
-			public const int layout_collapseMode = 2130968783;
-			
-			// aapt resource value: 0x7F0400D0
-			public const int layout_collapseParallaxMultiplier = 2130968784;
-			
-			// aapt resource value: 0x7F0400D1
-			public const int layout_dodgeInsetEdges = 2130968785;
-			
-			// aapt resource value: 0x7F0400D2
-			public const int layout_insetEdge = 2130968786;
-			
-			// aapt resource value: 0x7F0400D3
-			public const int layout_keyline = 2130968787;
-			
-			// aapt resource value: 0x7F0400D4
-			public const int layout_scrollFlags = 2130968788;
-			
-			// aapt resource value: 0x7F0400D5
-			public const int layout_scrollInterpolator = 2130968789;
-			
-			// aapt resource value: 0x7F0400D6
-			public const int layout_srlBackgroundColor = 2130968790;
-			
-			// aapt resource value: 0x7F0400D7
-			public const int layout_srlSpinnerStyle = 2130968791;
-			
-			// aapt resource value: 0x7F0400D8
-			public const int listChoiceBackgroundIndicator = 2130968792;
-			
-			// aapt resource value: 0x7F0400D9
-			public const int listDividerAlertDialog = 2130968793;
-			
-			// aapt resource value: 0x7F0400DA
-			public const int listItemLayout = 2130968794;
-			
-			// aapt resource value: 0x7F0400DB
-			public const int listLayout = 2130968795;
-			
-			// aapt resource value: 0x7F0400DC
-			public const int listMenuViewStyle = 2130968796;
-			
-			// aapt resource value: 0x7F0400DD
-			public const int listPopupWindowStyle = 2130968797;
-			
-			// aapt resource value: 0x7F0400DE
-			public const int listPreferredItemHeight = 2130968798;
-			
-			// aapt resource value: 0x7F0400DF
-			public const int listPreferredItemHeightLarge = 2130968799;
-			
-			// aapt resource value: 0x7F0400E0
-			public const int listPreferredItemHeightSmall = 2130968800;
-			
-			// aapt resource value: 0x7F0400E1
-			public const int listPreferredItemPaddingLeft = 2130968801;
-			
-			// aapt resource value: 0x7F0400E2
-			public const int listPreferredItemPaddingRight = 2130968802;
-			
-			// aapt resource value: 0x7F0400E3
-			public const int logo = 2130968803;
-			
-			// aapt resource value: 0x7F0400E4
-			public const int logoDescription = 2130968804;
-			
-			// aapt resource value: 0x7F0400E5
-			public const int maxActionInlineWidth = 2130968805;
-			
-			// aapt resource value: 0x7F0400E6
-			public const int maxButtonHeight = 2130968806;
-			
-			// aapt resource value: 0x7F0400E7
-			public const int measureWithLargestChild = 2130968807;
-			
-			// aapt resource value: 0x7F0400E8
-			public const int menu = 2130968808;
-			
-			// aapt resource value: 0x7F0400E9
-			public const int multiChoiceItemLayout = 2130968809;
-			
-			// aapt resource value: 0x7F0400EA
-			public const int navigationContentDescription = 2130968810;
-			
-			// aapt resource value: 0x7F0400EB
-			public const int navigationIcon = 2130968811;
-			
-			// aapt resource value: 0x7F0400EC
-			public const int navigationMode = 2130968812;
-			
-			// aapt resource value: 0x7F0400ED
-			public const int numericModifiers = 2130968813;
-			
-			// aapt resource value: 0x7F0400EE
-			public const int overlapAnchor = 2130968814;
-			
-			// aapt resource value: 0x7F0400EF
-			public const int paddingBottomNoButtons = 2130968815;
-			
-			// aapt resource value: 0x7F0400F0
-			public const int paddingEnd = 2130968816;
-			
-			// aapt resource value: 0x7F0400F1
-			public const int paddingStart = 2130968817;
-			
-			// aapt resource value: 0x7F0400F2
-			public const int paddingTopNoTitle = 2130968818;
-			
-			// aapt resource value: 0x7F0400F3
-			public const int panelBackground = 2130968819;
-			
-			// aapt resource value: 0x7F0400F4
-			public const int panelMenuListTheme = 2130968820;
-			
-			// aapt resource value: 0x7F0400F5
-			public const int panelMenuListWidth = 2130968821;
-			
-			// aapt resource value: 0x7F0400F6
-			public const int passwordToggleContentDescription = 2130968822;
-			
-			// aapt resource value: 0x7F0400F7
-			public const int passwordToggleDrawable = 2130968823;
-			
-			// aapt resource value: 0x7F0400F8
-			public const int passwordToggleEnabled = 2130968824;
-			
-			// aapt resource value: 0x7F0400F9
-			public const int passwordToggleTint = 2130968825;
-			
-			// aapt resource value: 0x7F0400FA
-			public const int passwordToggleTintMode = 2130968826;
-			
-			// aapt resource value: 0x7F0400FB
-			public const int popupMenuStyle = 2130968827;
-			
-			// aapt resource value: 0x7F0400FC
-			public const int popupTheme = 2130968828;
-			
-			// aapt resource value: 0x7F0400FD
-			public const int popupWindowStyle = 2130968829;
-			
-			// aapt resource value: 0x7F0400FE
-			public const int preserveIconSpacing = 2130968830;
-			
-			// aapt resource value: 0x7F0400FF
-			public const int pressedTranslationZ = 2130968831;
-			
-			// aapt resource value: 0x7F040100
-			public const int progressBarPadding = 2130968832;
-			
-			// aapt resource value: 0x7F040101
-			public const int progressBarStyle = 2130968833;
-			
-			// aapt resource value: 0x7F040102
-			public const int queryBackground = 2130968834;
-			
-			// aapt resource value: 0x7F040103
-			public const int queryHint = 2130968835;
-			
-			// aapt resource value: 0x7F040104
-			public const int radioButtonStyle = 2130968836;
-			
-			// aapt resource value: 0x7F040105
-			public const int ratingBarStyle = 2130968837;
-			
-			// aapt resource value: 0x7F040106
-			public const int ratingBarStyleIndicator = 2130968838;
-			
-			// aapt resource value: 0x7F040107
-			public const int ratingBarStyleSmall = 2130968839;
-			
-			// aapt resource value: 0x7F040108
-			public const int reverseLayout = 2130968840;
-			
-			// aapt resource value: 0x7F040109
-			public const int rippleColor = 2130968841;
-			
-			// aapt resource value: 0x7F04010A
-			public const int scrimAnimationDuration = 2130968842;
-			
-			// aapt resource value: 0x7F04010B
-			public const int scrimVisibleHeightTrigger = 2130968843;
-			
-			// aapt resource value: 0x7F04010C
-			public const int searchHintIcon = 2130968844;
-			
-			// aapt resource value: 0x7F04010D
-			public const int searchIcon = 2130968845;
-			
-			// aapt resource value: 0x7F04010E
-			public const int searchViewStyle = 2130968846;
-			
-			// aapt resource value: 0x7F04010F
-			public const int second_curtain_bar_color = 2130968847;
-			
-			// aapt resource value: 0x7F040110
-			public const int second_wave_color = 2130968848;
-			
-			// aapt resource value: 0x7F040111
-			public const int seekBarStyle = 2130968849;
-			
-			// aapt resource value: 0x7F040112
-			public const int selectableItemBackground = 2130968850;
-			
-			// aapt resource value: 0x7F040113
-			public const int selectableItemBackgroundBorderless = 2130968851;
-			
-			// aapt resource value: 0x7F040114
-			public const int showAsAction = 2130968852;
-			
-			// aapt resource value: 0x7F040115
-			public const int showDividers = 2130968853;
-			
-			// aapt resource value: 0x7F040116
-			public const int showText = 2130968854;
-			
-			// aapt resource value: 0x7F040117
-			public const int showTitle = 2130968855;
-			
-			// aapt resource value: 0x7F040118
-			public const int singleChoiceItemLayout = 2130968856;
-			
-			// aapt resource value: 0x7F040119
-			public const int spanCount = 2130968857;
-			
-			// aapt resource value: 0x7F04011A
-			public const int spinBars = 2130968858;
-			
-			// aapt resource value: 0x7F04011B
-			public const int spinnerDropDownItemStyle = 2130968859;
-			
-			// aapt resource value: 0x7F04011C
-			public const int spinnerStyle = 2130968860;
-			
-			// aapt resource value: 0x7F04011D
-			public const int splitTrack = 2130968861;
-			
-			// aapt resource value: 0x7F04011E
-			public const int srcCompat = 2130968862;
-			
-			// aapt resource value: 0x7F04011F
-			public const int srlAccentColor = 2130968863;
-			
-			// aapt resource value: 0x7F040120
-			public const int srlAnimatingColor = 2130968864;
-			
-			// aapt resource value: 0x7F040121
-			public const int srlClassicsSpinnerStyle = 2130968865;
-			
-			// aapt resource value: 0x7F040122
-			public const int srlDisableContentWhenLoading = 2130968866;
-			
-			// aapt resource value: 0x7F040123
-			public const int srlDisableContentWhenRefresh = 2130968867;
-			
-			// aapt resource value: 0x7F040124
-			public const int srlDragRate = 2130968868;
-			
-			// aapt resource value: 0x7F040125
-			public const int srlDrawableArrow = 2130968869;
-			
-			// aapt resource value: 0x7F040126
-			public const int srlDrawableArrowSize = 2130968870;
-			
-			// aapt resource value: 0x7F040127
-			public const int srlDrawableMarginRight = 2130968871;
-			
-			// aapt resource value: 0x7F040128
-			public const int srlDrawableProgress = 2130968872;
-			
-			// aapt resource value: 0x7F040129
-			public const int srlDrawableProgressSize = 2130968873;
-			
-			// aapt resource value: 0x7F04012A
-			public const int srlDrawableSize = 2130968874;
-			
-			// aapt resource value: 0x7F04012B
-			public const int srlEnableAutoLoadMore = 2130968875;
-			
-			// aapt resource value: 0x7F04012C
-			public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
-			
-			// aapt resource value: 0x7F04012D
-			public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
-			
-			// aapt resource value: 0x7F04012E
-			public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
-			
-			// aapt resource value: 0x7F04012F
-			public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
-			
-			// aapt resource value: 0x7F040130
-			public const int srlEnableFooterTranslationContent = 2130968880;
-			
-			// aapt resource value: 0x7F040131
-			public const int srlEnableHeaderTranslationContent = 2130968881;
-			
-			// aapt resource value: 0x7F040132
-			public const int srlEnableHorizontalDrag = 2130968882;
-			
-			// aapt resource value: 0x7F040133
-			public const int srlEnableLastTime = 2130968883;
-			
-			// aapt resource value: 0x7F040134
-			public const int srlEnableLoadMore = 2130968884;
-			
-			// aapt resource value: 0x7F040135
-			public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
-			
-			// aapt resource value: 0x7F040136
-			public const int srlEnableNestedScrolling = 2130968886;
-			
-			// aapt resource value: 0x7F040137
-			public const int srlEnableOverScrollBounce = 2130968887;
-			
-			// aapt resource value: 0x7F040138
-			public const int srlEnableOverScrollDrag = 2130968888;
-			
-			// aapt resource value: 0x7F040139
-			public const int srlEnablePreviewInEditMode = 2130968889;
-			
-			// aapt resource value: 0x7F04013A
-			public const int srlEnablePullToCloseTwoLevel = 2130968890;
-			
-			// aapt resource value: 0x7F04013B
-			public const int srlEnablePureScrollMode = 2130968891;
-			
-			// aapt resource value: 0x7F04013C
-			public const int srlEnableRefresh = 2130968892;
-			
-			// aapt resource value: 0x7F04013D
-			public const int srlEnableScrollContentWhenLoaded = 2130968893;
-			
-			// aapt resource value: 0x7F04013E
-			public const int srlEnableScrollContentWhenRefreshed = 2130968894;
-			
-			// aapt resource value: 0x7F04013F
-			public const int srlEnableTwoLevel = 2130968895;
-			
-			// aapt resource value: 0x7F040140
-			public const int srlFinishDuration = 2130968896;
-			
-			// aapt resource value: 0x7F040141
-			public const int srlFixedFooterViewId = 2130968897;
-			
-			// aapt resource value: 0x7F040142
-			public const int srlFixedHeaderViewId = 2130968898;
-			
-			// aapt resource value: 0x7F040143
-			public const int srlFloorDuration = 2130968899;
-			
-			// aapt resource value: 0x7F040144
-			public const int srlFloorRage = 2130968900;
-			
-			// aapt resource value: 0x7F040145
-			public const int srlFooterHeight = 2130968901;
-			
-			// aapt resource value: 0x7F040146
-			public const int srlFooterInsetStart = 2130968902;
-			
-			// aapt resource value: 0x7F040147
-			public const int srlFooterMaxDragRate = 2130968903;
-			
-			// aapt resource value: 0x7F040148
-			public const int srlFooterTranslationViewId = 2130968904;
-			
-			// aapt resource value: 0x7F040149
-			public const int srlFooterTriggerRate = 2130968905;
-			
-			// aapt resource value: 0x7F04014A
-			public const int srlHeaderHeight = 2130968906;
-			
-			// aapt resource value: 0x7F04014B
-			public const int srlHeaderInsetStart = 2130968907;
-			
-			// aapt resource value: 0x7F04014C
-			public const int srlHeaderMaxDragRate = 2130968908;
-			
-			// aapt resource value: 0x7F04014D
-			public const int srlHeaderTranslationViewId = 2130968909;
-			
-			// aapt resource value: 0x7F04014E
-			public const int srlHeaderTriggerRate = 2130968910;
-			
-			// aapt resource value: 0x7F04014F
-			public const int srlMaxRage = 2130968911;
-			
-			// aapt resource value: 0x7F040150
-			public const int srlNormalColor = 2130968912;
-			
-			// aapt resource value: 0x7F040151
-			public const int srlPrimaryColor = 2130968913;
-			
-			// aapt resource value: 0x7F040152
-			public const int srlReboundDuration = 2130968914;
-			
-			// aapt resource value: 0x7F040153
-			public const int srlRefreshRage = 2130968915;
-			
-			// aapt resource value: 0x7F040154
-			public const int srlTextFailed = 2130968916;
-			
-			// aapt resource value: 0x7F040155
-			public const int srlTextFinish = 2130968917;
-			
-			// aapt resource value: 0x7F040156
-			public const int srlTextLoading = 2130968918;
-			
-			// aapt resource value: 0x7F040157
-			public const int srlTextNothing = 2130968919;
-			
-			// aapt resource value: 0x7F040158
-			public const int srlTextPulling = 2130968920;
-			
-			// aapt resource value: 0x7F040159
-			public const int srlTextRefreshing = 2130968921;
-			
-			// aapt resource value: 0x7F04015A
-			public const int srlTextRelease = 2130968922;
-			
-			// aapt resource value: 0x7F04015B
-			public const int srlTextSecondary = 2130968923;
-			
-			// aapt resource value: 0x7F04015C
-			public const int srlTextSizeTime = 2130968924;
-			
-			// aapt resource value: 0x7F04015D
-			public const int srlTextSizeTitle = 2130968925;
-			
-			// aapt resource value: 0x7F04015E
-			public const int srlTextTimeMarginTop = 2130968926;
-			
-			// aapt resource value: 0x7F04015F
-			public const int srlTextUpdate = 2130968927;
-			
-			// aapt resource value: 0x7F040160
-			public const int stackFromEnd = 2130968928;
-			
-			// aapt resource value: 0x7F040161
-			public const int state_above_anchor = 2130968929;
-			
-			// aapt resource value: 0x7F040162
-			public const int state_collapsed = 2130968930;
-			
-			// aapt resource value: 0x7F040163
-			public const int state_collapsible = 2130968931;
-			
-			// aapt resource value: 0x7F040164
-			public const int statusBarBackground = 2130968932;
-			
-			// aapt resource value: 0x7F040165
-			public const int statusBarScrim = 2130968933;
-			
-			// aapt resource value: 0x7F040166
-			public const int subMenuArrow = 2130968934;
-			
-			// aapt resource value: 0x7F040167
-			public const int submitBackground = 2130968935;
-			
-			// aapt resource value: 0x7F040168
-			public const int subtitle = 2130968936;
-			
-			// aapt resource value: 0x7F040169
-			public const int subtitleTextAppearance = 2130968937;
-			
-			// aapt resource value: 0x7F04016A
-			public const int subtitleTextColor = 2130968938;
-			
-			// aapt resource value: 0x7F04016B
-			public const int subtitleTextStyle = 2130968939;
-			
-			// aapt resource value: 0x7F04016C
-			public const int suggestionRowLayout = 2130968940;
-			
-			// aapt resource value: 0x7F04016D
-			public const int switchMinWidth = 2130968941;
-			
-			// aapt resource value: 0x7F04016E
-			public const int switchPadding = 2130968942;
-			
-			// aapt resource value: 0x7F04016F
-			public const int switchStyle = 2130968943;
-			
-			// aapt resource value: 0x7F040170
-			public const int switchTextAppearance = 2130968944;
-			
-			// aapt resource value: 0x7F040171
-			public const int tabBackground = 2130968945;
-			
-			// aapt resource value: 0x7F040172
-			public const int tabContentStart = 2130968946;
-			
-			// aapt resource value: 0x7F040173
-			public const int tabGravity = 2130968947;
-			
-			// aapt resource value: 0x7F040174
-			public const int tabIndicatorColor = 2130968948;
-			
-			// aapt resource value: 0x7F040175
-			public const int tabIndicatorHeight = 2130968949;
-			
-			// aapt resource value: 0x7F040176
-			public const int tabMaxWidth = 2130968950;
-			
-			// aapt resource value: 0x7F040177
-			public const int tabMinWidth = 2130968951;
-			
-			// aapt resource value: 0x7F040178
-			public const int tabMode = 2130968952;
-			
-			// aapt resource value: 0x7F040179
-			public const int tabPadding = 2130968953;
-			
-			// aapt resource value: 0x7F04017A
-			public const int tabPaddingBottom = 2130968954;
-			
-			// aapt resource value: 0x7F04017B
-			public const int tabPaddingEnd = 2130968955;
-			
-			// aapt resource value: 0x7F04017C
-			public const int tabPaddingStart = 2130968956;
-			
-			// aapt resource value: 0x7F04017D
-			public const int tabPaddingTop = 2130968957;
-			
-			// aapt resource value: 0x7F04017E
-			public const int tabSelectedTextColor = 2130968958;
-			
-			// aapt resource value: 0x7F04017F
-			public const int tabTextAppearance = 2130968959;
-			
-			// aapt resource value: 0x7F040180
-			public const int tabTextColor = 2130968960;
-			
-			// aapt resource value: 0x7F040181
-			public const int textAllCaps = 2130968961;
-			
-			// aapt resource value: 0x7F040182
-			public const int textAppearanceLargePopupMenu = 2130968962;
-			
-			// aapt resource value: 0x7F040183
-			public const int textAppearanceListItem = 2130968963;
-			
-			// aapt resource value: 0x7F040184
-			public const int textAppearanceListItemSecondary = 2130968964;
-			
-			// aapt resource value: 0x7F040185
-			public const int textAppearanceListItemSmall = 2130968965;
-			
-			// aapt resource value: 0x7F040186
-			public const int textAppearancePopupMenuHeader = 2130968966;
-			
-			// aapt resource value: 0x7F040187
-			public const int textAppearanceSearchResultSubtitle = 2130968967;
-			
-			// aapt resource value: 0x7F040188
-			public const int textAppearanceSearchResultTitle = 2130968968;
-			
-			// aapt resource value: 0x7F040189
-			public const int textAppearanceSmallPopupMenu = 2130968969;
-			
-			// aapt resource value: 0x7F04018A
-			public const int textColorAlertDialogListItem = 2130968970;
-			
-			// aapt resource value: 0x7F04018B
-			public const int textColorError = 2130968971;
-			
-			// aapt resource value: 0x7F04018C
-			public const int textColorSearchUrl = 2130968972;
-			
-			// aapt resource value: 0x7F04018D
-			public const int theme = 2130968973;
-			
-			// aapt resource value: 0x7F04018E
-			public const int thickness = 2130968974;
-			
-			// aapt resource value: 0x7F04018F
-			public const int thumbTextPadding = 2130968975;
-			
-			// aapt resource value: 0x7F040190
-			public const int thumbTint = 2130968976;
-			
-			// aapt resource value: 0x7F040191
-			public const int thumbTintMode = 2130968977;
-			
-			// aapt resource value: 0x7F040192
-			public const int tickMark = 2130968978;
-			
-			// aapt resource value: 0x7F040193
-			public const int tickMarkTint = 2130968979;
-			
-			// aapt resource value: 0x7F040194
-			public const int tickMarkTintMode = 2130968980;
-			
-			// aapt resource value: 0x7F040195
-			public const int tint = 2130968981;
-			
-			// aapt resource value: 0x7F040196
-			public const int tintMode = 2130968982;
-			
-			// aapt resource value: 0x7F040197
-			public const int title = 2130968983;
-			
-			// aapt resource value: 0x7F040198
-			public const int titleEnabled = 2130968984;
-			
-			// aapt resource value: 0x7F040199
-			public const int titleMargin = 2130968985;
-			
-			// aapt resource value: 0x7F04019A
-			public const int titleMarginBottom = 2130968986;
-			
-			// aapt resource value: 0x7F04019B
-			public const int titleMarginEnd = 2130968987;
-			
-			// aapt resource value: 0x7F04019E
-			public const int titleMargins = 2130968990;
-			
-			// aapt resource value: 0x7F04019C
-			public const int titleMarginStart = 2130968988;
-			
-			// aapt resource value: 0x7F04019D
-			public const int titleMarginTop = 2130968989;
-			
-			// aapt resource value: 0x7F04019F
-			public const int titleTextAppearance = 2130968991;
-			
-			// aapt resource value: 0x7F0401A0
-			public const int titleTextColor = 2130968992;
-			
-			// aapt resource value: 0x7F0401A1
-			public const int titleTextStyle = 2130968993;
-			
-			// aapt resource value: 0x7F0401A2
-			public const int toolbarId = 2130968994;
-			
-			// aapt resource value: 0x7F0401A3
-			public const int toolbarNavigationButtonStyle = 2130968995;
-			
-			// aapt resource value: 0x7F0401A4
-			public const int toolbarStyle = 2130968996;
-			
-			// aapt resource value: 0x7F0401A5
-			public const int tooltipForegroundColor = 2130968997;
-			
-			// aapt resource value: 0x7F0401A6
-			public const int tooltipFrameBackground = 2130968998;
-			
-			// aapt resource value: 0x7F0401A7
-			public const int tooltipText = 2130968999;
-			
-			// aapt resource value: 0x7F0401A8
-			public const int track = 2130969000;
-			
-			// aapt resource value: 0x7F0401A9
-			public const int trackTint = 2130969001;
-			
-			// aapt resource value: 0x7F0401AA
-			public const int trackTintMode = 2130969002;
-			
-			// aapt resource value: 0x7F0401AB
-			public const int useCompatPadding = 2130969003;
-			
-			// aapt resource value: 0x7F0401AC
-			public const int voiceIcon = 2130969004;
-			
-			// aapt resource value: 0x7F0401AD
-			public const int wave_bg_color = 2130969005;
-			
-			// aapt resource value: 0x7F0401AE
-			public const int wave_border_color = 2130969006;
-			
-			// aapt resource value: 0x7F0401AF
-			public const int wave_color = 2130969007;
-			
-			// aapt resource value: 0x7F0401B0
-			public const int wave_height = 2130969008;
-			
-			// aapt resource value: 0x7F0401B1
-			public const int wave_width = 2130969009;
-			
-			// aapt resource value: 0x7F0401B2
-			public const int wheelview_dividerColor = 2130969010;
-			
-			// aapt resource value: 0x7F0401B3
-			public const int wheelview_gravity = 2130969011;
-			
-			// aapt resource value: 0x7F0401B4
-			public const int wheelview_lineSpacingMultiplier = 2130969012;
-			
-			// aapt resource value: 0x7F0401B5
-			public const int wheelview_textColorCenter = 2130969013;
-			
-			// aapt resource value: 0x7F0401B6
-			public const int wheelview_textColorOut = 2130969014;
-			
-			// aapt resource value: 0x7F0401B7
-			public const int wheelview_textSize = 2130969015;
-			
-			// aapt resource value: 0x7F0401B8
-			public const int windowActionBar = 2130969016;
-			
-			// aapt resource value: 0x7F0401B9
-			public const int windowActionBarOverlay = 2130969017;
-			
-			// aapt resource value: 0x7F0401BA
-			public const int windowActionModeOverlay = 2130969018;
-			
-			// aapt resource value: 0x7F0401BB
-			public const int windowFixedHeightMajor = 2130969019;
-			
-			// aapt resource value: 0x7F0401BC
-			public const int windowFixedHeightMinor = 2130969020;
-			
-			// aapt resource value: 0x7F0401BD
-			public const int windowFixedWidthMajor = 2130969021;
-			
-			// aapt resource value: 0x7F0401BE
-			public const int windowFixedWidthMinor = 2130969022;
-			
-			// aapt resource value: 0x7F0401BF
-			public const int windowMinWidthMajor = 2130969023;
-			
-			// aapt resource value: 0x7F0401C0
-			public const int windowMinWidthMinor = 2130969024;
-			
-			// aapt resource value: 0x7F0401C1
-			public const int windowNoTitle = 2130969025;
 			
 			static Attribute()
 			{
@@ -1667,1304 +41,14 @@
 			}
 		}
 		
-		public partial class Boolean
-		{
-			
-			// aapt resource value: 0x7F050000
-			public const int abc_action_bar_embed_tabs = 2131034112;
-			
-			// aapt resource value: 0x7F050001
-			public const int abc_allow_stacked_button_bar = 2131034113;
-			
-			// aapt resource value: 0x7F050002
-			public const int abc_config_actionMenuItemAllCaps = 2131034114;
-			
-			// aapt resource value: 0x7F050003
-			public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
-			
-			// aapt resource value: 0x7F050004
-			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
-			
-			static Boolean()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Boolean()
-			{
-			}
-		}
-		
-		public partial class Color
-		{
-			
-			// aapt resource value: 0x7F060000
-			public const int abc_background_cache_hint_selector_material_dark = 2131099648;
-			
-			// aapt resource value: 0x7F060001
-			public const int abc_background_cache_hint_selector_material_light = 2131099649;
-			
-			// aapt resource value: 0x7F060002
-			public const int abc_btn_colored_borderless_text_material = 2131099650;
-			
-			// aapt resource value: 0x7F060003
-			public const int abc_btn_colored_text_material = 2131099651;
-			
-			// aapt resource value: 0x7F060004
-			public const int abc_color_highlight_material = 2131099652;
-			
-			// aapt resource value: 0x7F060005
-			public const int abc_hint_foreground_material_dark = 2131099653;
-			
-			// aapt resource value: 0x7F060006
-			public const int abc_hint_foreground_material_light = 2131099654;
-			
-			// aapt resource value: 0x7F060007
-			public const int abc_input_method_navigation_guard = 2131099655;
-			
-			// aapt resource value: 0x7F060008
-			public const int abc_primary_text_disable_only_material_dark = 2131099656;
-			
-			// aapt resource value: 0x7F060009
-			public const int abc_primary_text_disable_only_material_light = 2131099657;
-			
-			// aapt resource value: 0x7F06000A
-			public const int abc_primary_text_material_dark = 2131099658;
-			
-			// aapt resource value: 0x7F06000B
-			public const int abc_primary_text_material_light = 2131099659;
-			
-			// aapt resource value: 0x7F06000C
-			public const int abc_search_url_text = 2131099660;
-			
-			// aapt resource value: 0x7F06000D
-			public const int abc_search_url_text_normal = 2131099661;
-			
-			// aapt resource value: 0x7F06000E
-			public const int abc_search_url_text_pressed = 2131099662;
-			
-			// aapt resource value: 0x7F06000F
-			public const int abc_search_url_text_selected = 2131099663;
-			
-			// aapt resource value: 0x7F060010
-			public const int abc_secondary_text_material_dark = 2131099664;
-			
-			// aapt resource value: 0x7F060011
-			public const int abc_secondary_text_material_light = 2131099665;
-			
-			// aapt resource value: 0x7F060012
-			public const int abc_tint_btn_checkable = 2131099666;
-			
-			// aapt resource value: 0x7F060013
-			public const int abc_tint_default = 2131099667;
-			
-			// aapt resource value: 0x7F060014
-			public const int abc_tint_edittext = 2131099668;
-			
-			// aapt resource value: 0x7F060015
-			public const int abc_tint_seek_thumb = 2131099669;
-			
-			// aapt resource value: 0x7F060016
-			public const int abc_tint_spinner = 2131099670;
-			
-			// aapt resource value: 0x7F060017
-			public const int abc_tint_switch_track = 2131099671;
-			
-			// aapt resource value: 0x7F060018
-			public const int accent_material_dark = 2131099672;
-			
-			// aapt resource value: 0x7F060019
-			public const int accent_material_light = 2131099673;
-			
-			// aapt resource value: 0x7F06001A
-			public const int background_floating_material_dark = 2131099674;
-			
-			// aapt resource value: 0x7F06001B
-			public const int background_floating_material_light = 2131099675;
-			
-			// aapt resource value: 0x7F06001C
-			public const int background_material_dark = 2131099676;
-			
-			// aapt resource value: 0x7F06001D
-			public const int background_material_light = 2131099677;
-			
-			// aapt resource value: 0x7F06001E
-			public const int bright_foreground_disabled_material_dark = 2131099678;
-			
-			// aapt resource value: 0x7F06001F
-			public const int bright_foreground_disabled_material_light = 2131099679;
-			
-			// aapt resource value: 0x7F060020
-			public const int bright_foreground_inverse_material_dark = 2131099680;
-			
-			// aapt resource value: 0x7F060021
-			public const int bright_foreground_inverse_material_light = 2131099681;
-			
-			// aapt resource value: 0x7F060022
-			public const int bright_foreground_material_dark = 2131099682;
-			
-			// aapt resource value: 0x7F060023
-			public const int bright_foreground_material_light = 2131099683;
-			
-			// aapt resource value: 0x7F060024
-			public const int button_material_dark = 2131099684;
-			
-			// aapt resource value: 0x7F060025
-			public const int button_material_light = 2131099685;
-			
-			// aapt resource value: 0x7F060026
-			public const int design_bottom_navigation_shadow_color = 2131099686;
-			
-			// aapt resource value: 0x7F060027
-			public const int design_error = 2131099687;
-			
-			// aapt resource value: 0x7F060028
-			public const int design_fab_shadow_end_color = 2131099688;
-			
-			// aapt resource value: 0x7F060029
-			public const int design_fab_shadow_mid_color = 2131099689;
-			
-			// aapt resource value: 0x7F06002A
-			public const int design_fab_shadow_start_color = 2131099690;
-			
-			// aapt resource value: 0x7F06002B
-			public const int design_fab_stroke_end_inner_color = 2131099691;
-			
-			// aapt resource value: 0x7F06002C
-			public const int design_fab_stroke_end_outer_color = 2131099692;
-			
-			// aapt resource value: 0x7F06002D
-			public const int design_fab_stroke_top_inner_color = 2131099693;
-			
-			// aapt resource value: 0x7F06002E
-			public const int design_fab_stroke_top_outer_color = 2131099694;
-			
-			// aapt resource value: 0x7F06002F
-			public const int design_snackbar_background_color = 2131099695;
-			
-			// aapt resource value: 0x7F060030
-			public const int design_tint_password_toggle = 2131099696;
-			
-			// aapt resource value: 0x7F060031
-			public const int dim_foreground_disabled_material_dark = 2131099697;
-			
-			// aapt resource value: 0x7F060032
-			public const int dim_foreground_disabled_material_light = 2131099698;
-			
-			// aapt resource value: 0x7F060033
-			public const int dim_foreground_material_dark = 2131099699;
-			
-			// aapt resource value: 0x7F060034
-			public const int dim_foreground_material_light = 2131099700;
-			
-			// aapt resource value: 0x7F060035
-			public const int error_color_material = 2131099701;
-			
-			// aapt resource value: 0x7F060036
-			public const int foreground_material_dark = 2131099702;
-			
-			// aapt resource value: 0x7F060037
-			public const int foreground_material_light = 2131099703;
-			
-			// aapt resource value: 0x7F060038
-			public const int gd_top_view = 2131099704;
-			
-			// aapt resource value: 0x7F060039
-			public const int highlighted_text_material_dark = 2131099705;
-			
-			// aapt resource value: 0x7F06003A
-			public const int highlighted_text_material_light = 2131099706;
-			
-			// aapt resource value: 0x7F06003B
-			public const int material_blue_grey_800 = 2131099707;
-			
-			// aapt resource value: 0x7F06003C
-			public const int material_blue_grey_900 = 2131099708;
-			
-			// aapt resource value: 0x7F06003D
-			public const int material_blue_grey_950 = 2131099709;
-			
-			// aapt resource value: 0x7F06003E
-			public const int material_deep_teal_200 = 2131099710;
-			
-			// aapt resource value: 0x7F06003F
-			public const int material_deep_teal_500 = 2131099711;
-			
-			// aapt resource value: 0x7F060040
-			public const int material_grey_100 = 2131099712;
-			
-			// aapt resource value: 0x7F060041
-			public const int material_grey_300 = 2131099713;
-			
-			// aapt resource value: 0x7F060042
-			public const int material_grey_50 = 2131099714;
-			
-			// aapt resource value: 0x7F060043
-			public const int material_grey_600 = 2131099715;
-			
-			// aapt resource value: 0x7F060044
-			public const int material_grey_800 = 2131099716;
-			
-			// aapt resource value: 0x7F060045
-			public const int material_grey_850 = 2131099717;
-			
-			// aapt resource value: 0x7F060046
-			public const int material_grey_900 = 2131099718;
-			
-			// aapt resource value: 0x7F060047
-			public const int material_red_500 = 2131099719;
-			
-			// aapt resource value: 0x7F060048
-			public const int notification_action_color_filter = 2131099720;
-			
-			// aapt resource value: 0x7F060049
-			public const int notification_icon_bg_color = 2131099721;
-			
-			// aapt resource value: 0x7F06004A
-			public const int notification_material_background_media_default_color = 2131099722;
-			
-			// aapt resource value: 0x7F06004B
-			public const int pickerview_bgColor_default = 2131099723;
-			
-			// aapt resource value: 0x7F06004C
-			public const int pickerview_bgColor_overlay = 2131099724;
-			
-			// aapt resource value: 0x7F06004D
-			public const int pickerview_bg_topbar = 2131099725;
-			
-			// aapt resource value: 0x7F06004E
-			public const int pickerview_timebtn_nor = 2131099726;
-			
-			// aapt resource value: 0x7F06004F
-			public const int pickerview_timebtn_pre = 2131099727;
-			
-			// aapt resource value: 0x7F060050
-			public const int pickerview_topbar_title = 2131099728;
-			
-			// aapt resource value: 0x7F060051
-			public const int pickerview_wheelview_textcolor_center = 2131099729;
-			
-			// aapt resource value: 0x7F060052
-			public const int pickerview_wheelview_textcolor_divider = 2131099730;
-			
-			// aapt resource value: 0x7F060053
-			public const int pickerview_wheelview_textcolor_out = 2131099731;
-			
-			// aapt resource value: 0x7F060054
-			public const int primary_dark_material_dark = 2131099732;
-			
-			// aapt resource value: 0x7F060055
-			public const int primary_dark_material_light = 2131099733;
-			
-			// aapt resource value: 0x7F060056
-			public const int primary_material_dark = 2131099734;
-			
-			// aapt resource value: 0x7F060057
-			public const int primary_material_light = 2131099735;
-			
-			// aapt resource value: 0x7F060058
-			public const int primary_text_default_material_dark = 2131099736;
-			
-			// aapt resource value: 0x7F060059
-			public const int primary_text_default_material_light = 2131099737;
-			
-			// aapt resource value: 0x7F06005A
-			public const int primary_text_disabled_material_dark = 2131099738;
-			
-			// aapt resource value: 0x7F06005B
-			public const int primary_text_disabled_material_light = 2131099739;
-			
-			// aapt resource value: 0x7F06005C
-			public const int ripple_material_dark = 2131099740;
-			
-			// aapt resource value: 0x7F06005D
-			public const int ripple_material_light = 2131099741;
-			
-			// aapt resource value: 0x7F06005E
-			public const int secondary_text_default_material_dark = 2131099742;
-			
-			// aapt resource value: 0x7F06005F
-			public const int secondary_text_default_material_light = 2131099743;
-			
-			// aapt resource value: 0x7F060060
-			public const int secondary_text_disabled_material_dark = 2131099744;
-			
-			// aapt resource value: 0x7F060061
-			public const int secondary_text_disabled_material_light = 2131099745;
-			
-			// aapt resource value: 0x7F060062
-			public const int switch_thumb_disabled_material_dark = 2131099746;
-			
-			// aapt resource value: 0x7F060063
-			public const int switch_thumb_disabled_material_light = 2131099747;
-			
-			// aapt resource value: 0x7F060064
-			public const int switch_thumb_material_dark = 2131099748;
-			
-			// aapt resource value: 0x7F060065
-			public const int switch_thumb_material_light = 2131099749;
-			
-			// aapt resource value: 0x7F060066
-			public const int switch_thumb_normal_material_dark = 2131099750;
-			
-			// aapt resource value: 0x7F060067
-			public const int switch_thumb_normal_material_light = 2131099751;
-			
-			// aapt resource value: 0x7F060068
-			public const int tooltip_background_dark = 2131099752;
-			
-			// aapt resource value: 0x7F060069
-			public const int tooltip_background_light = 2131099753;
-			
-			static Color()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Color()
-			{
-			}
-		}
-		
-		public partial class Dimension
-		{
-			
-			// aapt resource value: 0x7F070000
-			public const int abc_action_bar_content_inset_material = 2131165184;
-			
-			// aapt resource value: 0x7F070001
-			public const int abc_action_bar_content_inset_with_nav = 2131165185;
-			
-			// aapt resource value: 0x7F070002
-			public const int abc_action_bar_default_height_material = 2131165186;
-			
-			// aapt resource value: 0x7F070003
-			public const int abc_action_bar_default_padding_end_material = 2131165187;
-			
-			// aapt resource value: 0x7F070004
-			public const int abc_action_bar_default_padding_start_material = 2131165188;
-			
-			// aapt resource value: 0x7F070005
-			public const int abc_action_bar_elevation_material = 2131165189;
-			
-			// aapt resource value: 0x7F070006
-			public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
-			
-			// aapt resource value: 0x7F070007
-			public const int abc_action_bar_overflow_padding_end_material = 2131165191;
-			
-			// aapt resource value: 0x7F070008
-			public const int abc_action_bar_overflow_padding_start_material = 2131165192;
-			
-			// aapt resource value: 0x7F070009
-			public const int abc_action_bar_progress_bar_size = 2131165193;
-			
-			// aapt resource value: 0x7F07000A
-			public const int abc_action_bar_stacked_max_height = 2131165194;
-			
-			// aapt resource value: 0x7F07000B
-			public const int abc_action_bar_stacked_tab_max_width = 2131165195;
-			
-			// aapt resource value: 0x7F07000C
-			public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
-			
-			// aapt resource value: 0x7F07000D
-			public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
-			
-			// aapt resource value: 0x7F07000E
-			public const int abc_action_button_min_height_material = 2131165198;
-			
-			// aapt resource value: 0x7F07000F
-			public const int abc_action_button_min_width_material = 2131165199;
-			
-			// aapt resource value: 0x7F070010
-			public const int abc_action_button_min_width_overflow_material = 2131165200;
-			
-			// aapt resource value: 0x7F070011
-			public const int abc_alert_dialog_button_bar_height = 2131165201;
-			
-			// aapt resource value: 0x7F070012
-			public const int abc_button_inset_horizontal_material = 2131165202;
-			
-			// aapt resource value: 0x7F070013
-			public const int abc_button_inset_vertical_material = 2131165203;
-			
-			// aapt resource value: 0x7F070014
-			public const int abc_button_padding_horizontal_material = 2131165204;
-			
-			// aapt resource value: 0x7F070015
-			public const int abc_button_padding_vertical_material = 2131165205;
-			
-			// aapt resource value: 0x7F070016
-			public const int abc_cascading_menus_min_smallest_width = 2131165206;
-			
-			// aapt resource value: 0x7F070017
-			public const int abc_config_prefDialogWidth = 2131165207;
-			
-			// aapt resource value: 0x7F070018
-			public const int abc_control_corner_material = 2131165208;
-			
-			// aapt resource value: 0x7F070019
-			public const int abc_control_inset_material = 2131165209;
-			
-			// aapt resource value: 0x7F07001A
-			public const int abc_control_padding_material = 2131165210;
-			
-			// aapt resource value: 0x7F07001B
-			public const int abc_dialog_fixed_height_major = 2131165211;
-			
-			// aapt resource value: 0x7F07001C
-			public const int abc_dialog_fixed_height_minor = 2131165212;
-			
-			// aapt resource value: 0x7F07001D
-			public const int abc_dialog_fixed_width_major = 2131165213;
-			
-			// aapt resource value: 0x7F07001E
-			public const int abc_dialog_fixed_width_minor = 2131165214;
-			
-			// aapt resource value: 0x7F07001F
-			public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
-			
-			// aapt resource value: 0x7F070020
-			public const int abc_dialog_list_padding_top_no_title = 2131165216;
-			
-			// aapt resource value: 0x7F070021
-			public const int abc_dialog_min_width_major = 2131165217;
-			
-			// aapt resource value: 0x7F070022
-			public const int abc_dialog_min_width_minor = 2131165218;
-			
-			// aapt resource value: 0x7F070023
-			public const int abc_dialog_padding_material = 2131165219;
-			
-			// aapt resource value: 0x7F070024
-			public const int abc_dialog_padding_top_material = 2131165220;
-			
-			// aapt resource value: 0x7F070025
-			public const int abc_dialog_title_divider_material = 2131165221;
-			
-			// aapt resource value: 0x7F070026
-			public const int abc_disabled_alpha_material_dark = 2131165222;
-			
-			// aapt resource value: 0x7F070027
-			public const int abc_disabled_alpha_material_light = 2131165223;
-			
-			// aapt resource value: 0x7F070028
-			public const int abc_dropdownitem_icon_width = 2131165224;
-			
-			// aapt resource value: 0x7F070029
-			public const int abc_dropdownitem_text_padding_left = 2131165225;
-			
-			// aapt resource value: 0x7F07002A
-			public const int abc_dropdownitem_text_padding_right = 2131165226;
-			
-			// aapt resource value: 0x7F07002B
-			public const int abc_edit_text_inset_bottom_material = 2131165227;
-			
-			// aapt resource value: 0x7F07002C
-			public const int abc_edit_text_inset_horizontal_material = 2131165228;
-			
-			// aapt resource value: 0x7F07002D
-			public const int abc_edit_text_inset_top_material = 2131165229;
-			
-			// aapt resource value: 0x7F07002E
-			public const int abc_floating_window_z = 2131165230;
-			
-			// aapt resource value: 0x7F07002F
-			public const int abc_list_item_padding_horizontal_material = 2131165231;
-			
-			// aapt resource value: 0x7F070030
-			public const int abc_panel_menu_list_width = 2131165232;
-			
-			// aapt resource value: 0x7F070031
-			public const int abc_progress_bar_height_material = 2131165233;
-			
-			// aapt resource value: 0x7F070032
-			public const int abc_search_view_preferred_height = 2131165234;
-			
-			// aapt resource value: 0x7F070033
-			public const int abc_search_view_preferred_width = 2131165235;
-			
-			// aapt resource value: 0x7F070034
-			public const int abc_seekbar_track_background_height_material = 2131165236;
-			
-			// aapt resource value: 0x7F070035
-			public const int abc_seekbar_track_progress_height_material = 2131165237;
-			
-			// aapt resource value: 0x7F070036
-			public const int abc_select_dialog_padding_start_material = 2131165238;
-			
-			// aapt resource value: 0x7F070037
-			public const int abc_switch_padding = 2131165239;
-			
-			// aapt resource value: 0x7F070038
-			public const int abc_text_size_body_1_material = 2131165240;
-			
-			// aapt resource value: 0x7F070039
-			public const int abc_text_size_body_2_material = 2131165241;
-			
-			// aapt resource value: 0x7F07003A
-			public const int abc_text_size_button_material = 2131165242;
-			
-			// aapt resource value: 0x7F07003B
-			public const int abc_text_size_caption_material = 2131165243;
-			
-			// aapt resource value: 0x7F07003C
-			public const int abc_text_size_display_1_material = 2131165244;
-			
-			// aapt resource value: 0x7F07003D
-			public const int abc_text_size_display_2_material = 2131165245;
-			
-			// aapt resource value: 0x7F07003E
-			public const int abc_text_size_display_3_material = 2131165246;
-			
-			// aapt resource value: 0x7F07003F
-			public const int abc_text_size_display_4_material = 2131165247;
-			
-			// aapt resource value: 0x7F070040
-			public const int abc_text_size_headline_material = 2131165248;
-			
-			// aapt resource value: 0x7F070041
-			public const int abc_text_size_large_material = 2131165249;
-			
-			// aapt resource value: 0x7F070042
-			public const int abc_text_size_medium_material = 2131165250;
-			
-			// aapt resource value: 0x7F070043
-			public const int abc_text_size_menu_header_material = 2131165251;
-			
-			// aapt resource value: 0x7F070044
-			public const int abc_text_size_menu_material = 2131165252;
-			
-			// aapt resource value: 0x7F070045
-			public const int abc_text_size_small_material = 2131165253;
-			
-			// aapt resource value: 0x7F070046
-			public const int abc_text_size_subhead_material = 2131165254;
-			
-			// aapt resource value: 0x7F070047
-			public const int abc_text_size_subtitle_material_toolbar = 2131165255;
-			
-			// aapt resource value: 0x7F070048
-			public const int abc_text_size_title_material = 2131165256;
-			
-			// aapt resource value: 0x7F070049
-			public const int abc_text_size_title_material_toolbar = 2131165257;
-			
-			// aapt resource value: 0x7F07004A
-			public const int compat_button_inset_horizontal_material = 2131165258;
-			
-			// aapt resource value: 0x7F07004B
-			public const int compat_button_inset_vertical_material = 2131165259;
-			
-			// aapt resource value: 0x7F07004C
-			public const int compat_button_padding_horizontal_material = 2131165260;
-			
-			// aapt resource value: 0x7F07004D
-			public const int compat_button_padding_vertical_material = 2131165261;
-			
-			// aapt resource value: 0x7F07004E
-			public const int compat_control_corner_material = 2131165262;
-			
-			// aapt resource value: 0x7F07004F
-			public const int design_appbar_elevation = 2131165263;
-			
-			// aapt resource value: 0x7F070050
-			public const int design_bottom_navigation_active_item_max_width = 2131165264;
-			
-			// aapt resource value: 0x7F070051
-			public const int design_bottom_navigation_active_text_size = 2131165265;
-			
-			// aapt resource value: 0x7F070052
-			public const int design_bottom_navigation_elevation = 2131165266;
-			
-			// aapt resource value: 0x7F070053
-			public const int design_bottom_navigation_height = 2131165267;
-			
-			// aapt resource value: 0x7F070054
-			public const int design_bottom_navigation_item_max_width = 2131165268;
-			
-			// aapt resource value: 0x7F070055
-			public const int design_bottom_navigation_item_min_width = 2131165269;
-			
-			// aapt resource value: 0x7F070056
-			public const int design_bottom_navigation_margin = 2131165270;
-			
-			// aapt resource value: 0x7F070057
-			public const int design_bottom_navigation_shadow_height = 2131165271;
-			
-			// aapt resource value: 0x7F070058
-			public const int design_bottom_navigation_text_size = 2131165272;
-			
-			// aapt resource value: 0x7F070059
-			public const int design_bottom_sheet_modal_elevation = 2131165273;
-			
-			// aapt resource value: 0x7F07005A
-			public const int design_bottom_sheet_peek_height_min = 2131165274;
-			
-			// aapt resource value: 0x7F07005B
-			public const int design_fab_border_width = 2131165275;
-			
-			// aapt resource value: 0x7F07005C
-			public const int design_fab_elevation = 2131165276;
-			
-			// aapt resource value: 0x7F07005D
-			public const int design_fab_image_size = 2131165277;
-			
-			// aapt resource value: 0x7F07005E
-			public const int design_fab_size_mini = 2131165278;
-			
-			// aapt resource value: 0x7F07005F
-			public const int design_fab_size_normal = 2131165279;
-			
-			// aapt resource value: 0x7F070060
-			public const int design_fab_translation_z_pressed = 2131165280;
-			
-			// aapt resource value: 0x7F070061
-			public const int design_navigation_elevation = 2131165281;
-			
-			// aapt resource value: 0x7F070062
-			public const int design_navigation_icon_padding = 2131165282;
-			
-			// aapt resource value: 0x7F070063
-			public const int design_navigation_icon_size = 2131165283;
-			
-			// aapt resource value: 0x7F070064
-			public const int design_navigation_max_width = 2131165284;
-			
-			// aapt resource value: 0x7F070065
-			public const int design_navigation_padding_bottom = 2131165285;
-			
-			// aapt resource value: 0x7F070066
-			public const int design_navigation_separator_vertical_padding = 2131165286;
-			
-			// aapt resource value: 0x7F070067
-			public const int design_snackbar_action_inline_max_width = 2131165287;
-			
-			// aapt resource value: 0x7F070068
-			public const int design_snackbar_background_corner_radius = 2131165288;
-			
-			// aapt resource value: 0x7F070069
-			public const int design_snackbar_elevation = 2131165289;
-			
-			// aapt resource value: 0x7F07006A
-			public const int design_snackbar_extra_spacing_horizontal = 2131165290;
-			
-			// aapt resource value: 0x7F07006B
-			public const int design_snackbar_max_width = 2131165291;
-			
-			// aapt resource value: 0x7F07006C
-			public const int design_snackbar_min_width = 2131165292;
-			
-			// aapt resource value: 0x7F07006D
-			public const int design_snackbar_padding_horizontal = 2131165293;
-			
-			// aapt resource value: 0x7F07006E
-			public const int design_snackbar_padding_vertical = 2131165294;
-			
-			// aapt resource value: 0x7F07006F
-			public const int design_snackbar_padding_vertical_2lines = 2131165295;
-			
-			// aapt resource value: 0x7F070070
-			public const int design_snackbar_text_size = 2131165296;
-			
-			// aapt resource value: 0x7F070071
-			public const int design_tab_max_width = 2131165297;
-			
-			// aapt resource value: 0x7F070072
-			public const int design_tab_scrollable_min_width = 2131165298;
-			
-			// aapt resource value: 0x7F070073
-			public const int design_tab_text_size = 2131165299;
-			
-			// aapt resource value: 0x7F070074
-			public const int design_tab_text_size_2line = 2131165300;
-			
-			// aapt resource value: 0x7F070075
-			public const int disabled_alpha_material_dark = 2131165301;
-			
-			// aapt resource value: 0x7F070076
-			public const int disabled_alpha_material_light = 2131165302;
-			
-			// aapt resource value: 0x7F070077
-			public const int fastscroll_default_thickness = 2131165303;
-			
-			// aapt resource value: 0x7F070078
-			public const int fastscroll_margin = 2131165304;
-			
-			// aapt resource value: 0x7F070079
-			public const int fastscroll_minimum_range = 2131165305;
-			
-			// aapt resource value: 0x7F07007A
-			public const int fingerprint_icon_size = 2131165306;
-			
-			// aapt resource value: 0x7F07007B
-			public const int fingerprint_status_layout_margin_vertical = 2131165307;
-			
-			// aapt resource value: 0x7F07007C
-			public const int highlight_alpha_material_colored = 2131165308;
-			
-			// aapt resource value: 0x7F07007D
-			public const int highlight_alpha_material_dark = 2131165309;
-			
-			// aapt resource value: 0x7F07007E
-			public const int highlight_alpha_material_light = 2131165310;
-			
-			// aapt resource value: 0x7F07007F
-			public const int hint_alpha_material_dark = 2131165311;
-			
-			// aapt resource value: 0x7F070080
-			public const int hint_alpha_material_light = 2131165312;
-			
-			// aapt resource value: 0x7F070081
-			public const int hint_pressed_alpha_material_dark = 2131165313;
-			
-			// aapt resource value: 0x7F070082
-			public const int hint_pressed_alpha_material_light = 2131165314;
-			
-			// aapt resource value: 0x7F070083
-			public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
-			
-			// aapt resource value: 0x7F070084
-			public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
-			
-			// aapt resource value: 0x7F070085
-			public const int item_touch_helper_swipe_escape_velocity = 2131165317;
-			
-			// aapt resource value: 0x7F070086
-			public const int notification_action_icon_size = 2131165318;
-			
-			// aapt resource value: 0x7F070087
-			public const int notification_action_text_size = 2131165319;
-			
-			// aapt resource value: 0x7F070088
-			public const int notification_big_circle_margin = 2131165320;
-			
-			// aapt resource value: 0x7F070089
-			public const int notification_content_margin_start = 2131165321;
-			
-			// aapt resource value: 0x7F07008A
-			public const int notification_large_icon_height = 2131165322;
-			
-			// aapt resource value: 0x7F07008B
-			public const int notification_large_icon_width = 2131165323;
-			
-			// aapt resource value: 0x7F07008C
-			public const int notification_main_column_padding_top = 2131165324;
-			
-			// aapt resource value: 0x7F07008D
-			public const int notification_media_narrow_margin = 2131165325;
-			
-			// aapt resource value: 0x7F07008E
-			public const int notification_right_icon_size = 2131165326;
-			
-			// aapt resource value: 0x7F07008F
-			public const int notification_right_side_padding_top = 2131165327;
-			
-			// aapt resource value: 0x7F070090
-			public const int notification_small_icon_background_padding = 2131165328;
-			
-			// aapt resource value: 0x7F070091
-			public const int notification_small_icon_size_as_large = 2131165329;
-			
-			// aapt resource value: 0x7F070092
-			public const int notification_subtext_size = 2131165330;
-			
-			// aapt resource value: 0x7F070093
-			public const int notification_top_pad = 2131165331;
-			
-			// aapt resource value: 0x7F070094
-			public const int notification_top_pad_large_text = 2131165332;
-			
-			// aapt resource value: 0x7F070095
-			public const int pickerview_textsize = 2131165333;
-			
-			// aapt resource value: 0x7F070096
-			public const int pickerview_topbar_btn_textsize = 2131165334;
-			
-			// aapt resource value: 0x7F070097
-			public const int pickerview_topbar_height = 2131165335;
-			
-			// aapt resource value: 0x7F070098
-			public const int pickerview_topbar_padding = 2131165336;
-			
-			// aapt resource value: 0x7F070099
-			public const int pickerview_topbar_title_textsize = 2131165337;
-			
-			// aapt resource value: 0x7F07009A
-			public const int tooltip_corner_radius = 2131165338;
-			
-			// aapt resource value: 0x7F07009B
-			public const int tooltip_horizontal_padding = 2131165339;
-			
-			// aapt resource value: 0x7F07009C
-			public const int tooltip_margin = 2131165340;
-			
-			// aapt resource value: 0x7F07009D
-			public const int tooltip_precise_anchor_extra_offset = 2131165341;
-			
-			// aapt resource value: 0x7F07009E
-			public const int tooltip_precise_anchor_threshold = 2131165342;
-			
-			// aapt resource value: 0x7F07009F
-			public const int tooltip_vertical_padding = 2131165343;
-			
-			// aapt resource value: 0x7F0700A0
-			public const int tooltip_y_offset_non_touch = 2131165344;
-			
-			// aapt resource value: 0x7F0700A1
-			public const int tooltip_y_offset_touch = 2131165345;
-			
-			static Dimension()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Dimension()
-			{
-			}
-		}
-		
 		public partial class Drawable
 		{
 			
-			// aapt resource value: 0x7F080006
-			public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
+			// aapt resource value: 0x7F010000
+			public const int Icon = 2130771968;
 			
-			// aapt resource value: 0x7F080007
-			public const int abc_action_bar_item_background_material = 2131230727;
-			
-			// aapt resource value: 0x7F080008
-			public const int abc_btn_borderless_material = 2131230728;
-			
-			// aapt resource value: 0x7F080009
-			public const int abc_btn_check_material = 2131230729;
-			
-			// aapt resource value: 0x7F08000A
-			public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
-			
-			// aapt resource value: 0x7F08000B
-			public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
-			
-			// aapt resource value: 0x7F08000C
-			public const int abc_btn_colored_material = 2131230732;
-			
-			// aapt resource value: 0x7F08000D
-			public const int abc_btn_default_mtrl_shape = 2131230733;
-			
-			// aapt resource value: 0x7F08000E
-			public const int abc_btn_radio_material = 2131230734;
-			
-			// aapt resource value: 0x7F08000F
-			public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
-			
-			// aapt resource value: 0x7F080010
-			public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
-			
-			// aapt resource value: 0x7F080011
-			public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
-			
-			// aapt resource value: 0x7F080012
-			public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
-			
-			// aapt resource value: 0x7F080013
-			public const int abc_cab_background_internal_bg = 2131230739;
-			
-			// aapt resource value: 0x7F080014
-			public const int abc_cab_background_top_material = 2131230740;
-			
-			// aapt resource value: 0x7F080015
-			public const int abc_cab_background_top_mtrl_alpha = 2131230741;
-			
-			// aapt resource value: 0x7F080016
-			public const int abc_control_background_material = 2131230742;
-			
-			// aapt resource value: 0x7F080017
-			public const int abc_dialog_material_background = 2131230743;
-			
-			// aapt resource value: 0x7F080018
-			public const int abc_edit_text_material = 2131230744;
-			
-			// aapt resource value: 0x7F080019
-			public const int abc_ic_ab_back_material = 2131230745;
-			
-			// aapt resource value: 0x7F08001A
-			public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
-			
-			// aapt resource value: 0x7F08001B
-			public const int abc_ic_clear_material = 2131230747;
-			
-			// aapt resource value: 0x7F08001C
-			public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
-			
-			// aapt resource value: 0x7F08001D
-			public const int abc_ic_go_search_api_material = 2131230749;
-			
-			// aapt resource value: 0x7F08001E
-			public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
-			
-			// aapt resource value: 0x7F08001F
-			public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
-			
-			// aapt resource value: 0x7F080020
-			public const int abc_ic_menu_overflow_material = 2131230752;
-			
-			// aapt resource value: 0x7F080021
-			public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
-			
-			// aapt resource value: 0x7F080022
-			public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
-			
-			// aapt resource value: 0x7F080023
-			public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
-			
-			// aapt resource value: 0x7F080024
-			public const int abc_ic_search_api_material = 2131230756;
-			
-			// aapt resource value: 0x7F080025
-			public const int abc_ic_star_black_16dp = 2131230757;
-			
-			// aapt resource value: 0x7F080026
-			public const int abc_ic_star_black_36dp = 2131230758;
-			
-			// aapt resource value: 0x7F080027
-			public const int abc_ic_star_black_48dp = 2131230759;
-			
-			// aapt resource value: 0x7F080028
-			public const int abc_ic_star_half_black_16dp = 2131230760;
-			
-			// aapt resource value: 0x7F080029
-			public const int abc_ic_star_half_black_36dp = 2131230761;
-			
-			// aapt resource value: 0x7F08002A
-			public const int abc_ic_star_half_black_48dp = 2131230762;
-			
-			// aapt resource value: 0x7F08002B
-			public const int abc_ic_voice_search_api_material = 2131230763;
-			
-			// aapt resource value: 0x7F08002C
-			public const int abc_item_background_holo_dark = 2131230764;
-			
-			// aapt resource value: 0x7F08002D
-			public const int abc_item_background_holo_light = 2131230765;
-			
-			// aapt resource value: 0x7F08002E
-			public const int abc_list_divider_mtrl_alpha = 2131230766;
-			
-			// aapt resource value: 0x7F08002F
-			public const int abc_list_focused_holo = 2131230767;
-			
-			// aapt resource value: 0x7F080030
-			public const int abc_list_longpressed_holo = 2131230768;
-			
-			// aapt resource value: 0x7F080031
-			public const int abc_list_pressed_holo_dark = 2131230769;
-			
-			// aapt resource value: 0x7F080032
-			public const int abc_list_pressed_holo_light = 2131230770;
-			
-			// aapt resource value: 0x7F080033
-			public const int abc_list_selector_background_transition_holo_dark = 2131230771;
-			
-			// aapt resource value: 0x7F080034
-			public const int abc_list_selector_background_transition_holo_light = 2131230772;
-			
-			// aapt resource value: 0x7F080035
-			public const int abc_list_selector_disabled_holo_dark = 2131230773;
-			
-			// aapt resource value: 0x7F080036
-			public const int abc_list_selector_disabled_holo_light = 2131230774;
-			
-			// aapt resource value: 0x7F080037
-			public const int abc_list_selector_holo_dark = 2131230775;
-			
-			// aapt resource value: 0x7F080038
-			public const int abc_list_selector_holo_light = 2131230776;
-			
-			// aapt resource value: 0x7F080039
-			public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
-			
-			// aapt resource value: 0x7F08003A
-			public const int abc_popup_background_mtrl_mult = 2131230778;
-			
-			// aapt resource value: 0x7F08003B
-			public const int abc_ratingbar_indicator_material = 2131230779;
-			
-			// aapt resource value: 0x7F08003C
-			public const int abc_ratingbar_material = 2131230780;
-			
-			// aapt resource value: 0x7F08003D
-			public const int abc_ratingbar_small_material = 2131230781;
-			
-			// aapt resource value: 0x7F08003E
-			public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
-			
-			// aapt resource value: 0x7F08003F
-			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
-			
-			// aapt resource value: 0x7F080040
-			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
-			
-			// aapt resource value: 0x7F080041
-			public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
-			
-			// aapt resource value: 0x7F080042
-			public const int abc_scrubber_track_mtrl_alpha = 2131230786;
-			
-			// aapt resource value: 0x7F080043
-			public const int abc_seekbar_thumb_material = 2131230787;
-			
-			// aapt resource value: 0x7F080044
-			public const int abc_seekbar_tick_mark_material = 2131230788;
-			
-			// aapt resource value: 0x7F080045
-			public const int abc_seekbar_track_material = 2131230789;
-			
-			// aapt resource value: 0x7F080046
-			public const int abc_spinner_mtrl_am_alpha = 2131230790;
-			
-			// aapt resource value: 0x7F080047
-			public const int abc_spinner_textfield_background_material = 2131230791;
-			
-			// aapt resource value: 0x7F080048
-			public const int abc_switch_thumb_material = 2131230792;
-			
-			// aapt resource value: 0x7F080049
-			public const int abc_switch_track_mtrl_alpha = 2131230793;
-			
-			// aapt resource value: 0x7F08004A
-			public const int abc_tab_indicator_material = 2131230794;
-			
-			// aapt resource value: 0x7F08004B
-			public const int abc_tab_indicator_mtrl_alpha = 2131230795;
-			
-			// aapt resource value: 0x7F080053
-			public const int abc_textfield_activated_mtrl_alpha = 2131230803;
-			
-			// aapt resource value: 0x7F080054
-			public const int abc_textfield_default_mtrl_alpha = 2131230804;
-			
-			// aapt resource value: 0x7F080055
-			public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
-			
-			// aapt resource value: 0x7F080056
-			public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
-			
-			// aapt resource value: 0x7F080057
-			public const int abc_textfield_search_material = 2131230807;
-			
-			// aapt resource value: 0x7F08004C
-			public const int abc_text_cursor_material = 2131230796;
-			
-			// aapt resource value: 0x7F08004D
-			public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
-			
-			// aapt resource value: 0x7F08004E
-			public const int abc_text_select_handle_left_mtrl_light = 2131230798;
-			
-			// aapt resource value: 0x7F08004F
-			public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
-			
-			// aapt resource value: 0x7F080050
-			public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
-			
-			// aapt resource value: 0x7F080051
-			public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
-			
-			// aapt resource value: 0x7F080052
-			public const int abc_text_select_handle_right_mtrl_light = 2131230802;
-			
-			// aapt resource value: 0x7F080058
-			public const int abc_vector_test = 2131230808;
-			
-			// aapt resource value: 0x7F080059
-			public const int avd_hide_password = 2131230809;
-			
-			// aapt resource value: 0x7F08005A
-			public const int avd_show_password = 2131230810;
-			
-			// aapt resource value: 0x7F08005B
-			public const int design_bottom_navigation_item_background = 2131230811;
-			
-			// aapt resource value: 0x7F08005C
-			public const int design_fab_background = 2131230812;
-			
-			// aapt resource value: 0x7F08005D
-			public const int design_ic_visibility = 2131230813;
-			
-			// aapt resource value: 0x7F08005E
-			public const int design_ic_visibility_off = 2131230814;
-			
-			// aapt resource value: 0x7F08005F
-			public const int design_password_eye = 2131230815;
-			
-			// aapt resource value: 0x7F080060
-			public const int design_snackbar_background = 2131230816;
-			
-			// aapt resource value: 0x7F080061
-			public const int fingerprint_draw_off = 2131230817;
-			
-			// aapt resource value: 0x7F080062
-			public const int fingerprint_draw_off_animation = 2131230818;
-			
-			// aapt resource value: 0x7F080063
-			public const int fingerprint_draw_on = 2131230819;
-			
-			// aapt resource value: 0x7F080064
-			public const int fingerprint_draw_on_animation = 2131230820;
-			
-			// aapt resource value: 0x7F080065
-			public const int fingerprint_error = 2131230821;
-			
-			// aapt resource value: 0x7F080066
-			public const int fingerprint_error_off = 2131230822;
-			
-			// aapt resource value: 0x7F080067
-			public const int fingerprint_error_off_animation = 2131230823;
-			
-			// aapt resource value: 0x7F080068
-			public const int fingerprint_error_on = 2131230824;
-			
-			// aapt resource value: 0x7F080069
-			public const int fingerprint_error_on_animation = 2131230825;
-			
-			// aapt resource value: 0x7F08006A
-			public const int fingerprint_error_state_to_fp = 2131230826;
-			
-			// aapt resource value: 0x7F08006B
-			public const int fingerprint_error_state_to_fp_animation = 2131230827;
-			
-			// aapt resource value: 0x7F08006C
-			public const int fingerprint_fingerprint = 2131230828;
-			
-			// aapt resource value: 0x7F08006D
-			public const int fingerprint_fp_to_error_state = 2131230829;
-			
-			// aapt resource value: 0x7F08006E
-			public const int fingerprint_fp_to_error_state_animation = 2131230830;
-			
-			// aapt resource value: 0x7F08006F
-			public const int gd_btn_shape_app_b = 2131230831;
-			
-			// aapt resource value: 0x7F080070
-			public const int gd_btn_shape_app_g = 2131230832;
-			
-			// aapt resource value: 0x7F080071
-			public const int gd_btn_shape_app_w = 2131230833;
-			
-			// aapt resource value: 0x7F080072
-			public const int gd_btn_shape_shadow_w = 2131230834;
-			
-			// aapt resource value: 0x7F080073
-			public const int gd_click_effect_select = 2131230835;
-			
-			// aapt resource value: 0x7F080086
-			public const int Icon = 2131230854;
-			
-			// aapt resource value: 0x7F080074
-			public const int ic_gdmap_add = 2131230836;
-			
-			// aapt resource value: 0x7F080075
-			public const int ic_gdmap_back = 2131230837;
-			
-			// aapt resource value: 0x7F080076
-			public const int ic_gdmap_delete = 2131230838;
-			
-			// aapt resource value: 0x7F080077
-			public const int ic_gdmap_home = 2131230839;
-			
-			// aapt resource value: 0x7F080078
-			public const int ic_gdmap_mylocation = 2131230840;
-			
-			// aapt resource value: 0x7F080079
-			public const int ic_gdmap_now = 2131230841;
-			
-			// aapt resource value: 0x7F08007A
-			public const int ic_gdmap_search = 2131230842;
-			
-			// aapt resource value: 0x7F08007B
-			public const int ic_gdmap_zoom_out = 2131230843;
-			
-			// aapt resource value: 0x7F08007C
-			public const int ic_gps_point = 2131230844;
-			
-			// aapt resource value: 0x7F08007D
-			public const int ic_wd_arc_scale_bg = 2131230845;
-			
-			// aapt resource value: 0x7F08007E
-			public const int ic_wd_curtain_bg_top = 2131230846;
-			
-			// aapt resource value: 0x7F08007F
-			public const int ic_wd_curtain_h_bg = 2131230847;
-			
-			// aapt resource value: 0x7F080080
-			public const int ic_wd_curtain_h_open = 2131230848;
-			
-			// aapt resource value: 0x7F080081
-			public const int ic_wd_curtain_h_progress = 2131230849;
-			
-			// aapt resource value: 0x7F080082
-			public const int ic_wd_curtain_h_top = 2131230850;
-			
-			// aapt resource value: 0x7F080083
-			public const int ic_wd_curtain_open = 2131230851;
-			
-			// aapt resource value: 0x7F080084
-			public const int ic_wd_curtain_roll_bg = 2131230852;
-			
-			// aapt resource value: 0x7F080085
-			public const int ic_wd_curtain_roll_progress = 2131230853;
-			
-			// aapt resource value: 0x7F080087
-			public const int Loading = 2131230855;
-			
-			// aapt resource value: 0x7F080088
-			public const int navigation_empty_icon = 2131230856;
-			
-			// aapt resource value: 0x7F080089
-			public const int notification_action_background = 2131230857;
-			
-			// aapt resource value: 0x7F08008A
-			public const int notification_bg = 2131230858;
-			
-			// aapt resource value: 0x7F08008B
-			public const int notification_bg_low = 2131230859;
-			
-			// aapt resource value: 0x7F08008C
-			public const int notification_bg_low_normal = 2131230860;
-			
-			// aapt resource value: 0x7F08008D
-			public const int notification_bg_low_pressed = 2131230861;
-			
-			// aapt resource value: 0x7F08008E
-			public const int notification_bg_normal = 2131230862;
-			
-			// aapt resource value: 0x7F08008F
-			public const int notification_bg_normal_pressed = 2131230863;
-			
-			// aapt resource value: 0x7F080090
-			public const int notification_icon_background = 2131230864;
-			
-			// aapt resource value: 0x7F080091
-			public const int notification_template_icon_bg = 2131230865;
-			
-			// aapt resource value: 0x7F080092
-			public const int notification_template_icon_low_bg = 2131230866;
-			
-			// aapt resource value: 0x7F080093
-			public const int notification_tile_bg = 2131230867;
-			
-			// aapt resource value: 0x7F080094
-			public const int notify_panel_notification_icon_bg = 2131230868;
-			
-			// aapt resource value: 0x7F080095
-			public const int selector_pickerview_btn = 2131230869;
-			
-			// aapt resource value: 0x7F080096
-			public const int tooltip_frame_dark = 2131230870;
-			
-			// aapt resource value: 0x7F080097
-			public const int tooltip_frame_light = 2131230871;
+			// aapt resource value: 0x7F010001
+			public const int Loading = 2130771969;
 			
 			static Drawable()
 			{
@@ -2979,665 +63,17 @@
 		public partial class Id
 		{
 			
-			// aapt resource value: 0x7F09000E
-			public const int action0 = 2131296270;
+			// aapt resource value: 0x7F020000
+			public const int myButton = 2130837504;
 			
-			// aapt resource value: 0x7F090020
-			public const int actions = 2131296288;
+			// aapt resource value: 0x7F020001
+			public const int tv_zxing_back = 2130837505;
 			
-			// aapt resource value: 0x7F09000F
-			public const int action_bar = 2131296271;
+			// aapt resource value: 0x7F020002
+			public const int tv_zxing_flash = 2130837506;
 			
-			// aapt resource value: 0x7F090010
-			public const int action_bar_activity_content = 2131296272;
-			
-			// aapt resource value: 0x7F090011
-			public const int action_bar_container = 2131296273;
-			
-			// aapt resource value: 0x7F090012
-			public const int action_bar_root = 2131296274;
-			
-			// aapt resource value: 0x7F090013
-			public const int action_bar_spinner = 2131296275;
-			
-			// aapt resource value: 0x7F090014
-			public const int action_bar_subtitle = 2131296276;
-			
-			// aapt resource value: 0x7F090015
-			public const int action_bar_title = 2131296277;
-			
-			// aapt resource value: 0x7F090016
-			public const int action_container = 2131296278;
-			
-			// aapt resource value: 0x7F090017
-			public const int action_context_bar = 2131296279;
-			
-			// aapt resource value: 0x7F090018
-			public const int action_divider = 2131296280;
-			
-			// aapt resource value: 0x7F090019
-			public const int action_image = 2131296281;
-			
-			// aapt resource value: 0x7F09001A
-			public const int action_menu_divider = 2131296282;
-			
-			// aapt resource value: 0x7F09001B
-			public const int action_menu_presenter = 2131296283;
-			
-			// aapt resource value: 0x7F09001C
-			public const int action_mode_bar = 2131296284;
-			
-			// aapt resource value: 0x7F09001D
-			public const int action_mode_bar_stub = 2131296285;
-			
-			// aapt resource value: 0x7F09001E
-			public const int action_mode_close_button = 2131296286;
-			
-			// aapt resource value: 0x7F09001F
-			public const int action_text = 2131296287;
-			
-			// aapt resource value: 0x7F090021
-			public const int activity_chooser_view_content = 2131296289;
-			
-			// aapt resource value: 0x7F090022
-			public const int add = 2131296290;
-			
-			// aapt resource value: 0x7F090023
-			public const int alertTitle = 2131296291;
-			
-			// aapt resource value: 0x7F090024
-			public const int all = 2131296292;
-			
-			// aapt resource value: 0x7F090000
-			public const int ALT = 2131296256;
-			
-			// aapt resource value: 0x7F090025
-			public const int always = 2131296293;
-			
-			// aapt resource value: 0x7F090026
-			public const int async = 2131296294;
-			
-			// aapt resource value: 0x7F090027
-			public const int auto = 2131296295;
-			
-			// aapt resource value: 0x7F090028
-			public const int beginning = 2131296296;
-			
-			// aapt resource value: 0x7F090029
-			public const int blocking = 2131296297;
-			
-			// aapt resource value: 0x7F09002A
-			public const int bottom = 2131296298;
-			
-			// aapt resource value: 0x7F09002B
-			public const int btnCancel = 2131296299;
-			
-			// aapt resource value: 0x7F09002C
-			public const int btnSubmit = 2131296300;
-			
-			// aapt resource value: 0x7F09002D
-			public const int buttonPanel = 2131296301;
-			
-			// aapt resource value: 0x7F09002E
-			public const int cancel_action = 2131296302;
-			
-			// aapt resource value: 0x7F09002F
-			public const int center = 2131296303;
-			
-			// aapt resource value: 0x7F090030
-			public const int center_horizontal = 2131296304;
-			
-			// aapt resource value: 0x7F090031
-			public const int center_vertical = 2131296305;
-			
-			// aapt resource value: 0x7F090032
-			public const int checkbox = 2131296306;
-			
-			// aapt resource value: 0x7F090033
-			public const int chronometer = 2131296307;
-			
-			// aapt resource value: 0x7F090034
-			public const int clip_horizontal = 2131296308;
-			
-			// aapt resource value: 0x7F090035
-			public const int clip_vertical = 2131296309;
-			
-			// aapt resource value: 0x7F090036
-			public const int collapseActionView = 2131296310;
-			
-			// aapt resource value: 0x7F090037
-			public const int container = 2131296311;
-			
-			// aapt resource value: 0x7F090038
-			public const int contentFrame = 2131296312;
-			
-			// aapt resource value: 0x7F090039
-			public const int contentPanel = 2131296313;
-			
-			// aapt resource value: 0x7F09003A
-			public const int content_container = 2131296314;
-			
-			// aapt resource value: 0x7F09003B
-			public const int coordinator = 2131296315;
-			
-			// aapt resource value: 0x7F090001
-			public const int CTRL = 2131296257;
-			
-			// aapt resource value: 0x7F09003C
-			public const int custom = 2131296316;
-			
-			// aapt resource value: 0x7F09003D
-			public const int customPanel = 2131296317;
-			
-			// aapt resource value: 0x7F09003E
-			public const int day = 2131296318;
-			
-			// aapt resource value: 0x7F09003F
-			public const int decor_content_parent = 2131296319;
-			
-			// aapt resource value: 0x7F090040
-			public const int default_activity_button = 2131296320;
-			
-			// aapt resource value: 0x7F090041
-			public const int description = 2131296321;
-			
-			// aapt resource value: 0x7F090042
-			public const int design_bottom_sheet = 2131296322;
-			
-			// aapt resource value: 0x7F090043
-			public const int design_menu_item_action_area = 2131296323;
-			
-			// aapt resource value: 0x7F090044
-			public const int design_menu_item_action_area_stub = 2131296324;
-			
-			// aapt resource value: 0x7F090045
-			public const int design_menu_item_text = 2131296325;
-			
-			// aapt resource value: 0x7F090046
-			public const int design_navigation_view = 2131296326;
-			
-			// aapt resource value: 0x7F090047
-			public const int disableHome = 2131296327;
-			
-			// aapt resource value: 0x7F090048
-			public const int edit_query = 2131296328;
-			
-			// aapt resource value: 0x7F090049
-			public const int end = 2131296329;
-			
-			// aapt resource value: 0x7F09004A
-			public const int end_padder = 2131296330;
-			
-			// aapt resource value: 0x7F09004B
-			public const int enterAlways = 2131296331;
-			
-			// aapt resource value: 0x7F09004C
-			public const int enterAlwaysCollapsed = 2131296332;
-			
-			// aapt resource value: 0x7F09004D
-			public const int exitUntilCollapsed = 2131296333;
-			
-			// aapt resource value: 0x7F09004F
-			public const int expanded_menu = 2131296335;
-			
-			// aapt resource value: 0x7F09004E
-			public const int expand_activities_button = 2131296334;
-			
-			// aapt resource value: 0x7F090050
-			public const int fill = 2131296336;
-			
-			// aapt resource value: 0x7F090002
-			public const int FILL = 2131296258;
-			
-			// aapt resource value: 0x7F090051
-			public const int fill_horizontal = 2131296337;
-			
-			// aapt resource value: 0x7F090003
-			public const int FILL_STROKE = 2131296259;
-			
-			// aapt resource value: 0x7F090052
-			public const int fill_vertical = 2131296338;
-			
-			// aapt resource value: 0x7F090053
-			public const int fingerprint_icon = 2131296339;
-			
-			// aapt resource value: 0x7F090054
-			public const int @fixed = 2131296340;
-			
-			// aapt resource value: 0x7F090005
-			public const int FixedBehind = 2131296261;
-			
-			// aapt resource value: 0x7F090006
-			public const int FixedFront = 2131296262;
-			
-			// aapt resource value: 0x7F090055
-			public const int forever = 2131296341;
-			
-			// aapt resource value: 0x7F090004
-			public const int FUNCTION = 2131296260;
-			
-			// aapt resource value: 0x7F090056
-			public const int gd_btn_back = 2131296342;
-			
-			// aapt resource value: 0x7F090057
-			public const int gd_btn_myLocation = 2131296343;
-			
-			// aapt resource value: 0x7F090058
-			public const int gd_btn_save = 2131296344;
-			
-			// aapt resource value: 0x7F090059
-			public const int gd_img_search_delete = 2131296345;
-			
-			// aapt resource value: 0x7F09005A
-			public const int gd_ll_myhome = 2131296346;
-			
-			// aapt resource value: 0x7F09005B
-			public const int gd_ll_search = 2131296347;
-			
-			// aapt resource value: 0x7F09005C
-			public const int gd_mapView = 2131296348;
-			
-			// aapt resource value: 0x7F09005D
-			public const int gd_rl_topview = 2131296349;
-			
-			// aapt resource value: 0x7F09005E
-			public const int gd_tv_activity_title = 2131296350;
-			
-			// aapt resource value: 0x7F09005F
-			public const int gd_tv_radius = 2131296351;
-			
-			// aapt resource value: 0x7F090060
-			public const int gd_tv_search_title = 2131296352;
-			
-			// aapt resource value: 0x7F090061
-			public const int hdl_gallery_rootView = 2131296353;
-			
-			// aapt resource value: 0x7F090062
-			public const int hdl_gallery_viewPager = 2131296354;
-			
-			// aapt resource value: 0x7F090063
-			public const int hdl_options1 = 2131296355;
-			
-			// aapt resource value: 0x7F090064
-			public const int hdl_options2 = 2131296356;
-			
-			// aapt resource value: 0x7F090065
-			public const int hdl_options3 = 2131296357;
-			
-			// aapt resource value: 0x7F090066
-			public const int hdl_pickerview_ll = 2131296358;
-			
-			// aapt resource value: 0x7F090067
-			public const int home = 2131296359;
-			
-			// aapt resource value: 0x7F090068
-			public const int homeAsUp = 2131296360;
-			
-			// aapt resource value: 0x7F090069
-			public const int hour = 2131296361;
-			
-			// aapt resource value: 0x7F09006A
-			public const int icon = 2131296362;
-			
-			// aapt resource value: 0x7F09006B
-			public const int icon_group = 2131296363;
-			
-			// aapt resource value: 0x7F09006C
-			public const int ifRoom = 2131296364;
-			
-			// aapt resource value: 0x7F09006D
-			public const int image = 2131296365;
-			
-			// aapt resource value: 0x7F09006E
-			public const int info = 2131296366;
-			
-			// aapt resource value: 0x7F09006F
-			public const int italic = 2131296367;
-			
-			// aapt resource value: 0x7F090070
-			public const int item_touch_helper_previous_elevation = 2131296368;
-			
-			// aapt resource value: 0x7F090071
-			public const int largeLabel = 2131296369;
-			
-			// aapt resource value: 0x7F090072
-			public const int left = 2131296370;
-			
-			// aapt resource value: 0x7F090073
-			public const int line1 = 2131296371;
-			
-			// aapt resource value: 0x7F090074
-			public const int line3 = 2131296372;
-			
-			// aapt resource value: 0x7F090075
-			public const int listMode = 2131296373;
-			
-			// aapt resource value: 0x7F090076
-			public const int list_item = 2131296374;
-			
-			// aapt resource value: 0x7F090077
-			public const int masked = 2131296375;
-			
-			// aapt resource value: 0x7F090008
-			public const int MatchLayout = 2131296264;
-			
-			// aapt resource value: 0x7F090078
-			public const int media_actions = 2131296376;
-			
-			// aapt resource value: 0x7F090079
-			public const int message = 2131296377;
-			
-			// aapt resource value: 0x7F090007
-			public const int META = 2131296263;
-			
-			// aapt resource value: 0x7F09007A
-			public const int middle = 2131296378;
-			
-			// aapt resource value: 0x7F09007B
-			public const int min = 2131296379;
-			
-			// aapt resource value: 0x7F09007C
-			public const int mini = 2131296380;
-			
-			// aapt resource value: 0x7F09007D
-			public const int month = 2131296381;
-			
-			// aapt resource value: 0x7F09007E
-			public const int multiply = 2131296382;
-			
-			// aapt resource value: 0x7F09007F
-			public const int myButton = 2131296383;
-			
-			// aapt resource value: 0x7F090080
-			public const int navigation_header_container = 2131296384;
-			
-			// aapt resource value: 0x7F090081
-			public const int never = 2131296385;
-			
-			// aapt resource value: 0x7F090082
-			public const int none = 2131296386;
-			
-			// aapt resource value: 0x7F090083
-			public const int normal = 2131296387;
-			
-			// aapt resource value: 0x7F090084
-			public const int notification_background = 2131296388;
-			
-			// aapt resource value: 0x7F090085
-			public const int notification_main_column = 2131296389;
-			
-			// aapt resource value: 0x7F090086
-			public const int notification_main_column_container = 2131296390;
-			
-			// aapt resource value: 0x7F090087
-			public const int options1 = 2131296391;
-			
-			// aapt resource value: 0x7F090088
-			public const int options2 = 2131296392;
-			
-			// aapt resource value: 0x7F090089
-			public const int options3 = 2131296393;
-			
-			// aapt resource value: 0x7F09008A
-			public const int optionspicker = 2131296394;
-			
-			// aapt resource value: 0x7F09008B
-			public const int outmost_container = 2131296395;
-			
-			// aapt resource value: 0x7F09008C
-			public const int parallax = 2131296396;
-			
-			// aapt resource value: 0x7F09008D
-			public const int parentPanel = 2131296397;
-			
-			// aapt resource value: 0x7F09008E
-			public const int pin = 2131296398;
-			
-			// aapt resource value: 0x7F09008F
-			public const int progress_circular = 2131296399;
-			
-			// aapt resource value: 0x7F090090
-			public const int progress_horizontal = 2131296400;
-			
-			// aapt resource value: 0x7F090091
-			public const int radio = 2131296401;
-			
-			// aapt resource value: 0x7F090092
-			public const int right = 2131296402;
-			
-			// aapt resource value: 0x7F090093
-			public const int right_icon = 2131296403;
-			
-			// aapt resource value: 0x7F090094
-			public const int right_side = 2131296404;
-			
-			// aapt resource value: 0x7F090095
-			public const int rv_topbar = 2131296405;
-			
-			// aapt resource value: 0x7F09000C
-			public const int Scale = 2131296268;
-			
-			// aapt resource value: 0x7F090096
-			public const int screen = 2131296406;
-			
-			// aapt resource value: 0x7F090097
-			public const int scroll = 2131296407;
-			
-			// aapt resource value: 0x7F09009B
-			public const int scrollable = 2131296411;
-			
-			// aapt resource value: 0x7F090098
-			public const int scrollIndicatorDown = 2131296408;
-			
-			// aapt resource value: 0x7F090099
-			public const int scrollIndicatorUp = 2131296409;
-			
-			// aapt resource value: 0x7F09009A
-			public const int scrollView = 2131296410;
-			
-			// aapt resource value: 0x7F09009C
-			public const int search_badge = 2131296412;
-			
-			// aapt resource value: 0x7F09009D
-			public const int search_bar = 2131296413;
-			
-			// aapt resource value: 0x7F09009E
-			public const int search_button = 2131296414;
-			
-			// aapt resource value: 0x7F09009F
-			public const int search_close_btn = 2131296415;
-			
-			// aapt resource value: 0x7F0900A0
-			public const int search_edit_frame = 2131296416;
-			
-			// aapt resource value: 0x7F0900A1
-			public const int search_go_btn = 2131296417;
-			
-			// aapt resource value: 0x7F0900A2
-			public const int search_mag_icon = 2131296418;
-			
-			// aapt resource value: 0x7F0900A3
-			public const int search_plate = 2131296419;
-			
-			// aapt resource value: 0x7F0900A4
-			public const int search_src_text = 2131296420;
-			
-			// aapt resource value: 0x7F0900A5
-			public const int search_voice_btn = 2131296421;
-			
-			// aapt resource value: 0x7F0900A6
-			public const int second = 2131296422;
-			
-			// aapt resource value: 0x7F0900A7
-			public const int select_dialog_listview = 2131296423;
-			
-			// aapt resource value: 0x7F090009
-			public const int SHIFT = 2131296265;
-			
-			// aapt resource value: 0x7F0900A8
-			public const int shortcut = 2131296424;
-			
-			// aapt resource value: 0x7F0900A9
-			public const int showCustom = 2131296425;
-			
-			// aapt resource value: 0x7F0900AA
-			public const int showHome = 2131296426;
-			
-			// aapt resource value: 0x7F0900AB
-			public const int showTitle = 2131296427;
-			
-			// aapt resource value: 0x7F0900AC
-			public const int smallLabel = 2131296428;
-			
-			// aapt resource value: 0x7F0900AD
-			public const int snackbar_action = 2131296429;
-			
-			// aapt resource value: 0x7F0900AE
-			public const int snackbar_text = 2131296430;
-			
-			// aapt resource value: 0x7F0900AF
-			public const int snap = 2131296431;
-			
-			// aapt resource value: 0x7F0900B0
-			public const int spacer = 2131296432;
-			
-			// aapt resource value: 0x7F0900B1
-			public const int split_action_bar = 2131296433;
-			
-			// aapt resource value: 0x7F0900B2
-			public const int src_atop = 2131296434;
-			
-			// aapt resource value: 0x7F0900B3
-			public const int src_in = 2131296435;
-			
-			// aapt resource value: 0x7F0900B4
-			public const int src_over = 2131296436;
-			
-			// aapt resource value: 0x7F0900B5
-			public const int srl_classics_arrow = 2131296437;
-			
-			// aapt resource value: 0x7F0900B6
-			public const int srl_classics_center = 2131296438;
-			
-			// aapt resource value: 0x7F0900B7
-			public const int srl_classics_progress = 2131296439;
-			
-			// aapt resource value: 0x7F0900B8
-			public const int srl_classics_title = 2131296440;
-			
-			// aapt resource value: 0x7F0900B9
-			public const int srl_classics_update = 2131296441;
-			
-			// aapt resource value: 0x7F0900BA
-			public const int start = 2131296442;
-			
-			// aapt resource value: 0x7F0900BB
-			public const int status = 2131296443;
-			
-			// aapt resource value: 0x7F0900BC
-			public const int status_bar_latest_event_content = 2131296444;
-			
-			// aapt resource value: 0x7F09000A
-			public const int STROKE = 2131296266;
-			
-			// aapt resource value: 0x7F0900BD
-			public const int submenuarrow = 2131296445;
-			
-			// aapt resource value: 0x7F0900BE
-			public const int submit_area = 2131296446;
-			
-			// aapt resource value: 0x7F0900BF
-			public const int subtitle = 2131296447;
-			
-			// aapt resource value: 0x7F09000B
-			public const int SYM = 2131296267;
-			
-			// aapt resource value: 0x7F0900C0
-			public const int tabMode = 2131296448;
-			
-			// aapt resource value: 0x7F0900C1
-			public const int text = 2131296449;
-			
-			// aapt resource value: 0x7F0900C2
-			public const int text2 = 2131296450;
-			
-			// aapt resource value: 0x7F0900C6
-			public const int textinput_counter = 2131296454;
-			
-			// aapt resource value: 0x7F0900C7
-			public const int textinput_error = 2131296455;
-			
-			// aapt resource value: 0x7F0900C3
-			public const int textSpacerNoButtons = 2131296451;
-			
-			// aapt resource value: 0x7F0900C4
-			public const int textSpacerNoTitle = 2131296452;
-			
-			// aapt resource value: 0x7F0900C5
-			public const int text_input_password_toggle = 2131296453;
-			
-			// aapt resource value: 0x7F0900C8
-			public const int time = 2131296456;
-			
-			// aapt resource value: 0x7F0900C9
-			public const int timepicker = 2131296457;
-			
-			// aapt resource value: 0x7F0900CA
-			public const int title = 2131296458;
-			
-			// aapt resource value: 0x7F0900CB
-			public const int titleDividerNoCustom = 2131296459;
-			
-			// aapt resource value: 0x7F0900CC
-			public const int title_template = 2131296460;
-			
-			// aapt resource value: 0x7F0900CD
-			public const int top = 2131296461;
-			
-			// aapt resource value: 0x7F0900CE
-			public const int topPanel = 2131296462;
-			
-			// aapt resource value: 0x7F0900CF
-			public const int touch_outside = 2131296463;
-			
-			// aapt resource value: 0x7F09000D
-			public const int Translate = 2131296269;
-			
-			// aapt resource value: 0x7F0900D0
-			public const int tvTitle = 2131296464;
-			
-			// aapt resource value: 0x7F0900D1
-			public const int tv_zxing_back = 2131296465;
-			
-			// aapt resource value: 0x7F0900D2
-			public const int tv_zxing_flash = 2131296466;
-			
-			// aapt resource value: 0x7F0900D3
-			public const int tv_zxing_scan = 2131296467;
-			
-			// aapt resource value: 0x7F0900D4
-			public const int uniform = 2131296468;
-			
-			// aapt resource value: 0x7F0900D5
-			public const int up = 2131296469;
-			
-			// aapt resource value: 0x7F0900D6
-			public const int useLogo = 2131296470;
-			
-			// aapt resource value: 0x7F0900D7
-			public const int view_offset_helper = 2131296471;
-			
-			// aapt resource value: 0x7F0900D8
-			public const int visible = 2131296472;
-			
-			// aapt resource value: 0x7F0900D9
-			public const int withText = 2131296473;
-			
-			// aapt resource value: 0x7F0900DA
-			public const int wrap_content = 2131296474;
-			
-			// aapt resource value: 0x7F0900DB
-			public const int year = 2131296475;
+			// aapt resource value: 0x7F020003
+			public const int tv_zxing_scan = 2130837507;
 			
 			static Id()
 			{
@@ -3649,285 +85,14 @@
 			}
 		}
 		
-		public partial class Integer
-		{
-			
-			// aapt resource value: 0x7F0A0000
-			public const int abc_config_activityDefaultDur = 2131361792;
-			
-			// aapt resource value: 0x7F0A0001
-			public const int abc_config_activityShortDur = 2131361793;
-			
-			// aapt resource value: 0x7F0A0002
-			public const int animation_default_duration = 2131361794;
-			
-			// aapt resource value: 0x7F0A0003
-			public const int app_bar_elevation_anim_duration = 2131361795;
-			
-			// aapt resource value: 0x7F0A0004
-			public const int bottom_sheet_slide_duration = 2131361796;
-			
-			// aapt resource value: 0x7F0A0005
-			public const int cancel_button_image_alpha = 2131361797;
-			
-			// aapt resource value: 0x7F0A0006
-			public const int config_tooltipAnimTime = 2131361798;
-			
-			// aapt resource value: 0x7F0A0007
-			public const int design_snackbar_text_max_lines = 2131361799;
-			
-			// aapt resource value: 0x7F0A0008
-			public const int hide_password_duration = 2131361800;
-			
-			// aapt resource value: 0x7F0A0009
-			public const int show_password_duration = 2131361801;
-			
-			// aapt resource value: 0x7F0A000A
-			public const int status_bar_notification_info_maxnum = 2131361802;
-			
-			static Integer()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Integer()
-			{
-			}
-		}
-		
 		public partial class Layout
 		{
 			
-			// aapt resource value: 0x7F0B0000
-			public const int abc_action_bar_title_item = 2131427328;
+			// aapt resource value: 0x7F030000
+			public const int Main = 2130903040;
 			
-			// aapt resource value: 0x7F0B0001
-			public const int abc_action_bar_up_container = 2131427329;
-			
-			// aapt resource value: 0x7F0B0002
-			public const int abc_action_bar_view_list_nav_layout = 2131427330;
-			
-			// aapt resource value: 0x7F0B0003
-			public const int abc_action_menu_item_layout = 2131427331;
-			
-			// aapt resource value: 0x7F0B0004
-			public const int abc_action_menu_layout = 2131427332;
-			
-			// aapt resource value: 0x7F0B0005
-			public const int abc_action_mode_bar = 2131427333;
-			
-			// aapt resource value: 0x7F0B0006
-			public const int abc_action_mode_close_item_material = 2131427334;
-			
-			// aapt resource value: 0x7F0B0007
-			public const int abc_activity_chooser_view = 2131427335;
-			
-			// aapt resource value: 0x7F0B0008
-			public const int abc_activity_chooser_view_list_item = 2131427336;
-			
-			// aapt resource value: 0x7F0B0009
-			public const int abc_alert_dialog_button_bar_material = 2131427337;
-			
-			// aapt resource value: 0x7F0B000A
-			public const int abc_alert_dialog_material = 2131427338;
-			
-			// aapt resource value: 0x7F0B000B
-			public const int abc_alert_dialog_title_material = 2131427339;
-			
-			// aapt resource value: 0x7F0B000C
-			public const int abc_dialog_title_material = 2131427340;
-			
-			// aapt resource value: 0x7F0B000D
-			public const int abc_expanded_menu_layout = 2131427341;
-			
-			// aapt resource value: 0x7F0B000E
-			public const int abc_list_menu_item_checkbox = 2131427342;
-			
-			// aapt resource value: 0x7F0B000F
-			public const int abc_list_menu_item_icon = 2131427343;
-			
-			// aapt resource value: 0x7F0B0010
-			public const int abc_list_menu_item_layout = 2131427344;
-			
-			// aapt resource value: 0x7F0B0011
-			public const int abc_list_menu_item_radio = 2131427345;
-			
-			// aapt resource value: 0x7F0B0012
-			public const int abc_popup_menu_header_item_layout = 2131427346;
-			
-			// aapt resource value: 0x7F0B0013
-			public const int abc_popup_menu_item_layout = 2131427347;
-			
-			// aapt resource value: 0x7F0B0014
-			public const int abc_screen_content_include = 2131427348;
-			
-			// aapt resource value: 0x7F0B0015
-			public const int abc_screen_simple = 2131427349;
-			
-			// aapt resource value: 0x7F0B0016
-			public const int abc_screen_simple_overlay_action_mode = 2131427350;
-			
-			// aapt resource value: 0x7F0B0017
-			public const int abc_screen_toolbar = 2131427351;
-			
-			// aapt resource value: 0x7F0B0018
-			public const int abc_search_dropdown_item_icons_2line = 2131427352;
-			
-			// aapt resource value: 0x7F0B0019
-			public const int abc_search_view = 2131427353;
-			
-			// aapt resource value: 0x7F0B001A
-			public const int abc_select_dialog_material = 2131427354;
-			
-			// aapt resource value: 0x7F0B001B
-			public const int biometric_prompt_dialog_content = 2131427355;
-			
-			// aapt resource value: 0x7F0B001C
-			public const int design_bottom_navigation_item = 2131427356;
-			
-			// aapt resource value: 0x7F0B001D
-			public const int design_bottom_sheet_dialog = 2131427357;
-			
-			// aapt resource value: 0x7F0B001E
-			public const int design_layout_snackbar = 2131427358;
-			
-			// aapt resource value: 0x7F0B001F
-			public const int design_layout_snackbar_include = 2131427359;
-			
-			// aapt resource value: 0x7F0B0020
-			public const int design_layout_tab_icon = 2131427360;
-			
-			// aapt resource value: 0x7F0B0021
-			public const int design_layout_tab_text = 2131427361;
-			
-			// aapt resource value: 0x7F0B0022
-			public const int design_menu_item_action_area = 2131427362;
-			
-			// aapt resource value: 0x7F0B0023
-			public const int design_navigation_item = 2131427363;
-			
-			// aapt resource value: 0x7F0B0024
-			public const int design_navigation_item_header = 2131427364;
-			
-			// aapt resource value: 0x7F0B0025
-			public const int design_navigation_item_separator = 2131427365;
-			
-			// aapt resource value: 0x7F0B0026
-			public const int design_navigation_item_subheader = 2131427366;
-			
-			// aapt resource value: 0x7F0B0027
-			public const int design_navigation_menu = 2131427367;
-			
-			// aapt resource value: 0x7F0B0028
-			public const int design_navigation_menu_item = 2131427368;
-			
-			// aapt resource value: 0x7F0B0029
-			public const int design_text_input_password_icon = 2131427369;
-			
-			// aapt resource value: 0x7F0B002A
-			public const int hdl_gallery_banner_view_layout = 2131427370;
-			
-			// aapt resource value: 0x7F0B002B
-			public const int hdl_widget_activity_crop_image = 2131427371;
-			
-			// aapt resource value: 0x7F0B002C
-			public const int hdl_widget_activity_geofence_round = 2131427372;
-			
-			// aapt resource value: 0x7F0B002D
-			public const int hdl_widget_air_button = 2131427373;
-			
-			// aapt resource value: 0x7F0B002E
-			public const int hdl_widget_include_pickerview_topbar = 2131427374;
-			
-			// aapt resource value: 0x7F0B002F
-			public const int hdl_widget_layout_basepickerview = 2131427375;
-			
-			// aapt resource value: 0x7F0B0030
-			public const int hdl_widget_pickerview = 2131427376;
-			
-			// aapt resource value: 0x7F0B0031
-			public const int hdl_widget_pickerview_options = 2131427377;
-			
-			// aapt resource value: 0x7F0B0032
-			public const int hdl_widget_pickerview_time = 2131427378;
-			
-			// aapt resource value: 0x7F0B0033
-			public const int Main = 2131427379;
-			
-			// aapt resource value: 0x7F0B0034
-			public const int notification_action = 2131427380;
-			
-			// aapt resource value: 0x7F0B0035
-			public const int notification_action_tombstone = 2131427381;
-			
-			// aapt resource value: 0x7F0B0036
-			public const int notification_media_action = 2131427382;
-			
-			// aapt resource value: 0x7F0B0037
-			public const int notification_media_cancel_action = 2131427383;
-			
-			// aapt resource value: 0x7F0B0038
-			public const int notification_template_big_media = 2131427384;
-			
-			// aapt resource value: 0x7F0B0039
-			public const int notification_template_big_media_custom = 2131427385;
-			
-			// aapt resource value: 0x7F0B003A
-			public const int notification_template_big_media_narrow = 2131427386;
-			
-			// aapt resource value: 0x7F0B003B
-			public const int notification_template_big_media_narrow_custom = 2131427387;
-			
-			// aapt resource value: 0x7F0B003C
-			public const int notification_template_custom_big = 2131427388;
-			
-			// aapt resource value: 0x7F0B003D
-			public const int notification_template_icon_group = 2131427389;
-			
-			// aapt resource value: 0x7F0B003E
-			public const int notification_template_lines_media = 2131427390;
-			
-			// aapt resource value: 0x7F0B003F
-			public const int notification_template_media = 2131427391;
-			
-			// aapt resource value: 0x7F0B0040
-			public const int notification_template_media_custom = 2131427392;
-			
-			// aapt resource value: 0x7F0B0041
-			public const int notification_template_part_chronometer = 2131427393;
-			
-			// aapt resource value: 0x7F0B0042
-			public const int notification_template_part_time = 2131427394;
-			
-			// aapt resource value: 0x7F0B0043
-			public const int select_dialog_item_material = 2131427395;
-			
-			// aapt resource value: 0x7F0B0044
-			public const int select_dialog_multichoice_material = 2131427396;
-			
-			// aapt resource value: 0x7F0B0045
-			public const int select_dialog_singlechoice_material = 2131427397;
-			
-			// aapt resource value: 0x7F0B0046
-			public const int srl_classics_footer = 2131427398;
-			
-			// aapt resource value: 0x7F0B0047
-			public const int srl_classics_header = 2131427399;
-			
-			// aapt resource value: 0x7F0B0048
-			public const int support_simple_spinner_dropdown_item = 2131427400;
-			
-			// aapt resource value: 0x7F0B0049
-			public const int tooltip = 2131427401;
-			
-			// aapt resource value: 0x7F0B004B
-			public const int zxingscanneractivitylayout = 2131427403;
-			
-			// aapt resource value: 0x7F0B004C
-			public const int zxingscannerfragmentlayout = 2131427404;
-			
-			// aapt resource value: 0x7F0B004A
-			public const int zxing_layout = 2131427402;
+			// aapt resource value: 0x7F030001
+			public const int zxing_layout = 2130903041;
 			
 			static Layout()
 			{
@@ -3942,8 +107,8 @@
 		public partial class Mipmap
 		{
 			
-			// aapt resource value: 0x7F0C0000
-			public const int Icon = 2131492864;
+			// aapt resource value: 0x7F040000
+			public const int Icon = 2130968576;
 			
 			static Mipmap()
 			{
@@ -3958,242 +123,11 @@
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7F0D0000
-			public const int abc_action_bar_home_description = 2131558400;
+			// aapt resource value: 0x7F050000
+			public const int app_name = 2131034112;
 			
-			// aapt resource value: 0x7F0D0001
-			public const int abc_action_bar_home_description_format = 2131558401;
-			
-			// aapt resource value: 0x7F0D0002
-			public const int abc_action_bar_home_subtitle_description_format = 2131558402;
-			
-			// aapt resource value: 0x7F0D0003
-			public const int abc_action_bar_up_description = 2131558403;
-			
-			// aapt resource value: 0x7F0D0004
-			public const int abc_action_menu_overflow_description = 2131558404;
-			
-			// aapt resource value: 0x7F0D0005
-			public const int abc_action_mode_done = 2131558405;
-			
-			// aapt resource value: 0x7F0D0007
-			public const int abc_activitychooserview_choose_application = 2131558407;
-			
-			// aapt resource value: 0x7F0D0006
-			public const int abc_activity_chooser_view_see_all = 2131558406;
-			
-			// aapt resource value: 0x7F0D0008
-			public const int abc_capital_off = 2131558408;
-			
-			// aapt resource value: 0x7F0D0009
-			public const int abc_capital_on = 2131558409;
-			
-			// aapt resource value: 0x7F0D000A
-			public const int abc_font_family_body_1_material = 2131558410;
-			
-			// aapt resource value: 0x7F0D000B
-			public const int abc_font_family_body_2_material = 2131558411;
-			
-			// aapt resource value: 0x7F0D000C
-			public const int abc_font_family_button_material = 2131558412;
-			
-			// aapt resource value: 0x7F0D000D
-			public const int abc_font_family_caption_material = 2131558413;
-			
-			// aapt resource value: 0x7F0D000E
-			public const int abc_font_family_display_1_material = 2131558414;
-			
-			// aapt resource value: 0x7F0D000F
-			public const int abc_font_family_display_2_material = 2131558415;
-			
-			// aapt resource value: 0x7F0D0010
-			public const int abc_font_family_display_3_material = 2131558416;
-			
-			// aapt resource value: 0x7F0D0011
-			public const int abc_font_family_display_4_material = 2131558417;
-			
-			// aapt resource value: 0x7F0D0012
-			public const int abc_font_family_headline_material = 2131558418;
-			
-			// aapt resource value: 0x7F0D0013
-			public const int abc_font_family_menu_material = 2131558419;
-			
-			// aapt resource value: 0x7F0D0014
-			public const int abc_font_family_subhead_material = 2131558420;
-			
-			// aapt resource value: 0x7F0D0015
-			public const int abc_font_family_title_material = 2131558421;
-			
-			// aapt resource value: 0x7F0D0017
-			public const int abc_searchview_description_clear = 2131558423;
-			
-			// aapt resource value: 0x7F0D0018
-			public const int abc_searchview_description_query = 2131558424;
-			
-			// aapt resource value: 0x7F0D0019
-			public const int abc_searchview_description_search = 2131558425;
-			
-			// aapt resource value: 0x7F0D001A
-			public const int abc_searchview_description_submit = 2131558426;
-			
-			// aapt resource value: 0x7F0D001B
-			public const int abc_searchview_description_voice = 2131558427;
-			
-			// aapt resource value: 0x7F0D0016
-			public const int abc_search_hint = 2131558422;
-			
-			// aapt resource value: 0x7F0D001C
-			public const int abc_shareactionprovider_share_with = 2131558428;
-			
-			// aapt resource value: 0x7F0D001D
-			public const int abc_shareactionprovider_share_with_application = 2131558429;
-			
-			// aapt resource value: 0x7F0D001E
-			public const int abc_toolbar_collapse_description = 2131558430;
-			
-			// aapt resource value: 0x7F0D0020
-			public const int appbar_scrolling_view_behavior = 2131558432;
-			
-			// aapt resource value: 0x7F0D001F
-			public const int app_name = 2131558431;
-			
-			// aapt resource value: 0x7F0D0021
-			public const int bottom_sheet_behavior = 2131558433;
-			
-			// aapt resource value: 0x7F0D0022
-			public const int character_counter_pattern = 2131558434;
-			
-			// aapt resource value: 0x7F0D0023
-			public const int gd_activity_title = 2131558435;
-			
-			// aapt resource value: 0x7F0D0024
-			public const int gd_cancel = 2131558436;
-			
-			// aapt resource value: 0x7F0D0025
-			public const int gd_myhome = 2131558437;
-			
-			// aapt resource value: 0x7F0D0026
-			public const int gd_notifyMsg = 2131558438;
-			
-			// aapt resource value: 0x7F0D0027
-			public const int gd_notifyTitle = 2131558439;
-			
-			// aapt resource value: 0x7F0D0028
-			public const int gd_save = 2131558440;
-			
-			// aapt resource value: 0x7F0D0029
-			public const int gd_search_tip = 2131558441;
-			
-			// aapt resource value: 0x7F0D002A
-			public const int gd_select_distance = 2131558442;
-			
-			// aapt resource value: 0x7F0D002B
-			public const int gd_setting = 2131558443;
-			
-			// aapt resource value: 0x7F0D002C
-			public const int hello = 2131558444;
-			
-			// aapt resource value: 0x7F0D002D
-			public const int not_recognized_fingerprint_hint = 2131558445;
-			
-			// aapt resource value: 0x7F0D002E
-			public const int password_toggle_content_description = 2131558446;
-			
-			// aapt resource value: 0x7F0D002F
-			public const int path_password_eye = 2131558447;
-			
-			// aapt resource value: 0x7F0D0030
-			public const int path_password_eye_mask_strike_through = 2131558448;
-			
-			// aapt resource value: 0x7F0D0031
-			public const int path_password_eye_mask_visible = 2131558449;
-			
-			// aapt resource value: 0x7F0D0032
-			public const int path_password_strike_through = 2131558450;
-			
-			// aapt resource value: 0x7F0D0033
-			public const int pickerview_cancel = 2131558451;
-			
-			// aapt resource value: 0x7F0D0034
-			public const int pickerview_day = 2131558452;
-			
-			// aapt resource value: 0x7F0D0035
-			public const int pickerview_hours = 2131558453;
-			
-			// aapt resource value: 0x7F0D0036
-			public const int pickerview_minutes = 2131558454;
-			
-			// aapt resource value: 0x7F0D0037
-			public const int pickerview_month = 2131558455;
-			
-			// aapt resource value: 0x7F0D0038
-			public const int pickerview_seconds = 2131558456;
-			
-			// aapt resource value: 0x7F0D0039
-			public const int pickerview_submit = 2131558457;
-			
-			// aapt resource value: 0x7F0D003A
-			public const int pickerview_year = 2131558458;
-			
-			// aapt resource value: 0x7F0D003B
-			public const int search_menu_title = 2131558459;
-			
-			// aapt resource value: 0x7F0D003C
-			public const int srl_component_falsify = 2131558460;
-			
-			// aapt resource value: 0x7F0D003D
-			public const int srl_content_empty = 2131558461;
-			
-			// aapt resource value: 0x7F0D003E
-			public const int srl_footer_failed = 2131558462;
-			
-			// aapt resource value: 0x7F0D003F
-			public const int srl_footer_finish = 2131558463;
-			
-			// aapt resource value: 0x7F0D0040
-			public const int srl_footer_loading = 2131558464;
-			
-			// aapt resource value: 0x7F0D0041
-			public const int srl_footer_nothing = 2131558465;
-			
-			// aapt resource value: 0x7F0D0042
-			public const int srl_footer_pulling = 2131558466;
-			
-			// aapt resource value: 0x7F0D0043
-			public const int srl_footer_refreshing = 2131558467;
-			
-			// aapt resource value: 0x7F0D0044
-			public const int srl_footer_release = 2131558468;
-			
-			// aapt resource value: 0x7F0D0045
-			public const int srl_header_failed = 2131558469;
-			
-			// aapt resource value: 0x7F0D0046
-			public const int srl_header_finish = 2131558470;
-			
-			// aapt resource value: 0x7F0D0047
-			public const int srl_header_loading = 2131558471;
-			
-			// aapt resource value: 0x7F0D0048
-			public const int srl_header_pulling = 2131558472;
-			
-			// aapt resource value: 0x7F0D0049
-			public const int srl_header_refreshing = 2131558473;
-			
-			// aapt resource value: 0x7F0D004A
-			public const int srl_header_release = 2131558474;
-			
-			// aapt resource value: 0x7F0D004B
-			public const int srl_header_secondary = 2131558475;
-			
-			// aapt resource value: 0x7F0D004C
-			public const int srl_header_update = 2131558476;
-			
-			// aapt resource value: 0x7F0D004D
-			public const int status_bar_notification_info_overflow = 2131558477;
-			
-			// aapt resource value: 0x7F0D004E
-			public const int touch_fingerprint_sensor_hint = 2131558478;
+			// aapt resource value: 0x7F050001
+			public const int hello = 2131034113;
 			
 			static String()
 			{
@@ -4208,1205 +142,8 @@
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7F0E0000
-			public const int AlertDialog_AppCompat = 2131623936;
-			
-			// aapt resource value: 0x7F0E0001
-			public const int AlertDialog_AppCompat_Light = 2131623937;
-			
-			// aapt resource value: 0x7F0E0002
-			public const int Animation_AppCompat_Dialog = 2131623938;
-			
-			// aapt resource value: 0x7F0E0003
-			public const int Animation_AppCompat_DropDownUp = 2131623939;
-			
-			// aapt resource value: 0x7F0E0004
-			public const int Animation_AppCompat_Tooltip = 2131623940;
-			
-			// aapt resource value: 0x7F0E0005
-			public const int Animation_Design_BottomSheetDialog = 2131623941;
-			
-			// aapt resource value: 0x7F0E0006
-			public const int Base_AlertDialog_AppCompat = 2131623942;
-			
-			// aapt resource value: 0x7F0E0007
-			public const int Base_AlertDialog_AppCompat_Light = 2131623943;
-			
-			// aapt resource value: 0x7F0E0008
-			public const int Base_Animation_AppCompat_Dialog = 2131623944;
-			
-			// aapt resource value: 0x7F0E0009
-			public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
-			
-			// aapt resource value: 0x7F0E000A
-			public const int Base_Animation_AppCompat_Tooltip = 2131623946;
-			
-			// aapt resource value: 0x7F0E000C
-			public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
-			
-			// aapt resource value: 0x7F0E000B
-			public const int Base_DialogWindowTitle_AppCompat = 2131623947;
-			
-			// aapt resource value: 0x7F0E000D
-			public const int Base_TextAppearance_AppCompat = 2131623949;
-			
-			// aapt resource value: 0x7F0E000E
-			public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
-			
-			// aapt resource value: 0x7F0E000F
-			public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
-			
-			// aapt resource value: 0x7F0E0010
-			public const int Base_TextAppearance_AppCompat_Button = 2131623952;
-			
-			// aapt resource value: 0x7F0E0011
-			public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
-			
-			// aapt resource value: 0x7F0E0012
-			public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
-			
-			// aapt resource value: 0x7F0E0013
-			public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
-			
-			// aapt resource value: 0x7F0E0014
-			public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
-			
-			// aapt resource value: 0x7F0E0015
-			public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
-			
-			// aapt resource value: 0x7F0E0016
-			public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
-			
-			// aapt resource value: 0x7F0E0017
-			public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
-			
-			// aapt resource value: 0x7F0E0018
-			public const int Base_TextAppearance_AppCompat_Large = 2131623960;
-			
-			// aapt resource value: 0x7F0E0019
-			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
-			
-			// aapt resource value: 0x7F0E001A
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
-			
-			// aapt resource value: 0x7F0E001B
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
-			
-			// aapt resource value: 0x7F0E001C
-			public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
-			
-			// aapt resource value: 0x7F0E001D
-			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
-			
-			// aapt resource value: 0x7F0E001E
-			public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
-			
-			// aapt resource value: 0x7F0E001F
-			public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
-			
-			// aapt resource value: 0x7F0E0020
-			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
-			
-			// aapt resource value: 0x7F0E0021
-			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
-			
-			// aapt resource value: 0x7F0E0022
-			public const int Base_TextAppearance_AppCompat_Small = 2131623970;
-			
-			// aapt resource value: 0x7F0E0023
-			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
-			
-			// aapt resource value: 0x7F0E0024
-			public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
-			
-			// aapt resource value: 0x7F0E0025
-			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
-			
-			// aapt resource value: 0x7F0E0026
-			public const int Base_TextAppearance_AppCompat_Title = 2131623974;
-			
-			// aapt resource value: 0x7F0E0027
-			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
-			
-			// aapt resource value: 0x7F0E0028
-			public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
-			
-			// aapt resource value: 0x7F0E0029
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
-			
-			// aapt resource value: 0x7F0E002A
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
-			
-			// aapt resource value: 0x7F0E002B
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
-			
-			// aapt resource value: 0x7F0E002C
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
-			
-			// aapt resource value: 0x7F0E002D
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
-			
-			// aapt resource value: 0x7F0E002E
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
-			
-			// aapt resource value: 0x7F0E002F
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
-			
-			// aapt resource value: 0x7F0E0030
-			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
-			
-			// aapt resource value: 0x7F0E0031
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
-			
-			// aapt resource value: 0x7F0E0032
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
-			
-			// aapt resource value: 0x7F0E0033
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
-			
-			// aapt resource value: 0x7F0E0034
-			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
-			
-			// aapt resource value: 0x7F0E0035
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
-			
-			// aapt resource value: 0x7F0E0036
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
-			
-			// aapt resource value: 0x7F0E0037
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
-			
-			// aapt resource value: 0x7F0E0038
-			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
-			
-			// aapt resource value: 0x7F0E0039
-			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
-			
-			// aapt resource value: 0x7F0E003A
-			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
-			
-			// aapt resource value: 0x7F0E003B
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
-			
-			// aapt resource value: 0x7F0E003C
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
-			
-			// aapt resource value: 0x7F0E004B
-			public const int Base_ThemeOverlay_AppCompat = 2131624011;
-			
-			// aapt resource value: 0x7F0E004C
-			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
-			
-			// aapt resource value: 0x7F0E004D
-			public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
-			
-			// aapt resource value: 0x7F0E004E
-			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
-			
-			// aapt resource value: 0x7F0E004F
-			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
-			
-			// aapt resource value: 0x7F0E0050
-			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
-			
-			// aapt resource value: 0x7F0E0051
-			public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
-			
-			// aapt resource value: 0x7F0E003D
-			public const int Base_Theme_AppCompat = 2131623997;
-			
-			// aapt resource value: 0x7F0E003E
-			public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
-			
-			// aapt resource value: 0x7F0E003F
-			public const int Base_Theme_AppCompat_Dialog = 2131623999;
-			
-			// aapt resource value: 0x7F0E0043
-			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
-			
-			// aapt resource value: 0x7F0E0040
-			public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
-			
-			// aapt resource value: 0x7F0E0041
-			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
-			
-			// aapt resource value: 0x7F0E0042
-			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
-			
-			// aapt resource value: 0x7F0E0044
-			public const int Base_Theme_AppCompat_Light = 2131624004;
-			
-			// aapt resource value: 0x7F0E0045
-			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
-			
-			// aapt resource value: 0x7F0E0046
-			public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
-			
-			// aapt resource value: 0x7F0E004A
-			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
-			
-			// aapt resource value: 0x7F0E0047
-			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
-			
-			// aapt resource value: 0x7F0E0048
-			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
-			
-			// aapt resource value: 0x7F0E0049
-			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
-			
-			// aapt resource value: 0x7F0E0054
-			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
-			
-			// aapt resource value: 0x7F0E0052
-			public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
-			
-			// aapt resource value: 0x7F0E0053
-			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
-			
-			// aapt resource value: 0x7F0E0055
-			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
-			
-			// aapt resource value: 0x7F0E0056
-			public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
-			
-			// aapt resource value: 0x7F0E0057
-			public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
-			
-			// aapt resource value: 0x7F0E005C
-			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
-			
-			// aapt resource value: 0x7F0E0058
-			public const int Base_V21_Theme_AppCompat = 2131624024;
-			
-			// aapt resource value: 0x7F0E0059
-			public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
-			
-			// aapt resource value: 0x7F0E005A
-			public const int Base_V21_Theme_AppCompat_Light = 2131624026;
-			
-			// aapt resource value: 0x7F0E005B
-			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
-			
-			// aapt resource value: 0x7F0E005D
-			public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
-			
-			// aapt resource value: 0x7F0E005E
-			public const int Base_V22_Theme_AppCompat = 2131624030;
-			
-			// aapt resource value: 0x7F0E005F
-			public const int Base_V22_Theme_AppCompat_Light = 2131624031;
-			
-			// aapt resource value: 0x7F0E0060
-			public const int Base_V23_Theme_AppCompat = 2131624032;
-			
-			// aapt resource value: 0x7F0E0061
-			public const int Base_V23_Theme_AppCompat_Light = 2131624033;
-			
-			// aapt resource value: 0x7F0E0062
-			public const int Base_V26_Theme_AppCompat = 2131624034;
-			
-			// aapt resource value: 0x7F0E0063
-			public const int Base_V26_Theme_AppCompat_Light = 2131624035;
-			
-			// aapt resource value: 0x7F0E0064
-			public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
-			
-			// aapt resource value: 0x7F0E0065
-			public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
-			
-			// aapt resource value: 0x7F0E006A
-			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
-			
-			// aapt resource value: 0x7F0E0066
-			public const int Base_V7_Theme_AppCompat = 2131624038;
-			
-			// aapt resource value: 0x7F0E0067
-			public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
-			
-			// aapt resource value: 0x7F0E0068
-			public const int Base_V7_Theme_AppCompat_Light = 2131624040;
-			
-			// aapt resource value: 0x7F0E0069
-			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
-			
-			// aapt resource value: 0x7F0E006B
-			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
-			
-			// aapt resource value: 0x7F0E006C
-			public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
-			
-			// aapt resource value: 0x7F0E006D
-			public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
-			
-			// aapt resource value: 0x7F0E006E
-			public const int Base_Widget_AppCompat_ActionBar = 2131624046;
-			
-			// aapt resource value: 0x7F0E006F
-			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
-			
-			// aapt resource value: 0x7F0E0070
-			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
-			
-			// aapt resource value: 0x7F0E0071
-			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
-			
-			// aapt resource value: 0x7F0E0072
-			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
-			
-			// aapt resource value: 0x7F0E0073
-			public const int Base_Widget_AppCompat_ActionButton = 2131624051;
-			
-			// aapt resource value: 0x7F0E0074
-			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
-			
-			// aapt resource value: 0x7F0E0075
-			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
-			
-			// aapt resource value: 0x7F0E0076
-			public const int Base_Widget_AppCompat_ActionMode = 2131624054;
-			
-			// aapt resource value: 0x7F0E0077
-			public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
-			
-			// aapt resource value: 0x7F0E0078
-			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
-			
-			// aapt resource value: 0x7F0E0079
-			public const int Base_Widget_AppCompat_Button = 2131624057;
-			
-			// aapt resource value: 0x7F0E007F
-			public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
-			
-			// aapt resource value: 0x7F0E0080
-			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
-			
-			// aapt resource value: 0x7F0E007A
-			public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
-			
-			// aapt resource value: 0x7F0E007B
-			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
-			
-			// aapt resource value: 0x7F0E007C
-			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
-			
-			// aapt resource value: 0x7F0E007D
-			public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
-			
-			// aapt resource value: 0x7F0E007E
-			public const int Base_Widget_AppCompat_Button_Small = 2131624062;
-			
-			// aapt resource value: 0x7F0E0081
-			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
-			
-			// aapt resource value: 0x7F0E0082
-			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
-			
-			// aapt resource value: 0x7F0E0083
-			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
-			
-			// aapt resource value: 0x7F0E0084
-			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
-			
-			// aapt resource value: 0x7F0E0085
-			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
-			
-			// aapt resource value: 0x7F0E0086
-			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
-			
-			// aapt resource value: 0x7F0E0087
-			public const int Base_Widget_AppCompat_EditText = 2131624071;
-			
-			// aapt resource value: 0x7F0E0088
-			public const int Base_Widget_AppCompat_ImageButton = 2131624072;
-			
-			// aapt resource value: 0x7F0E0089
-			public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
-			
-			// aapt resource value: 0x7F0E008A
-			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
-			
-			// aapt resource value: 0x7F0E008B
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
-			
-			// aapt resource value: 0x7F0E008C
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
-			
-			// aapt resource value: 0x7F0E008D
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
-			
-			// aapt resource value: 0x7F0E008E
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
-			
-			// aapt resource value: 0x7F0E008F
-			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
-			
-			// aapt resource value: 0x7F0E0090
-			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
-			
-			// aapt resource value: 0x7F0E0091
-			public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
-			
-			// aapt resource value: 0x7F0E0092
-			public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
-			
-			// aapt resource value: 0x7F0E0093
-			public const int Base_Widget_AppCompat_ListView = 2131624083;
-			
-			// aapt resource value: 0x7F0E0094
-			public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
-			
-			// aapt resource value: 0x7F0E0095
-			public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
-			
-			// aapt resource value: 0x7F0E0096
-			public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
-			
-			// aapt resource value: 0x7F0E0097
-			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
-			
-			// aapt resource value: 0x7F0E0098
-			public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
-			
-			// aapt resource value: 0x7F0E0099
-			public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
-			
-			// aapt resource value: 0x7F0E009A
-			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
-			
-			// aapt resource value: 0x7F0E009B
-			public const int Base_Widget_AppCompat_RatingBar = 2131624091;
-			
-			// aapt resource value: 0x7F0E009C
-			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
-			
-			// aapt resource value: 0x7F0E009D
-			public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
-			
-			// aapt resource value: 0x7F0E009E
-			public const int Base_Widget_AppCompat_SearchView = 2131624094;
-			
-			// aapt resource value: 0x7F0E009F
-			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
-			
-			// aapt resource value: 0x7F0E00A0
-			public const int Base_Widget_AppCompat_SeekBar = 2131624096;
-			
-			// aapt resource value: 0x7F0E00A1
-			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
-			
-			// aapt resource value: 0x7F0E00A2
-			public const int Base_Widget_AppCompat_Spinner = 2131624098;
-			
-			// aapt resource value: 0x7F0E00A3
-			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
-			
-			// aapt resource value: 0x7F0E00A4
-			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
-			
-			// aapt resource value: 0x7F0E00A5
-			public const int Base_Widget_AppCompat_Toolbar = 2131624101;
-			
-			// aapt resource value: 0x7F0E00A6
-			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
-			
-			// aapt resource value: 0x7F0E00A7
-			public const int Base_Widget_Design_AppBarLayout = 2131624103;
-			
-			// aapt resource value: 0x7F0E00A8
-			public const int Base_Widget_Design_TabLayout = 2131624104;
-			
-			// aapt resource value: 0x7F0E00A9
-			public const int BottomSheetDialogAnimation = 2131624105;
-			
-			// aapt resource value: 0x7F0E018D
-			public const int custom_dialog2 = 2131624333;
-			
-			// aapt resource value: 0x7F0E00AA
-			public const int MyTheme = 2131624106;
-			
-			// aapt resource value: 0x7F0E018E
-			public const int picker_view_scale_anim = 2131624334;
-			
-			// aapt resource value: 0x7F0E018F
-			public const int picker_view_slide_anim = 2131624335;
-			
-			// aapt resource value: 0x7F0E00AB
-			public const int Platform_AppCompat = 2131624107;
-			
-			// aapt resource value: 0x7F0E00AC
-			public const int Platform_AppCompat_Light = 2131624108;
-			
-			// aapt resource value: 0x7F0E00AD
-			public const int Platform_ThemeOverlay_AppCompat = 2131624109;
-			
-			// aapt resource value: 0x7F0E00AE
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
-			
-			// aapt resource value: 0x7F0E00AF
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
-			
-			// aapt resource value: 0x7F0E00B0
-			public const int Platform_V11_AppCompat = 2131624112;
-			
-			// aapt resource value: 0x7F0E00B1
-			public const int Platform_V11_AppCompat_Light = 2131624113;
-			
-			// aapt resource value: 0x7F0E00B2
-			public const int Platform_V14_AppCompat = 2131624114;
-			
-			// aapt resource value: 0x7F0E00B3
-			public const int Platform_V14_AppCompat_Light = 2131624115;
-			
-			// aapt resource value: 0x7F0E00B4
-			public const int Platform_V21_AppCompat = 2131624116;
-			
-			// aapt resource value: 0x7F0E00B5
-			public const int Platform_V21_AppCompat_Light = 2131624117;
-			
-			// aapt resource value: 0x7F0E00B6
-			public const int Platform_V25_AppCompat = 2131624118;
-			
-			// aapt resource value: 0x7F0E00B7
-			public const int Platform_V25_AppCompat_Light = 2131624119;
-			
-			// aapt resource value: 0x7F0E00B8
-			public const int Platform_Widget_AppCompat_Spinner = 2131624120;
-			
-			// aapt resource value: 0x7F0E00B9
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
-			
-			// aapt resource value: 0x7F0E00BA
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
-			
-			// aapt resource value: 0x7F0E00BB
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
-			
-			// aapt resource value: 0x7F0E00BC
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
-			
-			// aapt resource value: 0x7F0E00BD
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
-			
-			// aapt resource value: 0x7F0E00BE
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
-			
-			// aapt resource value: 0x7F0E00C4
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
-			
-			// aapt resource value: 0x7F0E00BF
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
-			
-			// aapt resource value: 0x7F0E00C0
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
-			
-			// aapt resource value: 0x7F0E00C1
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
-			
-			// aapt resource value: 0x7F0E00C2
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
-			
-			// aapt resource value: 0x7F0E00C3
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
-			
-			// aapt resource value: 0x7F0E00C5
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
-			
-			// aapt resource value: 0x7F0E00C6
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
-			
-			// aapt resource value: 0x7F0E00C7
-			public const int TextAppearance_AppCompat = 2131624135;
-			
-			// aapt resource value: 0x7F0E00C8
-			public const int TextAppearance_AppCompat_Body1 = 2131624136;
-			
-			// aapt resource value: 0x7F0E00C9
-			public const int TextAppearance_AppCompat_Body2 = 2131624137;
-			
-			// aapt resource value: 0x7F0E00CA
-			public const int TextAppearance_AppCompat_Button = 2131624138;
-			
-			// aapt resource value: 0x7F0E00CB
-			public const int TextAppearance_AppCompat_Caption = 2131624139;
-			
-			// aapt resource value: 0x7F0E00CC
-			public const int TextAppearance_AppCompat_Display1 = 2131624140;
-			
-			// aapt resource value: 0x7F0E00CD
-			public const int TextAppearance_AppCompat_Display2 = 2131624141;
-			
-			// aapt resource value: 0x7F0E00CE
-			public const int TextAppearance_AppCompat_Display3 = 2131624142;
-			
-			// aapt resource value: 0x7F0E00CF
-			public const int TextAppearance_AppCompat_Display4 = 2131624143;
-			
-			// aapt resource value: 0x7F0E00D0
-			public const int TextAppearance_AppCompat_Headline = 2131624144;
-			
-			// aapt resource value: 0x7F0E00D1
-			public const int TextAppearance_AppCompat_Inverse = 2131624145;
-			
-			// aapt resource value: 0x7F0E00D2
-			public const int TextAppearance_AppCompat_Large = 2131624146;
-			
-			// aapt resource value: 0x7F0E00D3
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
-			
-			// aapt resource value: 0x7F0E00D4
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
-			
-			// aapt resource value: 0x7F0E00D5
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
-			
-			// aapt resource value: 0x7F0E00D6
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
-			
-			// aapt resource value: 0x7F0E00D7
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
-			
-			// aapt resource value: 0x7F0E00D8
-			public const int TextAppearance_AppCompat_Medium = 2131624152;
-			
-			// aapt resource value: 0x7F0E00D9
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
-			
-			// aapt resource value: 0x7F0E00DA
-			public const int TextAppearance_AppCompat_Menu = 2131624154;
-			
-			// aapt resource value: 0x7F0E00DB
-			public const int TextAppearance_AppCompat_Notification = 2131624155;
-			
-			// aapt resource value: 0x7F0E00DC
-			public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
-			
-			// aapt resource value: 0x7F0E00DD
-			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
-			
-			// aapt resource value: 0x7F0E00DE
-			public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
-			
-			// aapt resource value: 0x7F0E00DF
-			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
-			
-			// aapt resource value: 0x7F0E00E0
-			public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
-			
-			// aapt resource value: 0x7F0E00E1
-			public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
-			
-			// aapt resource value: 0x7F0E00E2
-			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
-			
-			// aapt resource value: 0x7F0E00E3
-			public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
-			
-			// aapt resource value: 0x7F0E00E4
-			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
-			
-			// aapt resource value: 0x7F0E00E5
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
-			
-			// aapt resource value: 0x7F0E00E6
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
-			
-			// aapt resource value: 0x7F0E00E7
-			public const int TextAppearance_AppCompat_Small = 2131624167;
-			
-			// aapt resource value: 0x7F0E00E8
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
-			
-			// aapt resource value: 0x7F0E00E9
-			public const int TextAppearance_AppCompat_Subhead = 2131624169;
-			
-			// aapt resource value: 0x7F0E00EA
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
-			
-			// aapt resource value: 0x7F0E00EB
-			public const int TextAppearance_AppCompat_Title = 2131624171;
-			
-			// aapt resource value: 0x7F0E00EC
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
-			
-			// aapt resource value: 0x7F0E00ED
-			public const int TextAppearance_AppCompat_Tooltip = 2131624173;
-			
-			// aapt resource value: 0x7F0E00EE
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
-			
-			// aapt resource value: 0x7F0E00EF
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
-			
-			// aapt resource value: 0x7F0E00F0
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
-			
-			// aapt resource value: 0x7F0E00F1
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
-			
-			// aapt resource value: 0x7F0E00F2
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
-			
-			// aapt resource value: 0x7F0E00F3
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
-			
-			// aapt resource value: 0x7F0E00F4
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
-			
-			// aapt resource value: 0x7F0E00F5
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
-			
-			// aapt resource value: 0x7F0E00F6
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
-			
-			// aapt resource value: 0x7F0E00F7
-			public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
-			
-			// aapt resource value: 0x7F0E00F8
-			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
-			
-			// aapt resource value: 0x7F0E00F9
-			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
-			
-			// aapt resource value: 0x7F0E00FA
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
-			
-			// aapt resource value: 0x7F0E00FB
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
-			
-			// aapt resource value: 0x7F0E00FC
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
-			
-			// aapt resource value: 0x7F0E00FD
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
-			
-			// aapt resource value: 0x7F0E00FE
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
-			
-			// aapt resource value: 0x7F0E00FF
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
-			
-			// aapt resource value: 0x7F0E0100
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
-			
-			// aapt resource value: 0x7F0E0101
-			public const int TextAppearance_Compat_Notification = 2131624193;
-			
-			// aapt resource value: 0x7F0E0102
-			public const int TextAppearance_Compat_Notification_Info = 2131624194;
-			
-			// aapt resource value: 0x7F0E0103
-			public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
-			
-			// aapt resource value: 0x7F0E0104
-			public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
-			
-			// aapt resource value: 0x7F0E0105
-			public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
-			
-			// aapt resource value: 0x7F0E0106
-			public const int TextAppearance_Compat_Notification_Media = 2131624198;
-			
-			// aapt resource value: 0x7F0E0107
-			public const int TextAppearance_Compat_Notification_Time = 2131624199;
-			
-			// aapt resource value: 0x7F0E0108
-			public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
-			
-			// aapt resource value: 0x7F0E0109
-			public const int TextAppearance_Compat_Notification_Title = 2131624201;
-			
-			// aapt resource value: 0x7F0E010A
-			public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
-			
-			// aapt resource value: 0x7F0E010B
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
-			
-			// aapt resource value: 0x7F0E010C
-			public const int TextAppearance_Design_Counter = 2131624204;
-			
-			// aapt resource value: 0x7F0E010D
-			public const int TextAppearance_Design_Counter_Overflow = 2131624205;
-			
-			// aapt resource value: 0x7F0E010E
-			public const int TextAppearance_Design_Error = 2131624206;
-			
-			// aapt resource value: 0x7F0E010F
-			public const int TextAppearance_Design_Hint = 2131624207;
-			
-			// aapt resource value: 0x7F0E0110
-			public const int TextAppearance_Design_Snackbar_Message = 2131624208;
-			
-			// aapt resource value: 0x7F0E0111
-			public const int TextAppearance_Design_Tab = 2131624209;
-			
-			// aapt resource value: 0x7F0E0112
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
-			
-			// aapt resource value: 0x7F0E0113
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
-			
-			// aapt resource value: 0x7F0E0114
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
-			
-			// aapt resource value: 0x7F0E0131
-			public const int ThemeOverlay_AppCompat = 2131624241;
-			
-			// aapt resource value: 0x7F0E0132
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
-			
-			// aapt resource value: 0x7F0E0133
-			public const int ThemeOverlay_AppCompat_Dark = 2131624243;
-			
-			// aapt resource value: 0x7F0E0134
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
-			
-			// aapt resource value: 0x7F0E0135
-			public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
-			
-			// aapt resource value: 0x7F0E0136
-			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
-			
-			// aapt resource value: 0x7F0E0137
-			public const int ThemeOverlay_AppCompat_Light = 2131624247;
-			
-			// aapt resource value: 0x7F0E0115
-			public const int Theme_AppCompat = 2131624213;
-			
-			// aapt resource value: 0x7F0E0116
-			public const int Theme_AppCompat_CompactMenu = 2131624214;
-			
-			// aapt resource value: 0x7F0E0117
-			public const int Theme_AppCompat_DayNight = 2131624215;
-			
-			// aapt resource value: 0x7F0E0118
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
-			
-			// aapt resource value: 0x7F0E0119
-			public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
-			
-			// aapt resource value: 0x7F0E011C
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
-			
-			// aapt resource value: 0x7F0E011A
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
-			
-			// aapt resource value: 0x7F0E011B
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
-			
-			// aapt resource value: 0x7F0E011D
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
-			
-			// aapt resource value: 0x7F0E011E
-			public const int Theme_AppCompat_Dialog = 2131624222;
-			
-			// aapt resource value: 0x7F0E0121
-			public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
-			
-			// aapt resource value: 0x7F0E011F
-			public const int Theme_AppCompat_Dialog_Alert = 2131624223;
-			
-			// aapt resource value: 0x7F0E0120
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
-			
-			// aapt resource value: 0x7F0E0122
-			public const int Theme_AppCompat_Light = 2131624226;
-			
-			// aapt resource value: 0x7F0E0123
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
-			
-			// aapt resource value: 0x7F0E0124
-			public const int Theme_AppCompat_Light_Dialog = 2131624228;
-			
-			// aapt resource value: 0x7F0E0127
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
-			
-			// aapt resource value: 0x7F0E0125
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
-			
-			// aapt resource value: 0x7F0E0126
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
-			
-			// aapt resource value: 0x7F0E0128
-			public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
-			
-			// aapt resource value: 0x7F0E0129
-			public const int Theme_AppCompat_NoActionBar = 2131624233;
-			
-			// aapt resource value: 0x7F0E012A
-			public const int Theme_BiometricPromptDialog = 2131624234;
-			
-			// aapt resource value: 0x7F0E012B
-			public const int Theme_Design = 2131624235;
-			
-			// aapt resource value: 0x7F0E012C
-			public const int Theme_Design_BottomSheetDialog = 2131624236;
-			
-			// aapt resource value: 0x7F0E012D
-			public const int Theme_Design_Light = 2131624237;
-			
-			// aapt resource value: 0x7F0E012E
-			public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
-			
-			// aapt resource value: 0x7F0E012F
-			public const int Theme_Design_Light_NoActionBar = 2131624239;
-			
-			// aapt resource value: 0x7F0E0130
-			public const int Theme_Design_NoActionBar = 2131624240;
-			
-			// aapt resource value: 0x7F0E0138
-			public const int Widget_AppCompat_ActionBar = 2131624248;
-			
-			// aapt resource value: 0x7F0E0139
-			public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
-			
-			// aapt resource value: 0x7F0E013A
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
-			
-			// aapt resource value: 0x7F0E013B
-			public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
-			
-			// aapt resource value: 0x7F0E013C
-			public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
-			
-			// aapt resource value: 0x7F0E013D
-			public const int Widget_AppCompat_ActionButton = 2131624253;
-			
-			// aapt resource value: 0x7F0E013E
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
-			
-			// aapt resource value: 0x7F0E013F
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
-			
-			// aapt resource value: 0x7F0E0140
-			public const int Widget_AppCompat_ActionMode = 2131624256;
-			
-			// aapt resource value: 0x7F0E0141
-			public const int Widget_AppCompat_ActivityChooserView = 2131624257;
-			
-			// aapt resource value: 0x7F0E0142
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
-			
-			// aapt resource value: 0x7F0E0143
-			public const int Widget_AppCompat_Button = 2131624259;
-			
-			// aapt resource value: 0x7F0E0149
-			public const int Widget_AppCompat_ButtonBar = 2131624265;
-			
-			// aapt resource value: 0x7F0E014A
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
-			
-			// aapt resource value: 0x7F0E0144
-			public const int Widget_AppCompat_Button_Borderless = 2131624260;
-			
-			// aapt resource value: 0x7F0E0145
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
-			
-			// aapt resource value: 0x7F0E0146
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
-			
-			// aapt resource value: 0x7F0E0147
-			public const int Widget_AppCompat_Button_Colored = 2131624263;
-			
-			// aapt resource value: 0x7F0E0148
-			public const int Widget_AppCompat_Button_Small = 2131624264;
-			
-			// aapt resource value: 0x7F0E014B
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
-			
-			// aapt resource value: 0x7F0E014C
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
-			
-			// aapt resource value: 0x7F0E014D
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
-			
-			// aapt resource value: 0x7F0E014E
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
-			
-			// aapt resource value: 0x7F0E014F
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
-			
-			// aapt resource value: 0x7F0E0150
-			public const int Widget_AppCompat_EditText = 2131624272;
-			
-			// aapt resource value: 0x7F0E0151
-			public const int Widget_AppCompat_ImageButton = 2131624273;
-			
-			// aapt resource value: 0x7F0E0152
-			public const int Widget_AppCompat_Light_ActionBar = 2131624274;
-			
-			// aapt resource value: 0x7F0E0153
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
-			
-			// aapt resource value: 0x7F0E0154
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
-			
-			// aapt resource value: 0x7F0E0155
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
-			
-			// aapt resource value: 0x7F0E0156
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
-			
-			// aapt resource value: 0x7F0E0157
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
-			
-			// aapt resource value: 0x7F0E0158
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
-			
-			// aapt resource value: 0x7F0E0159
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
-			
-			// aapt resource value: 0x7F0E015A
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
-			
-			// aapt resource value: 0x7F0E015B
-			public const int Widget_AppCompat_Light_ActionButton = 2131624283;
-			
-			// aapt resource value: 0x7F0E015C
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
-			
-			// aapt resource value: 0x7F0E015D
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
-			
-			// aapt resource value: 0x7F0E015E
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
-			
-			// aapt resource value: 0x7F0E015F
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
-			
-			// aapt resource value: 0x7F0E0160
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
-			
-			// aapt resource value: 0x7F0E0161
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
-			
-			// aapt resource value: 0x7F0E0162
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
-			
-			// aapt resource value: 0x7F0E0163
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
-			
-			// aapt resource value: 0x7F0E0164
-			public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
-			
-			// aapt resource value: 0x7F0E0165
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
-			
-			// aapt resource value: 0x7F0E0166
-			public const int Widget_AppCompat_Light_SearchView = 2131624294;
-			
-			// aapt resource value: 0x7F0E0167
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
-			
-			// aapt resource value: 0x7F0E0168
-			public const int Widget_AppCompat_ListMenuView = 2131624296;
-			
-			// aapt resource value: 0x7F0E0169
-			public const int Widget_AppCompat_ListPopupWindow = 2131624297;
-			
-			// aapt resource value: 0x7F0E016A
-			public const int Widget_AppCompat_ListView = 2131624298;
-			
-			// aapt resource value: 0x7F0E016B
-			public const int Widget_AppCompat_ListView_DropDown = 2131624299;
-			
-			// aapt resource value: 0x7F0E016C
-			public const int Widget_AppCompat_ListView_Menu = 2131624300;
-			
-			// aapt resource value: 0x7F0E016D
-			public const int Widget_AppCompat_PopupMenu = 2131624301;
-			
-			// aapt resource value: 0x7F0E016E
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
-			
-			// aapt resource value: 0x7F0E016F
-			public const int Widget_AppCompat_PopupWindow = 2131624303;
-			
-			// aapt resource value: 0x7F0E0170
-			public const int Widget_AppCompat_ProgressBar = 2131624304;
-			
-			// aapt resource value: 0x7F0E0171
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
-			
-			// aapt resource value: 0x7F0E0172
-			public const int Widget_AppCompat_RatingBar = 2131624306;
-			
-			// aapt resource value: 0x7F0E0173
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
-			
-			// aapt resource value: 0x7F0E0174
-			public const int Widget_AppCompat_RatingBar_Small = 2131624308;
-			
-			// aapt resource value: 0x7F0E0175
-			public const int Widget_AppCompat_SearchView = 2131624309;
-			
-			// aapt resource value: 0x7F0E0176
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
-			
-			// aapt resource value: 0x7F0E0177
-			public const int Widget_AppCompat_SeekBar = 2131624311;
-			
-			// aapt resource value: 0x7F0E0178
-			public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
-			
-			// aapt resource value: 0x7F0E0179
-			public const int Widget_AppCompat_Spinner = 2131624313;
-			
-			// aapt resource value: 0x7F0E017A
-			public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
-			
-			// aapt resource value: 0x7F0E017B
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
-			
-			// aapt resource value: 0x7F0E017C
-			public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
-			
-			// aapt resource value: 0x7F0E017D
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
-			
-			// aapt resource value: 0x7F0E017E
-			public const int Widget_AppCompat_Toolbar = 2131624318;
-			
-			// aapt resource value: 0x7F0E017F
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
-			
-			// aapt resource value: 0x7F0E0180
-			public const int Widget_Compat_NotificationActionContainer = 2131624320;
-			
-			// aapt resource value: 0x7F0E0181
-			public const int Widget_Compat_NotificationActionText = 2131624321;
-			
-			// aapt resource value: 0x7F0E0182
-			public const int Widget_Design_AppBarLayout = 2131624322;
-			
-			// aapt resource value: 0x7F0E0183
-			public const int Widget_Design_BottomNavigationView = 2131624323;
-			
-			// aapt resource value: 0x7F0E0184
-			public const int Widget_Design_BottomSheet_Modal = 2131624324;
-			
-			// aapt resource value: 0x7F0E0185
-			public const int Widget_Design_CollapsingToolbar = 2131624325;
-			
-			// aapt resource value: 0x7F0E0186
-			public const int Widget_Design_CoordinatorLayout = 2131624326;
-			
-			// aapt resource value: 0x7F0E0187
-			public const int Widget_Design_FloatingActionButton = 2131624327;
-			
-			// aapt resource value: 0x7F0E0188
-			public const int Widget_Design_NavigationView = 2131624328;
-			
-			// aapt resource value: 0x7F0E0189
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
-			
-			// aapt resource value: 0x7F0E018A
-			public const int Widget_Design_Snackbar = 2131624330;
-			
-			// aapt resource value: 0x7F0E018B
-			public const int Widget_Design_TabLayout = 2131624331;
-			
-			// aapt resource value: 0x7F0E018C
-			public const int Widget_Design_TextInputLayout = 2131624332;
+			// aapt resource value: 0x7F060000
+			public const int MyTheme = 2131099648;
 			
 			static Style()
 			{
@@ -5418,2657 +155,11 @@
 			}
 		}
 		
-		public partial class Styleable
-		{
-			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040044,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F040083,0x7F040087,0x7F040088,0x7F040093,0x7F0400B4,0x7F0400B5,0x7F0400B9,0x7F0400BA,0x7F0400BB,0x7F0400C0,0x7F0400C6,0x7F0400E3,0x7F0400EC,0x7F0400FC,0x7F040100,0x7F040101,0x7F040168,0x7F04016B,0x7F040197,0x7F0401A1 }
-			public static int[] ActionBar = new int[] {
-					2130968642,
-					2130968643,
-					2130968644,
-					2130968690,
-					2130968691,
-					2130968692,
-					2130968693,
-					2130968694,
-					2130968695,
-					2130968707,
-					2130968711,
-					2130968712,
-					2130968723,
-					2130968756,
-					2130968757,
-					2130968761,
-					2130968762,
-					2130968763,
-					2130968768,
-					2130968774,
-					2130968803,
-					2130968812,
-					2130968828,
-					2130968832,
-					2130968833,
-					2130968936,
-					2130968939,
-					2130968983,
-					2130968993};
-			
-			// aapt resource value: { 0x10100B3 }
-			public static int[] ActionBarLayout = new int[] {
-					16842931};
-			
-			// aapt resource value: 0
-			public const int ActionBarLayout_android_layout_gravity = 0;
-			
-			// aapt resource value: 0
-			public const int ActionBar_background = 0;
-			
-			// aapt resource value: 1
-			public const int ActionBar_backgroundSplit = 1;
-			
-			// aapt resource value: 2
-			public const int ActionBar_backgroundStacked = 2;
-			
-			// aapt resource value: 3
-			public const int ActionBar_contentInsetEnd = 3;
-			
-			// aapt resource value: 4
-			public const int ActionBar_contentInsetEndWithActions = 4;
-			
-			// aapt resource value: 5
-			public const int ActionBar_contentInsetLeft = 5;
-			
-			// aapt resource value: 6
-			public const int ActionBar_contentInsetRight = 6;
-			
-			// aapt resource value: 7
-			public const int ActionBar_contentInsetStart = 7;
-			
-			// aapt resource value: 8
-			public const int ActionBar_contentInsetStartWithNavigation = 8;
-			
-			// aapt resource value: 9
-			public const int ActionBar_customNavigationLayout = 9;
-			
-			// aapt resource value: 10
-			public const int ActionBar_displayOptions = 10;
-			
-			// aapt resource value: 11
-			public const int ActionBar_divider = 11;
-			
-			// aapt resource value: 12
-			public const int ActionBar_elevation = 12;
-			
-			// aapt resource value: 13
-			public const int ActionBar_height = 13;
-			
-			// aapt resource value: 14
-			public const int ActionBar_hideOnContentScroll = 14;
-			
-			// aapt resource value: 15
-			public const int ActionBar_homeAsUpIndicator = 15;
-			
-			// aapt resource value: 16
-			public const int ActionBar_homeLayout = 16;
-			
-			// aapt resource value: 17
-			public const int ActionBar_icon = 17;
-			
-			// aapt resource value: 18
-			public const int ActionBar_indeterminateProgressStyle = 18;
-			
-			// aapt resource value: 19
-			public const int ActionBar_itemPadding = 19;
-			
-			// aapt resource value: 20
-			public const int ActionBar_logo = 20;
-			
-			// aapt resource value: 21
-			public const int ActionBar_navigationMode = 21;
-			
-			// aapt resource value: 22
-			public const int ActionBar_popupTheme = 22;
-			
-			// aapt resource value: 23
-			public const int ActionBar_progressBarPadding = 23;
-			
-			// aapt resource value: 24
-			public const int ActionBar_progressBarStyle = 24;
-			
-			// aapt resource value: 25
-			public const int ActionBar_subtitle = 25;
-			
-			// aapt resource value: 26
-			public const int ActionBar_subtitleTextStyle = 26;
-			
-			// aapt resource value: 27
-			public const int ActionBar_title = 27;
-			
-			// aapt resource value: 28
-			public const int ActionBar_titleTextStyle = 28;
-			
-			// aapt resource value: { 0x101013F }
-			public static int[] ActionMenuItemView = new int[] {
-					16843071};
-			
-			// aapt resource value: 0
-			public const int ActionMenuItemView_android_minWidth = 0;
-			
-			// aapt resource value: { 0xFFFFFFFF }
-			public static int[] ActionMenuView = new int[] {
-					-1};
-			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
-			public static int[] 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;
-			
-			// aapt resource value: 3
-			public const int ActionMode_height = 3;
-			
-			// aapt resource value: 4
-			public const int ActionMode_subtitleTextStyle = 4;
-			
-			// aapt resource value: 5
-			public const int ActionMode_titleTextStyle = 5;
-			
-			// aapt resource value: { 0x7F040096,0x7F0400C1 }
-			public static int[] ActivityChooserView = new int[] {
-					2130968726,
-					2130968769};
-			
-			// aapt resource value: 0
-			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
-			
-			// aapt resource value: 1
-			public const int ActivityChooserView_initialActivityCount = 1;
-			
-			// aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
-			public static int[] AlertDialog = new int[] {
-					16842994,
-					2130968664,
-					2130968794,
-					2130968795,
-					2130968809,
-					2130968855,
-					2130968856};
-			
-			// aapt resource value: 0
-			public const int AlertDialog_android_layout = 0;
-			
-			// aapt resource value: 1
-			public const int AlertDialog_buttonPanelSideLayout = 1;
-			
-			// aapt resource value: 2
-			public const int AlertDialog_listItemLayout = 2;
-			
-			// aapt resource value: 3
-			public const int AlertDialog_listLayout = 3;
-			
-			// aapt resource value: 4
-			public const int AlertDialog_multiChoiceItemLayout = 4;
-			
-			// aapt resource value: 5
-			public const int AlertDialog_showTitle = 5;
-			
-			// aapt resource value: 6
-			public const int AlertDialog_singleChoiceItemLayout = 6;
-			
-			// aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
-			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;
-			
-			// aapt resource value: 0
-			public const int AppBarLayout_android_background = 0;
-			
-			// aapt resource value: 2
-			public const int AppBarLayout_android_keyboardNavigationCluster = 2;
-			
-			// aapt resource value: 1
-			public const int AppBarLayout_android_touchscreenBlocksFocus = 1;
-			
-			// aapt resource value: 3
-			public const int AppBarLayout_elevation = 3;
-			
-			// aapt resource value: 4
-			public const int AppBarLayout_expanded = 4;
-			
-			// aapt resource value: { 0x7F0400D4,0x7F0400D5 }
-			public static int[] AppBarLayout_Layout = new int[] {
-					2130968788,
-					2130968789};
-			
-			// aapt resource value: 0
-			public const int AppBarLayout_Layout_layout_scrollFlags = 0;
-			
-			// aapt resource value: 1
-			public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
-			
-			// aapt resource value: { 0x1010119,0x7F04011E,0x7F040195,0x7F040196 }
-			public static int[] AppCompatImageView = new int[] {
-					16843033,
-					2130968862,
-					2130968981,
-					2130968982};
-			
-			// aapt resource value: 0
-			public const int AppCompatImageView_android_src = 0;
-			
-			// aapt resource value: 1
-			public const int AppCompatImageView_srcCompat = 1;
-			
-			// aapt resource value: 2
-			public const int AppCompatImageView_tint = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatImageView_tintMode = 3;
-			
-			// aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
-			public static int[] AppCompatSeekBar = new int[] {
-					16843074,
-					2130968978,
-					2130968979,
-					2130968980};
-			
-			// aapt resource value: 0
-			public const int AppCompatSeekBar_android_thumb = 0;
-			
-			// aapt resource value: 1
-			public const int AppCompatSeekBar_tickMark = 1;
-			
-			// aapt resource value: 2
-			public const int AppCompatSeekBar_tickMarkTint = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatSeekBar_tickMarkTintMode = 3;
-			
-			// aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
-			public static int[] AppCompatTextHelper = new int[] {
-					16842804,
-					16843117,
-					16843118,
-					16843119,
-					16843120,
-					16843666,
-					16843667};
-			
-			// aapt resource value: 2
-			public const int AppCompatTextHelper_android_drawableBottom = 2;
-			
-			// aapt resource value: 6
-			public const int AppCompatTextHelper_android_drawableEnd = 6;
-			
-			// aapt resource value: 3
-			public const int AppCompatTextHelper_android_drawableLeft = 3;
-			
-			// aapt resource value: 4
-			public const int AppCompatTextHelper_android_drawableRight = 4;
-			
-			// aapt resource value: 5
-			public const int AppCompatTextHelper_android_drawableStart = 5;
-			
-			// aapt resource value: 1
-			public const int AppCompatTextHelper_android_drawableTop = 1;
-			
-			// aapt resource value: 0
-			public const int AppCompatTextHelper_android_textAppearance = 0;
-			
-			// aapt resource value: { 0x1010034,0x7F04003D,0x7F04003E,0x7F04003F,0x7F040040,0x7F040041,0x7F0400A6,0x7F040181 }
-			public static int[] AppCompatTextView = new int[] {
-					16842804,
-					2130968637,
-					2130968638,
-					2130968639,
-					2130968640,
-					2130968641,
-					2130968742,
-					2130968961};
-			
-			// aapt resource value: 0
-			public const int AppCompatTextView_android_textAppearance = 0;
-			
-			// aapt resource value: 1
-			public const int AppCompatTextView_autoSizeMaxTextSize = 1;
-			
-			// aapt resource value: 2
-			public const int AppCompatTextView_autoSizeMinTextSize = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatTextView_autoSizePresetSizes = 3;
-			
-			// aapt resource value: 4
-			public const int AppCompatTextView_autoSizeStepGranularity = 4;
-			
-			// aapt resource value: 5
-			public const int AppCompatTextView_autoSizeTextType = 5;
-			
-			// aapt resource value: 6
-			public const int AppCompatTextView_fontFamily = 6;
-			
-			// aapt resource value: 7
-			public const int AppCompatTextView_textAllCaps = 7;
-			
-			// aapt resource value: { 0x1010057,0x10100AE,0x7F040000,0x7F040001,0x7F040002,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000E,0x7F04000F,0x7F040010,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F040021,0x7F040022,0x7F040023,0x7F040024,0x7F040025,0x7F04003C,0x7F04004F,0x7F040052,0x7F040053,0x7F040054,0x7F040055,0x7F040056,0x7F040059,0x7F04005A,0x7F04005D,0x7F04005E,0x7F040066,0x7F040067,0x7F040068,0x7F040069,0x7F04006A,0x7F04006B,0x7F04006C,0x7F04006D,0x7F04006E,0x7F04006F,0x7F040079,0x7F040085,0x7F040086,0x7F040089,0x7F04008B,0x7F04008E,0x7F04008F,0x7F040090,0x7F040091,0x7F040092,0x7F0400B9,0x7F0400BF,0x7F0400D8,0x7F0400D9,0x7F0400DC,0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400F3,0x7F0400F4,0x7F0400F5,0x7F0400FB,0x7F0400FD,0x7F040104,0x7F040105,0x7F040106,0x7F040107,0x7F04010E,0x7F040111,0x7F040112,0x7F040113,0x7F04011B,0x7F04011C,0x7F04016F,0x7F040182,0x7F040183,0x7F040184,0x7F040185,0x7F040186,0x7F040187,0x7F040188,0x7F040189,0x7F04018A,0x7F04018C,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401B8,0x7F0401B9,0x7F0401BA,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401BE,0x7F0401BF,0x7F0401C0,0x7F0401C1 }
-			public 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;
-			
-			// aapt resource value: 23
-			public const int AppCompatTheme_actionModePasteDrawable = 23;
-			
-			// aapt resource value: 24
-			public const int AppCompatTheme_actionModePopupWindowStyle = 24;
-			
-			// aapt resource value: 25
-			public const int AppCompatTheme_actionModeSelectAllDrawable = 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;
-			
-			// aapt resource value: 29
-			public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
-			
-			// aapt resource value: 30
-			public const int AppCompatTheme_actionOverflowButtonStyle = 30;
-			
-			// aapt resource value: 31
-			public const int AppCompatTheme_actionOverflowMenuStyle = 31;
-			
-			// aapt resource value: 32
-			public const int AppCompatTheme_activityChooserViewStyle = 32;
-			
-			// aapt resource value: 33
-			public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
-			
-			// aapt resource value: 34
-			public const int AppCompatTheme_alertDialogCenterButtons = 34;
-			
-			// aapt resource value: 35
-			public const int AppCompatTheme_alertDialogStyle = 35;
-			
-			// aapt resource value: 36
-			public const int AppCompatTheme_alertDialogTheme = 36;
-			
-			// aapt resource value: 1
-			public const int AppCompatTheme_android_windowAnimationStyle = 1;
-			
-			// aapt resource value: 0
-			public const int AppCompatTheme_android_windowIsFloating = 0;
-			
-			// aapt resource value: 37
-			public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
-			
-			// aapt resource value: 38
-			public const int AppCompatTheme_borderlessButtonStyle = 38;
-			
-			// aapt resource value: 39
-			public const int AppCompatTheme_buttonBarButtonStyle = 39;
-			
-			// aapt resource value: 40
-			public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
-			
-			// aapt resource value: 41
-			public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
-			
-			// aapt resource value: 42
-			public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
-			
-			// aapt resource value: 43
-			public const int AppCompatTheme_buttonBarStyle = 43;
-			
-			// aapt resource value: 44
-			public const int AppCompatTheme_buttonStyle = 44;
-			
-			// aapt resource value: 45
-			public const int AppCompatTheme_buttonStyleSmall = 45;
-			
-			// aapt resource value: 46
-			public const int AppCompatTheme_checkboxStyle = 46;
-			
-			// aapt resource value: 47
-			public const int AppCompatTheme_checkedTextViewStyle = 47;
-			
-			// aapt resource value: 48
-			public const int AppCompatTheme_colorAccent = 48;
-			
-			// aapt resource value: 49
-			public const int AppCompatTheme_colorBackgroundFloating = 49;
-			
-			// aapt resource value: 50
-			public const int AppCompatTheme_colorButtonNormal = 50;
-			
-			// aapt resource value: 51
-			public const int AppCompatTheme_colorControlActivated = 51;
-			
-			// aapt resource value: 52
-			public const int AppCompatTheme_colorControlHighlight = 52;
-			
-			// aapt resource value: 53
-			public const int AppCompatTheme_colorControlNormal = 53;
-			
-			// aapt resource value: 54
-			public const int AppCompatTheme_colorError = 54;
-			
-			// aapt resource value: 55
-			public const int AppCompatTheme_colorPrimary = 55;
-			
-			// aapt resource value: 56
-			public const int AppCompatTheme_colorPrimaryDark = 56;
-			
-			// aapt resource value: 57
-			public const int AppCompatTheme_colorSwitchThumbNormal = 57;
-			
-			// aapt resource value: 58
-			public const int AppCompatTheme_controlBackground = 58;
-			
-			// aapt resource value: 59
-			public const int AppCompatTheme_dialogPreferredPadding = 59;
-			
-			// aapt resource value: 60
-			public const int AppCompatTheme_dialogTheme = 60;
-			
-			// aapt resource value: 61
-			public const int AppCompatTheme_dividerHorizontal = 61;
-			
-			// aapt resource value: 62
-			public const int AppCompatTheme_dividerVertical = 62;
-			
-			// aapt resource value: 64
-			public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
-			
-			// aapt resource value: 63
-			public const int AppCompatTheme_dropDownListViewStyle = 63;
-			
-			// aapt resource value: 65
-			public const int AppCompatTheme_editTextBackground = 65;
-			
-			// aapt resource value: 66
-			public const int AppCompatTheme_editTextColor = 66;
-			
-			// aapt resource value: 67
-			public const int AppCompatTheme_editTextStyle = 67;
-			
-			// aapt resource value: 68
-			public const int AppCompatTheme_homeAsUpIndicator = 68;
-			
-			// aapt resource value: 69
-			public const int AppCompatTheme_imageButtonStyle = 69;
-			
-			// aapt resource value: 70
-			public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
-			
-			// aapt resource value: 71
-			public const int AppCompatTheme_listDividerAlertDialog = 71;
-			
-			// aapt resource value: 72
-			public const int AppCompatTheme_listMenuViewStyle = 72;
-			
-			// aapt resource value: 73
-			public const int AppCompatTheme_listPopupWindowStyle = 73;
-			
-			// aapt resource value: 74
-			public const int AppCompatTheme_listPreferredItemHeight = 74;
-			
-			// aapt resource value: 75
-			public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
-			
-			// aapt resource value: 76
-			public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
-			
-			// aapt resource value: 77
-			public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
-			
-			// aapt resource value: 78
-			public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
-			
-			// aapt resource value: 79
-			public const int AppCompatTheme_panelBackground = 79;
-			
-			// aapt resource value: 80
-			public const int AppCompatTheme_panelMenuListTheme = 80;
-			
-			// aapt resource value: 81
-			public const int AppCompatTheme_panelMenuListWidth = 81;
-			
-			// aapt resource value: 82
-			public const int AppCompatTheme_popupMenuStyle = 82;
-			
-			// aapt resource value: 83
-			public const int AppCompatTheme_popupWindowStyle = 83;
-			
-			// aapt resource value: 84
-			public const int AppCompatTheme_radioButtonStyle = 84;
-			
-			// aapt resource value: 85
-			public const int AppCompatTheme_ratingBarStyle = 85;
-			
-			// aapt resource value: 86
-			public const int AppCompatTheme_ratingBarStyleIndicator = 86;
-			
-			// aapt resource value: 87
-			public const int AppCompatTheme_ratingBarStyleSmall = 87;
-			
-			// aapt resource value: 88
-			public const int AppCompatTheme_searchViewStyle = 88;
-			
-			// aapt resource value: 89
-			public const int AppCompatTheme_seekBarStyle = 89;
-			
-			// aapt resource value: 90
-			public const int AppCompatTheme_selectableItemBackground = 90;
-			
-			// aapt resource value: 91
-			public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
-			
-			// aapt resource value: 92
-			public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
-			
-			// aapt resource value: 93
-			public const int AppCompatTheme_spinnerStyle = 93;
-			
-			// aapt resource value: 94
-			public const int AppCompatTheme_switchStyle = 94;
-			
-			// aapt resource value: 95
-			public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
-			
-			// aapt resource value: 96
-			public const int AppCompatTheme_textAppearanceListItem = 96;
-			
-			// aapt resource value: 97
-			public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
-			
-			// aapt resource value: 98
-			public const int AppCompatTheme_textAppearanceListItemSmall = 98;
-			
-			// aapt resource value: 99
-			public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
-			
-			// aapt resource value: 100
-			public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
-			
-			// aapt resource value: 101
-			public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
-			
-			// aapt resource value: 102
-			public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
-			
-			// aapt resource value: 103
-			public const int AppCompatTheme_textColorAlertDialogListItem = 103;
-			
-			// aapt resource value: 104
-			public const int AppCompatTheme_textColorSearchUrl = 104;
-			
-			// aapt resource value: 105
-			public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
-			
-			// aapt resource value: 106
-			public const int AppCompatTheme_toolbarStyle = 106;
-			
-			// aapt resource value: 107
-			public const int AppCompatTheme_tooltipForegroundColor = 107;
-			
-			// aapt resource value: 108
-			public const int AppCompatTheme_tooltipFrameBackground = 108;
-			
-			// aapt resource value: 109
-			public const int AppCompatTheme_windowActionBar = 109;
-			
-			// aapt resource value: 110
-			public const int AppCompatTheme_windowActionBarOverlay = 110;
-			
-			// aapt resource value: 111
-			public const int AppCompatTheme_windowActionModeOverlay = 111;
-			
-			// aapt resource value: 112
-			public const int AppCompatTheme_windowFixedHeightMajor = 112;
-			
-			// aapt resource value: 113
-			public const int AppCompatTheme_windowFixedHeightMinor = 113;
-			
-			// aapt resource value: 114
-			public const int AppCompatTheme_windowFixedWidthMajor = 114;
-			
-			// aapt resource value: 115
-			public const int AppCompatTheme_windowFixedWidthMinor = 115;
-			
-			// aapt resource value: 116
-			public const int AppCompatTheme_windowMinWidthMajor = 116;
-			
-			// aapt resource value: 117
-			public const int AppCompatTheme_windowMinWidthMinor = 117;
-			
-			// aapt resource value: 118
-			public const int AppCompatTheme_windowNoTitle = 118;
-			
-			// aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
-			public static int[] BallPulseFooter = new int[] {
-					2130968864,
-					2130968865,
-					2130968912};
-			
-			// aapt resource value: 0
-			public const int BallPulseFooter_srlAnimatingColor = 0;
-			
-			// aapt resource value: 1
-			public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
-			
-			// 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};
-			
-			// aapt resource value: 0
-			public const int BezierRadarHeader_srlAccentColor = 0;
-			
-			// aapt resource value: 1
-			public const int BezierRadarHeader_srlEnableHorizontalDrag = 1;
-			
-			// aapt resource value: 2
-			public const int BezierRadarHeader_srlPrimaryColor = 2;
-			
-			// aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
-			public static int[] BottomNavigationView = new int[] {
-					2130968723,
-					2130968772,
-					2130968773,
-					2130968776,
-					2130968808};
-			
-			// aapt resource value: 0
-			public const int BottomNavigationView_elevation = 0;
-			
-			// aapt resource value: 1
-			public const int BottomNavigationView_itemBackground = 1;
-			
-			// aapt resource value: 2
-			public const int BottomNavigationView_itemIconTint = 2;
-			
-			// aapt resource value: 3
-			public const int BottomNavigationView_itemTextColor = 3;
-			
-			// aapt resource value: 4
-			public const int BottomNavigationView_menu = 4;
-			
-			// aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
-			public static int[] BottomSheetBehavior_Layout = new int[] {
-					2130968649,
-					2130968651,
-					2130968652};
-			
-			// aapt resource value: 0
-			public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
-			
-			// aapt resource value: 1
-			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
-			
-			// aapt resource value: 2
-			public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
-			
-			// aapt resource value: { 0x7F040026 }
-			public static int[] ButtonBarLayout = new int[] {
-					2130968614};
-			
-			// 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};
-			
-			// aapt resource value: 0
-			public const int ClassicsFooter_srlAccentColor = 0;
-			
-			// aapt resource value: 1
-			public const int ClassicsFooter_srlClassicsSpinnerStyle = 1;
-			
-			// aapt resource value: 2
-			public const int ClassicsFooter_srlDrawableArrow = 2;
-			
-			// aapt resource value: 3
-			public const int ClassicsFooter_srlDrawableArrowSize = 3;
-			
-			// aapt resource value: 4
-			public const int ClassicsFooter_srlDrawableMarginRight = 4;
-			
-			// aapt resource value: 5
-			public const int ClassicsFooter_srlDrawableProgress = 5;
-			
-			// aapt resource value: 6
-			public const int ClassicsFooter_srlDrawableProgressSize = 6;
-			
-			// aapt resource value: 7
-			public const int ClassicsFooter_srlDrawableSize = 7;
-			
-			// aapt resource value: 8
-			public const int ClassicsFooter_srlFinishDuration = 8;
-			
-			// aapt resource value: 9
-			public const int ClassicsFooter_srlPrimaryColor = 9;
-			
-			// aapt resource value: 10
-			public const int ClassicsFooter_srlTextFailed = 10;
-			
-			// aapt resource value: 11
-			public const int ClassicsFooter_srlTextFinish = 11;
-			
-			// aapt resource value: 12
-			public const int ClassicsFooter_srlTextLoading = 12;
-			
-			// aapt resource value: 13
-			public const int ClassicsFooter_srlTextNothing = 13;
-			
-			// aapt resource value: 14
-			public const int ClassicsFooter_srlTextPulling = 14;
-			
-			// aapt resource value: 15
-			public const int ClassicsFooter_srlTextRefreshing = 15;
-			
-			// aapt resource value: 16
-			public const int ClassicsFooter_srlTextRelease = 16;
-			
-			// aapt resource value: 17
-			public const int ClassicsFooter_srlTextSizeTitle = 17;
-			
-			// aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040133,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015C,0x7F04015D,0x7F04015E,0x7F04015F }
-			public static int[] ClassicsHeader = new int[] {
-					2130968863,
-					2130968865,
-					2130968869,
-					2130968870,
-					2130968871,
-					2130968872,
-					2130968873,
-					2130968874,
-					2130968883,
-					2130968896,
-					2130968913,
-					2130968916,
-					2130968917,
-					2130968918,
-					2130968920,
-					2130968921,
-					2130968922,
-					2130968923,
-					2130968924,
-					2130968925,
-					2130968926,
-					2130968927};
-			
-			// aapt resource value: 0
-			public const int ClassicsHeader_srlAccentColor = 0;
-			
-			// aapt resource value: 1
-			public const int ClassicsHeader_srlClassicsSpinnerStyle = 1;
-			
-			// aapt resource value: 2
-			public const int ClassicsHeader_srlDrawableArrow = 2;
-			
-			// aapt resource value: 3
-			public const int ClassicsHeader_srlDrawableArrowSize = 3;
-			
-			// aapt resource value: 4
-			public const int ClassicsHeader_srlDrawableMarginRight = 4;
-			
-			// aapt resource value: 5
-			public const int ClassicsHeader_srlDrawableProgress = 5;
-			
-			// aapt resource value: 6
-			public const int ClassicsHeader_srlDrawableProgressSize = 6;
-			
-			// aapt resource value: 7
-			public const int ClassicsHeader_srlDrawableSize = 7;
-			
-			// aapt resource value: 8
-			public const int ClassicsHeader_srlEnableLastTime = 8;
-			
-			// aapt resource value: 9
-			public const int ClassicsHeader_srlFinishDuration = 9;
-			
-			// aapt resource value: 10
-			public const int ClassicsHeader_srlPrimaryColor = 10;
-			
-			// aapt resource value: 11
-			public const int ClassicsHeader_srlTextFailed = 11;
-			
-			// aapt resource value: 12
-			public const int ClassicsHeader_srlTextFinish = 12;
-			
-			// aapt resource value: 13
-			public const int ClassicsHeader_srlTextLoading = 13;
-			
-			// aapt resource value: 14
-			public const int ClassicsHeader_srlTextPulling = 14;
-			
-			// aapt resource value: 15
-			public const int ClassicsHeader_srlTextRefreshing = 15;
-			
-			// aapt resource value: 16
-			public const int ClassicsHeader_srlTextRelease = 16;
-			
-			// aapt resource value: 17
-			public const int ClassicsHeader_srlTextSecondary = 17;
-			
-			// aapt resource value: 18
-			public const int ClassicsHeader_srlTextSizeTime = 18;
-			
-			// aapt resource value: 19
-			public const int ClassicsHeader_srlTextSizeTitle = 19;
-			
-			// aapt resource value: 20
-			public const int ClassicsHeader_srlTextTimeMarginTop = 20;
-			
-			// aapt resource value: 21
-			public const int ClassicsHeader_srlTextUpdate = 21;
-			
-			// aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
-			public static int[] CollapsingToolbarLayout = new int[] {
-					2130968675,
-					2130968676,
-					2130968696,
-					2130968728,
-					2130968729,
-					2130968730,
-					2130968731,
-					2130968732,
-					2130968733,
-					2130968734,
-					2130968842,
-					2130968843,
-					2130968933,
-					2130968983,
-					2130968984,
-					2130968994};
-			
-			// aapt resource value: 0
-			public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
-			
-			// 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;
-			
-			// aapt resource value: 5
-			public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
-			
-			// aapt resource value: 6
-			public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
-			
-			// aapt resource value: 7
-			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
-			
-			// aapt resource value: 8
-			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
-			
-			// aapt resource value: 9
-			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
-			
-			// aapt resource value: { 0x7F0400CF,0x7F0400D0 }
-			public static int[] CollapsingToolbarLayout_Layout = new int[] {
-					2130968783,
-					2130968784};
-			
-			// aapt resource value: 0
-			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
-			
-			// aapt resource value: 1
-			public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
-			
-			// aapt resource value: 10
-			public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
-			
-			// 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};
-			
-			// aapt resource value: 2
-			public const int ColorStateListItem_alpha = 2;
-			
-			// aapt resource value: 1
-			public const int ColorStateListItem_android_alpha = 1;
-			
-			// aapt resource value: 0
-			public const int ColorStateListItem_android_color = 0;
-			
-			// aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
-			public static int[] CompoundButton = new int[] {
-					16843015,
-					2130968667,
-					2130968668};
-			
-			// aapt resource value: 0
-			public const int CompoundButton_android_button = 0;
-			
-			// aapt resource value: 1
-			public const int CompoundButton_buttonTint = 1;
-			
-			// aapt resource value: 2
-			public const int CompoundButton_buttonTintMode = 2;
-			
-			// aapt resource value: { 0x7F0400C9,0x7F040164 }
-			public static int[] CoordinatorLayout = new int[] {
-					2130968777,
-					2130968932};
-			
-			// aapt resource value: 0
-			public const int CoordinatorLayout_keylines = 0;
-			
-			// aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
-			public static int[] CoordinatorLayout_Layout = new int[] {
-					16842931,
-					2130968780,
-					2130968781,
-					2130968782,
-					2130968785,
-					2130968786,
-					2130968787};
-			
-			// aapt resource value: 0
-			public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
-			
-			// aapt resource value: 1
-			public const int CoordinatorLayout_Layout_layout_anchor = 1;
-			
-			// aapt resource value: 2
-			public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
-			
-			// aapt resource value: 3
-			public const int CoordinatorLayout_Layout_layout_behavior = 3;
-			
-			// aapt resource value: 4
-			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
-			
-			// aapt resource value: 5
-			public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
-			
-			// aapt resource value: 6
-			public const int CoordinatorLayout_Layout_layout_keyline = 6;
-			
-			// aapt resource value: 1
-			public const int CoordinatorLayout_statusBarBackground = 1;
-			
-			// aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
-			public static int[] DesignTheme = new int[] {
-					2130968656,
-					2130968657,
-					2130968971};
-			
-			// aapt resource value: 0
-			public const int DesignTheme_bottomSheetDialogTheme = 0;
-			
-			// aapt resource value: 1
-			public const int DesignTheme_bottomSheetStyle = 1;
-			
-			// aapt resource value: 2
-			public const int DesignTheme_textColorError = 2;
-			
-			// aapt resource value: { 0x7F04003A,0x7F04003B,0x7F040047,0x7F040065,0x7F04008C,0x7F0400B0,0x7F04011A,0x7F04018E }
-			public static int[] DrawerArrowToggle = new int[] {
-					2130968634,
-					2130968635,
-					2130968647,
-					2130968677,
-					2130968716,
-					2130968752,
-					2130968858,
-					2130968974};
-			
-			// aapt resource value: 0
-			public const int DrawerArrowToggle_arrowHeadLength = 0;
-			
-			// aapt resource value: 1
-			public const int DrawerArrowToggle_arrowShaftLength = 1;
-			
-			// aapt resource value: 2
-			public const int DrawerArrowToggle_barLength = 2;
-			
-			// aapt resource value: 3
-			public const int DrawerArrowToggle_color = 3;
-			
-			// aapt resource value: 4
-			public const int DrawerArrowToggle_drawableSize = 4;
-			
-			// aapt resource value: 5
-			public const int DrawerArrowToggle_gapBetweenBars = 5;
-			
-			// aapt resource value: 6
-			public const int DrawerArrowToggle_spinBars = 6;
-			
-			// 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;
-			
-			// 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;
-			
-			// aapt resource value: 2
-			public const int FloatingActionButton_borderWidth = 2;
-			
-			// aapt resource value: 3
-			public const int FloatingActionButton_elevation = 3;
-			
-			// aapt resource value: 4
-			public const int FloatingActionButton_fabSize = 4;
-			
-			// aapt resource value: 5
-			public const int FloatingActionButton_pressedTranslationZ = 5;
-			
-			// aapt resource value: 6
-			public const int FloatingActionButton_rippleColor = 6;
-			
-			// aapt resource value: 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};
-			
-			// aapt resource value: 0
-			public const int FontFamilyFont_font = 0;
-			
-			// aapt resource value: 1
-			public const int FontFamilyFont_fontStyle = 1;
-			
-			// aapt resource value: 2
-			public const int FontFamilyFont_fontWeight = 2;
-			
-			// 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;
-			
-			// aapt resource value: 4
-			public const int FontFamily_fontProviderPackage = 4;
-			
-			// aapt resource value: 5
-			public const int FontFamily_fontProviderQuery = 5;
-			
-			// aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
-			public static int[] ForegroundLinearLayout = new int[] {
-					16843017,
-					16843264,
-					2130968751};
-			
-			// aapt resource value: 0
-			public const int ForegroundLinearLayout_android_foreground = 0;
-			
-			// aapt resource value: 1
-			public const int ForegroundLinearLayout_android_foregroundGravity = 1;
-			
-			// aapt resource value: 2
-			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
-			
-			// aapt resource value: { 0x7F040029,0x7F04002A,0x7F04002B,0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F0400B2 }
-			public static int[] HDLArcSeekBar = new int[] {
-					2130968617,
-					2130968618,
-					2130968619,
-					2130968620,
-					2130968621,
-					2130968622,
-					2130968623,
-					2130968624,
-					2130968625,
-					2130968626,
-					2130968627,
-					2130968628,
-					2130968629,
-					2130968630,
-					2130968631,
-					2130968632,
-					2130968633,
-					2130968754};
-			
-			// aapt resource value: 0
-			public const int HDLArcSeekBar_arc_border_color = 0;
-			
-			// aapt resource value: 1
-			public const int HDLArcSeekBar_arc_border_width = 1;
-			
-			// aapt resource value: 2
-			public const int HDLArcSeekBar_arc_colors = 2;
-			
-			// aapt resource value: 3
-			public const int HDLArcSeekBar_arc_max = 3;
-			
-			// aapt resource value: 4
-			public const int HDLArcSeekBar_arc_min = 4;
-			
-			// aapt resource value: 5
-			public const int HDLArcSeekBar_arc_open_angle = 5;
-			
-			// aapt resource value: 6
-			public const int HDLArcSeekBar_arc_progress = 6;
-			
-			// aapt resource value: 7
-			public const int HDLArcSeekBar_arc_progress_bar_color = 7;
-			
-			// aapt resource value: 8
-			public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
-			
-			// aapt resource value: 9
-			public const int HDLArcSeekBar_arc_rotate_angle = 9;
-			
-			// aapt resource value: 10
-			public const int HDLArcSeekBar_arc_shadow_radius = 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;
-			
-			// aapt resource value: 13
-			public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
-			
-			// aapt resource value: 14
-			public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
-			
-			// aapt resource value: 15
-			public const int HDLArcSeekBar_arc_thumb_width = 15;
-			
-			// aapt resource value: 16
-			public const int HDLArcSeekBar_arc_width = 16;
-			
-			// aapt resource value: 17
-			public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
-			
-			// aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
-			public static int[] HDLCurtainSeekBar = new int[] {
-					2130968702,
-					2130968703,
-					2130968704,
-					2130968705,
-					2130968706,
-					2130968847};
-			
-			// aapt resource value: 0
-			public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
-			
-			// aapt resource value: 1
-			public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
-			
-			// aapt resource value: 2
-			public const int HDLCurtainSeekBar_curtain_bar_color = 2;
-			
-			// aapt resource value: 3
-			public const int HDLCurtainSeekBar_curtain_bar_height = 3;
-			
-			// aapt resource value: 4
-			public const int HDLCurtainSeekBar_curtain_bar_width = 4;
-			
-			// aapt resource value: 5
-			public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
-			
-			// aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
-			public static int[] HDLWaveSeekBar = new int[] {
-					2130968848,
-					2130969005,
-					2130969006,
-					2130969007,
-					2130969008,
-					2130969009};
-			
-			// aapt resource value: 0
-			public const int HDLWaveSeekBar_second_wave_color = 0;
-			
-			// aapt resource value: 1
-			public const int HDLWaveSeekBar_wave_bg_color = 1;
-			
-			// aapt resource value: 2
-			public const int HDLWaveSeekBar_wave_border_color = 2;
-			
-			// aapt resource value: 3
-			public const int HDLWaveSeekBar_wave_color = 3;
-			
-			// aapt resource value: 4
-			public const int HDLWaveSeekBar_wave_height = 4;
-			
-			// aapt resource value: 5
-			public const int HDLWaveSeekBar_wave_width = 5;
-			
-			// aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
-			public static int[] LinearLayoutCompat = new int[] {
-					16842927,
-					16842948,
-					16843046,
-					16843047,
-					16843048,
-					2130968712,
-					2130968714,
-					2130968807,
-					2130968853};
-			
-			// aapt resource value: 2
-			public const int LinearLayoutCompat_android_baselineAligned = 2;
-			
-			// aapt resource value: 3
-			public const int LinearLayoutCompat_android_baselineAlignedChildIndex = 3;
-			
-			// aapt resource value: 0
-			public const int LinearLayoutCompat_android_gravity = 0;
-			
-			// aapt resource value: 1
-			public const int LinearLayoutCompat_android_orientation = 1;
-			
-			// aapt resource value: 4
-			public const int LinearLayoutCompat_android_weightSum = 4;
-			
-			// aapt resource value: 5
-			public const int LinearLayoutCompat_divider = 5;
-			
-			// aapt resource value: 6
-			public const int LinearLayoutCompat_dividerPadding = 6;
-			
-			// aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
-			public static int[] LinearLayoutCompat_Layout = new int[] {
-					16842931,
-					16842996,
-					16842997,
-					16843137};
-			
-			// aapt resource value: 0
-			public const int LinearLayoutCompat_Layout_android_layout_gravity = 0;
-			
-			// aapt resource value: 2
-			public const int LinearLayoutCompat_Layout_android_layout_height = 2;
-			
-			// aapt resource value: 3
-			public const int LinearLayoutCompat_Layout_android_layout_weight = 3;
-			
-			// aapt resource value: 1
-			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
-			
-			// aapt resource value: 7
-			public const int LinearLayoutCompat_measureWithLargestChild = 7;
-			
-			// aapt resource value: 8
-			public const int LinearLayoutCompat_showDividers = 8;
-			
-			// aapt resource value: { 0x10102AC,0x10102AD }
-			public static int[] ListPopupWindow = new int[] {
-					16843436,
-					16843437};
-			
-			// aapt resource value: 0
-			public const int ListPopupWindow_android_dropDownHorizontalOffset = 0;
-			
-			// aapt resource value: 1
-			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
-			
-			// aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
-			public static int[] MenuGroup = new int[] {
-					16842766,
-					16842960,
-					16843156,
-					16843230,
-					16843231,
-					16843232};
-			
-			// aapt resource value: 5
-			public const int MenuGroup_android_checkableBehavior = 5;
-			
-			// aapt resource value: 0
-			public const int MenuGroup_android_enabled = 0;
-			
-			// aapt resource value: 1
-			public const int MenuGroup_android_id = 1;
-			
-			// aapt resource value: 3
-			public const int MenuGroup_android_menuCategory = 3;
-			
-			// aapt resource value: 4
-			public const int MenuGroup_android_orderInCategory = 4;
-			
-			// aapt resource value: 2
-			public const int MenuGroup_android_visible = 2;
-			
-			// aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
-			public static int[] MenuItem = new int[] {
-					16842754,
-					16842766,
-					16842960,
-					16843014,
-					16843156,
-					16843230,
-					16843231,
-					16843233,
-					16843234,
-					16843235,
-					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;
-			
-			// aapt resource value: 16
-			public const int MenuItem_alphabeticModifiers = 16;
-			
-			// aapt resource value: 9
-			public const int MenuItem_android_alphabeticShortcut = 9;
-			
-			// aapt resource value: 11
-			public const int MenuItem_android_checkable = 11;
-			
-			// aapt resource value: 3
-			public const int MenuItem_android_checked = 3;
-			
-			// aapt resource value: 1
-			public const int MenuItem_android_enabled = 1;
-			
-			// aapt resource value: 0
-			public const int MenuItem_android_icon = 0;
-			
-			// aapt resource value: 2
-			public const int MenuItem_android_id = 2;
-			
-			// aapt resource value: 5
-			public const int MenuItem_android_menuCategory = 5;
-			
-			// aapt resource value: 10
-			public const int MenuItem_android_numericShortcut = 10;
-			
-			// aapt resource value: 12
-			public const int MenuItem_android_onClick = 12;
-			
-			// aapt resource value: 6
-			public const int MenuItem_android_orderInCategory = 6;
-			
-			// aapt resource value: 7
-			public const int MenuItem_android_title = 7;
-			
-			// aapt resource value: 8
-			public const int MenuItem_android_titleCondensed = 8;
-			
-			// aapt resource value: 4
-			public const int MenuItem_android_visible = 4;
-			
-			// aapt resource value: 17
-			public const int MenuItem_contentDescription = 17;
-			
-			// aapt resource value: 18
-			public const int MenuItem_iconTint = 18;
-			
-			// aapt resource value: 19
-			public const int MenuItem_iconTintMode = 19;
-			
-			// aapt resource value: 20
-			public const int MenuItem_numericModifiers = 20;
-			
-			// aapt resource value: 21
-			public const int MenuItem_showAsAction = 21;
-			
-			// aapt resource value: 22
-			public const int MenuItem_tooltipText = 22;
-			
-			// aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
-			public static int[] MenuView = new int[] {
-					16842926,
-					16843052,
-					16843053,
-					16843054,
-					16843055,
-					16843056,
-					16843057,
-					2130968830,
-					2130968934};
-			
-			// aapt resource value: 4
-			public const int MenuView_android_headerBackground = 4;
-			
-			// aapt resource value: 2
-			public const int MenuView_android_horizontalDivider = 2;
-			
-			// aapt resource value: 5
-			public const int MenuView_android_itemBackground = 5;
-			
-			// aapt resource value: 6
-			public const int MenuView_android_itemIconDisabledAlpha = 6;
-			
-			// aapt resource value: 1
-			public const int MenuView_android_itemTextAppearance = 1;
-			
-			// aapt resource value: 3
-			public const int MenuView_android_verticalDivider = 3;
-			
-			// aapt resource value: 0
-			public const int MenuView_android_windowAnimationStyle = 0;
-			
-			// aapt resource value: 7
-			public const int MenuView_preserveIconSpacing = 7;
-			
-			// aapt resource value: 8
-			public const int MenuView_subMenuArrow = 8;
-			
-			// aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F040093,0x7F0400B3,0x7F0400C4,0x7F0400C5,0x7F0400C7,0x7F0400C8,0x7F0400E8 }
-			public static int[] NavigationView = new int[] {
-					16842964,
-					16842973,
-					16843039,
-					2130968723,
-					2130968755,
-					2130968772,
-					2130968773,
-					2130968775,
-					2130968776,
-					2130968808};
-			
-			// aapt resource value: 0
-			public const int NavigationView_android_background = 0;
-			
-			// aapt resource value: 1
-			public const int NavigationView_android_fitsSystemWindows = 1;
-			
-			// aapt resource value: 2
-			public const int NavigationView_android_maxWidth = 2;
-			
-			// aapt resource value: 3
-			public const int NavigationView_elevation = 3;
-			
-			// aapt resource value: 4
-			public const int NavigationView_headerLayout = 4;
-			
-			// aapt resource value: 5
-			public const int NavigationView_itemBackground = 5;
-			
-			// aapt resource value: 6
-			public const int NavigationView_itemIconTint = 6;
-			
-			// aapt resource value: 7
-			public const int NavigationView_itemTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int NavigationView_itemTextColor = 8;
-			
-			// aapt resource value: 9
-			public const int NavigationView_menu = 9;
-			
-			// aapt resource value: { 0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6,0x7F0401B7 }
-			public static int[] pickerview = new int[] {
-					2130969010,
-					2130969011,
-					2130969012,
-					2130969013,
-					2130969014,
-					2130969015};
-			
-			// aapt resource value: 0
-			public const int pickerview_wheelview_dividerColor = 0;
-			
-			// aapt resource value: 1
-			public const int pickerview_wheelview_gravity = 1;
-			
-			// aapt resource value: 2
-			public const int pickerview_wheelview_lineSpacingMultiplier = 2;
-			
-			// aapt resource value: 3
-			public const int pickerview_wheelview_textColorCenter = 3;
-			
-			// aapt resource value: 4
-			public const int pickerview_wheelview_textColorOut = 4;
-			
-			// aapt resource value: 5
-			public const int pickerview_wheelview_textSize = 5;
-			
-			// aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
-			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;
-			
-			// aapt resource value: 1
-			public const int PopupWindow_android_popupAnimationStyle = 1;
-			
-			// aapt resource value: 0
-			public const int PopupWindow_android_popupBackground = 0;
-			
-			// aapt resource value: 2
-			public const int PopupWindow_overlapAnchor = 2;
-			
-			// aapt resource value: { 0x7F0400EF,0x7F0400F2 }
-			public static int[] RecycleListView = new int[] {
-					2130968815,
-					2130968818};
-			
-			// aapt resource value: 0
-			public const int RecycleListView_paddingBottomNoButtons = 0;
-			
-			// aapt resource value: 1
-			public const int RecycleListView_paddingTopNoTitle = 1;
-			
-			// aapt resource value: { 0x10100C4,0x10100F1,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0400CB,0x7F040108,0x7F040119,0x7F040160 }
-			public static int[] RecyclerView = new int[] {
-					16842948,
-					16842993,
-					2130968736,
-					2130968737,
-					2130968738,
-					2130968739,
-					2130968740,
-					2130968779,
-					2130968840,
-					2130968857,
-					2130968928};
-			
-			// aapt resource value: 1
-			public const int RecyclerView_android_descendantFocusability = 1;
-			
-			// aapt resource value: 0
-			public const int RecyclerView_android_orientation = 0;
-			
-			// aapt resource value: 2
-			public const int RecyclerView_fastScrollEnabled = 2;
-			
-			// aapt resource value: 3
-			public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
-			
-			// aapt resource value: 4
-			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
-			
-			// aapt resource value: 5
-			public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
-			
-			// aapt resource value: 6
-			public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
-			
-			// aapt resource value: 7
-			public const int RecyclerView_layoutManager = 7;
-			
-			// aapt resource value: 8
-			public const int RecyclerView_reverseLayout = 8;
-			
-			// aapt resource value: 9
-			public const int RecyclerView_spanCount = 9;
-			
-			// aapt resource value: 10
-			public const int RecyclerView_stackFromEnd = 10;
-			
-			// aapt resource value: { 0x7F0400C2 }
-			public static int[] ScrimInsetsFrameLayout = new int[] {
-					2130968770};
-			
-			// aapt resource value: 0
-			public const int ScrimInsetsFrameLayout_insetForeground = 0;
-			
-			// aapt resource value: { 0x7F04004A }
-			public static int[] ScrollingViewBehavior_Layout = new int[] {
-					2130968650};
-			
-			// 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};
-			
-			// aapt resource value: 0
-			public const int SearchView_android_focusable = 0;
-			
-			// aapt resource value: 3
-			public const int SearchView_android_imeOptions = 3;
-			
-			// aapt resource value: 2
-			public const int SearchView_android_inputType = 2;
-			
-			// aapt resource value: 1
-			public const int SearchView_android_maxWidth = 1;
-			
-			// aapt resource value: 4
-			public const int SearchView_closeIcon = 4;
-			
-			// aapt resource value: 5
-			public const int SearchView_commitIcon = 5;
-			
-			// aapt resource value: 6
-			public const int SearchView_defaultQueryHint = 6;
-			
-			// aapt resource value: 7
-			public const int SearchView_goIcon = 7;
-			
-			// aapt resource value: 8
-			public const int SearchView_iconifiedByDefault = 8;
-			
-			// aapt resource value: 9
-			public const int SearchView_layout = 9;
-			
-			// aapt resource value: 10
-			public const int SearchView_queryBackground = 10;
-			
-			// aapt resource value: 11
-			public const int SearchView_queryHint = 11;
-			
-			// aapt resource value: 12
-			public const int SearchView_searchHintIcon = 12;
-			
-			// aapt resource value: 13
-			public const int SearchView_searchIcon = 13;
-			
-			// aapt resource value: 14
-			public const int SearchView_submitBackground = 14;
-			
-			// aapt resource value: 15
-			public const int SearchView_suggestionRowLayout = 15;
-			
-			// aapt resource value: 16
-			public const int SearchView_voiceIcon = 16;
-			
-			// aapt resource value: { 0x10100EA,0x10100EB,0x7F04011F,0x7F040122,0x7F040123,0x7F040124,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F040141,0x7F040142,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F040151,0x7F040152 }
-			public 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};
-			
-			// aapt resource value: 0
-			public const int SmartRefreshLayout_android_clipChildren = 0;
-			
-			// aapt resource value: 1
-			public const int SmartRefreshLayout_android_clipToPadding = 1;
-			
-			// aapt resource value: { 0x7F0400D6,0x7F0400D7 }
-			public static int[] SmartRefreshLayout_Layout = new int[] {
-					2130968790,
-					2130968791};
-			
-			// aapt resource value: 0
-			public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
-			
-			// aapt resource value: 1
-			public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
-			
-			// aapt resource value: 2
-			public const int SmartRefreshLayout_srlAccentColor = 2;
-			
-			// aapt resource value: 3
-			public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
-			
-			// aapt resource value: 4
-			public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
-			
-			// aapt resource value: 5
-			public const int SmartRefreshLayout_srlDragRate = 5;
-			
-			// aapt resource value: 6
-			public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
-			
-			// aapt resource value: 7
-			public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
-			
-			// aapt resource value: 8
-			public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
-			
-			// aapt resource value: 9
-			public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
-			
-			// aapt resource value: 10
-			public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
-			
-			// aapt resource value: 11
-			public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
-			
-			// aapt resource value: 12
-			public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
-			
-			// aapt resource value: 13
-			public const int SmartRefreshLayout_srlEnableLoadMore = 13;
-			
-			// aapt resource value: 14
-			public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
-			
-			// aapt resource value: 15
-			public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
-			
-			// aapt resource value: 16
-			public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
-			
-			// aapt resource value: 17
-			public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
-			
-			// aapt resource value: 18
-			public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
-			
-			// aapt resource value: 19
-			public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
-			
-			// aapt resource value: 20
-			public const int SmartRefreshLayout_srlEnableRefresh = 20;
-			
-			// aapt resource value: 21
-			public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
-			
-			// aapt resource value: 22
-			public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
-			
-			// aapt resource value: 23
-			public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
-			
-			// aapt resource value: 24
-			public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
-			
-			// aapt resource value: 25
-			public const int SmartRefreshLayout_srlFooterHeight = 25;
-			
-			// aapt resource value: 26
-			public const int SmartRefreshLayout_srlFooterInsetStart = 26;
-			
-			// aapt resource value: 27
-			public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
-			
-			// aapt resource value: 28
-			public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
-			
-			// aapt resource value: 29
-			public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
-			
-			// aapt resource value: 30
-			public const int SmartRefreshLayout_srlHeaderHeight = 30;
-			
-			// aapt resource value: 31
-			public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
-			
-			// aapt resource value: 32
-			public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
-			
-			// aapt resource value: 33
-			public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
-			
-			// aapt resource value: 34
-			public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
-			
-			// aapt resource value: 35
-			public const int SmartRefreshLayout_srlPrimaryColor = 35;
-			
-			// aapt resource value: 36
-			public const int SmartRefreshLayout_srlReboundDuration = 36;
-			
-			// aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
-			public static int[] SnackbarLayout = new int[] {
-					16843039,
-					2130968723,
-					2130968805};
-			
-			// aapt resource value: 0
-			public const int SnackbarLayout_android_maxWidth = 0;
-			
-			// aapt resource value: 1
-			public const int SnackbarLayout_elevation = 1;
-			
-			// aapt resource value: 2
-			public const int SnackbarLayout_maxActionInlineWidth = 2;
-			
-			// aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0400FC }
-			public static int[] Spinner = new int[] {
-					16842930,
-					16843126,
-					16843131,
-					16843362,
-					2130968828};
-			
-			// aapt resource value: 3
-			public const int Spinner_android_dropDownWidth = 3;
-			
-			// aapt resource value: 0
-			public const int Spinner_android_entries = 0;
-			
-			// aapt resource value: 1
-			public const int Spinner_android_popupBackground = 1;
-			
-			// aapt resource value: 2
-			public const int Spinner_android_prompt = 2;
-			
-			// aapt resource value: 4
-			public const int Spinner_popupTheme = 4;
-			
-			// aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F040116,0x7F04011D,0x7F04016D,0x7F04016E,0x7F040170,0x7F04018F,0x7F040190,0x7F040191,0x7F0401A8,0x7F0401A9,0x7F0401AA }
-			public static int[] SwitchCompat = new int[] {
-					16843044,
-					16843045,
-					16843074,
-					2130968854,
-					2130968861,
-					2130968941,
-					2130968942,
-					2130968944,
-					2130968975,
-					2130968976,
-					2130968977,
-					2130969000,
-					2130969001,
-					2130969002};
-			
-			// aapt resource value: 1
-			public const int SwitchCompat_android_textOff = 1;
-			
-			// aapt resource value: 0
-			public const int SwitchCompat_android_textOn = 0;
-			
-			// aapt resource value: 2
-			public const int SwitchCompat_android_thumb = 2;
-			
-			// aapt resource value: 3
-			public const int SwitchCompat_showText = 3;
-			
-			// aapt resource value: 4
-			public const int SwitchCompat_splitTrack = 4;
-			
-			// aapt resource value: 5
-			public const int SwitchCompat_switchMinWidth = 5;
-			
-			// aapt resource value: 6
-			public const int SwitchCompat_switchPadding = 6;
-			
-			// aapt resource value: 7
-			public const int SwitchCompat_switchTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int SwitchCompat_thumbTextPadding = 8;
-			
-			// aapt resource value: 9
-			public const int SwitchCompat_thumbTint = 9;
-			
-			// aapt resource value: 10
-			public const int SwitchCompat_thumbTintMode = 10;
-			
-			// aapt resource value: 11
-			public const int SwitchCompat_track = 11;
-			
-			// aapt resource value: 12
-			public const int SwitchCompat_trackTint = 12;
-			
-			// aapt resource value: 13
-			public const int SwitchCompat_trackTintMode = 13;
-			
-			// aapt resource value: { 0x1010002,0x10100F2,0x101014F }
-			public static int[] TabItem = new int[] {
-					16842754,
-					16842994,
-					16843087};
-			
-			// aapt resource value: 0
-			public const int TabItem_android_icon = 0;
-			
-			// aapt resource value: 1
-			public const int TabItem_android_layout = 1;
-			
-			// aapt resource value: 2
-			public const int TabItem_android_text = 2;
-			
-			// aapt resource value: { 0x7F040171,0x7F040172,0x7F040173,0x7F040174,0x7F040175,0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B,0x7F04017C,0x7F04017D,0x7F04017E,0x7F04017F,0x7F040180 }
-			public static int[] TabLayout = new int[] {
-					2130968945,
-					2130968946,
-					2130968947,
-					2130968948,
-					2130968949,
-					2130968950,
-					2130968951,
-					2130968952,
-					2130968953,
-					2130968954,
-					2130968955,
-					2130968956,
-					2130968957,
-					2130968958,
-					2130968959,
-					2130968960};
-			
-			// aapt resource value: 0
-			public const int TabLayout_tabBackground = 0;
-			
-			// aapt resource value: 1
-			public const int TabLayout_tabContentStart = 1;
-			
-			// aapt resource value: 2
-			public const int TabLayout_tabGravity = 2;
-			
-			// aapt resource value: 3
-			public const int TabLayout_tabIndicatorColor = 3;
-			
-			// aapt resource value: 4
-			public const int TabLayout_tabIndicatorHeight = 4;
-			
-			// aapt resource value: 5
-			public const int TabLayout_tabMaxWidth = 5;
-			
-			// aapt resource value: 6
-			public const int TabLayout_tabMinWidth = 6;
-			
-			// aapt resource value: 7
-			public const int TabLayout_tabMode = 7;
-			
-			// aapt resource value: 8
-			public const int TabLayout_tabPadding = 8;
-			
-			// aapt resource value: 9
-			public const int TabLayout_tabPaddingBottom = 9;
-			
-			// aapt resource value: 10
-			public const int TabLayout_tabPaddingEnd = 10;
-			
-			// aapt resource value: 11
-			public const int TabLayout_tabPaddingStart = 11;
-			
-			// aapt resource value: 12
-			public const int TabLayout_tabPaddingTop = 12;
-			
-			// aapt resource value: 13
-			public const int TabLayout_tabSelectedTextColor = 13;
-			
-			// aapt resource value: 14
-			public const int TabLayout_tabTextAppearance = 14;
-			
-			// aapt resource value: 15
-			public const int TabLayout_tabTextColor = 15;
-			
-			// aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
-			public static int[] TextAppearance = new int[] {
-					16842901,
-					16842902,
-					16842903,
-					16842904,
-					16842906,
-					16842907,
-					16843105,
-					16843106,
-					16843107,
-					16843108,
-					16843692,
-					2130968742,
-					2130968961};
-			
-			// aapt resource value: 10
-			public const int TextAppearance_android_fontFamily = 10;
-			
-			// aapt resource value: 6
-			public const int TextAppearance_android_shadowColor = 6;
-			
-			// aapt resource value: 7
-			public const int TextAppearance_android_shadowDx = 7;
-			
-			// aapt resource value: 8
-			public const int TextAppearance_android_shadowDy = 8;
-			
-			// aapt resource value: 9
-			public const int TextAppearance_android_shadowRadius = 9;
-			
-			// aapt resource value: 3
-			public const int TextAppearance_android_textColor = 3;
-			
-			// aapt resource value: 4
-			public const int TextAppearance_android_textColorHint = 4;
-			
-			// aapt resource value: 5
-			public const int TextAppearance_android_textColorLink = 5;
-			
-			// aapt resource value: 0
-			public const int TextAppearance_android_textSize = 0;
-			
-			// aapt resource value: 2
-			public const int TextAppearance_android_textStyle = 2;
-			
-			// aapt resource value: 1
-			public const int TextAppearance_android_typeface = 1;
-			
-			// aapt resource value: 11
-			public const int TextAppearance_fontFamily = 11;
-			
-			// aapt resource value: 12
-			public const int TextAppearance_textAllCaps = 12;
-			
-			// aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
-			public static int[] TextInputLayout = new int[] {
-					16842906,
-					16843088,
-					2130968698,
-					2130968699,
-					2130968700,
-					2130968701,
-					2130968724,
-					2130968725,
-					2130968758,
-					2130968759,
-					2130968760,
-					2130968822,
-					2130968823,
-					2130968824,
-					2130968825,
-					2130968826};
-			
-			// aapt resource value: 1
-			public const int TextInputLayout_android_hint = 1;
-			
-			// aapt resource value: 0
-			public const int TextInputLayout_android_textColorHint = 0;
-			
-			// aapt resource value: 2
-			public const int TextInputLayout_counterEnabled = 2;
-			
-			// aapt resource value: 3
-			public const int TextInputLayout_counterMaxLength = 3;
-			
-			// aapt resource value: 4
-			public const int TextInputLayout_counterOverflowTextAppearance = 4;
-			
-			// aapt resource value: 5
-			public const int TextInputLayout_counterTextAppearance = 5;
-			
-			// aapt resource value: 6
-			public const int TextInputLayout_errorEnabled = 6;
-			
-			// aapt resource value: 7
-			public const int TextInputLayout_errorTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int TextInputLayout_hintAnimationEnabled = 8;
-			
-			// aapt resource value: 9
-			public const int TextInputLayout_hintEnabled = 9;
-			
-			// aapt resource value: 10
-			public const int TextInputLayout_hintTextAppearance = 10;
-			
-			// aapt resource value: 11
-			public const int TextInputLayout_passwordToggleContentDescription = 11;
-			
-			// aapt resource value: 12
-			public const int TextInputLayout_passwordToggleDrawable = 12;
-			
-			// aapt resource value: 13
-			public const int TextInputLayout_passwordToggleEnabled = 13;
-			
-			// aapt resource value: 14
-			public const int TextInputLayout_passwordToggleTint = 14;
-			
-			// aapt resource value: 15
-			public const int TextInputLayout_passwordToggleTintMode = 15;
-			
-			// aapt resource value: { 0x10100AF,0x1010140,0x7F040057,0x7F040061,0x7F040062,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F0400E3,0x7F0400E4,0x7F0400E6,0x7F0400EA,0x7F0400EB,0x7F0400FC,0x7F040168,0x7F040169,0x7F04016A,0x7F040197,0x7F040199,0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0 }
-			public static int[] Toolbar = new int[] {
-					16842927,
-					16843072,
-					2130968663,
-					2130968673,
-					2130968674,
-					2130968690,
-					2130968691,
-					2130968692,
-					2130968693,
-					2130968694,
-					2130968695,
-					2130968803,
-					2130968804,
-					2130968806,
-					2130968810,
-					2130968811,
-					2130968828,
-					2130968936,
-					2130968937,
-					2130968938,
-					2130968983,
-					2130968985,
-					2130968986,
-					2130968987,
-					2130968988,
-					2130968989,
-					2130968990,
-					2130968991,
-					2130968992};
-			
-			// aapt resource value: 0
-			public const int Toolbar_android_gravity = 0;
-			
-			// aapt resource value: 1
-			public const int Toolbar_android_minHeight = 1;
-			
-			// aapt resource value: 2
-			public const int Toolbar_buttonGravity = 2;
-			
-			// aapt resource value: 3
-			public const int Toolbar_collapseContentDescription = 3;
-			
-			// aapt resource value: 4
-			public const int Toolbar_collapseIcon = 4;
-			
-			// aapt resource value: 5
-			public const int Toolbar_contentInsetEnd = 5;
-			
-			// aapt resource value: 6
-			public const int Toolbar_contentInsetEndWithActions = 6;
-			
-			// aapt resource value: 7
-			public const int Toolbar_contentInsetLeft = 7;
-			
-			// aapt resource value: 8
-			public const int Toolbar_contentInsetRight = 8;
-			
-			// aapt resource value: 9
-			public const int Toolbar_contentInsetStart = 9;
-			
-			// aapt resource value: 10
-			public const int Toolbar_contentInsetStartWithNavigation = 10;
-			
-			// aapt resource value: 11
-			public const int Toolbar_logo = 11;
-			
-			// aapt resource value: 12
-			public const int Toolbar_logoDescription = 12;
-			
-			// aapt resource value: 13
-			public const int Toolbar_maxButtonHeight = 13;
-			
-			// aapt resource value: 14
-			public const int Toolbar_navigationContentDescription = 14;
-			
-			// aapt resource value: 15
-			public const int Toolbar_navigationIcon = 15;
-			
-			// aapt resource value: 16
-			public const int Toolbar_popupTheme = 16;
-			
-			// aapt resource value: 17
-			public const int Toolbar_subtitle = 17;
-			
-			// aapt resource value: 18
-			public const int Toolbar_subtitleTextAppearance = 18;
-			
-			// aapt resource value: 19
-			public const int Toolbar_subtitleTextColor = 19;
-			
-			// aapt resource value: 20
-			public const int Toolbar_title = 20;
-			
-			// aapt resource value: 21
-			public const int Toolbar_titleMargin = 21;
-			
-			// aapt resource value: 22
-			public const int Toolbar_titleMarginBottom = 22;
-			
-			// aapt resource value: 23
-			public const int Toolbar_titleMarginEnd = 23;
-			
-			// aapt resource value: 26
-			public const int Toolbar_titleMargins = 26;
-			
-			// aapt resource value: 24
-			public const int Toolbar_titleMarginStart = 24;
-			
-			// aapt resource value: 25
-			public const int Toolbar_titleMarginTop = 25;
-			
-			// aapt resource value: 27
-			public const int Toolbar_titleTextAppearance = 27;
-			
-			// aapt resource value: 28
-			public const int Toolbar_titleTextColor = 28;
-			
-			// aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
-			public static int[] TwoLevelHeader = new int[] {
-					2130968890,
-					2130968895,
-					2130968899,
-					2130968900,
-					2130968911,
-					2130968915};
-			
-			// aapt resource value: 0
-			public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
-			
-			// aapt resource value: 1
-			public const int TwoLevelHeader_srlEnableTwoLevel = 1;
-			
-			// aapt resource value: 2
-			public const int TwoLevelHeader_srlFloorDuration = 2;
-			
-			// aapt resource value: 3
-			public const int TwoLevelHeader_srlFloorRage = 3;
-			
-			// aapt resource value: 4
-			public const int TwoLevelHeader_srlMaxRage = 4;
-			
-			// aapt resource value: 5
-			public const int TwoLevelHeader_srlRefreshRage = 5;
-			
-			// aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
-			public static int[] View = new int[] {
-					16842752,
-					16842970,
-					2130968816,
-					2130968817,
-					2130968973};
-			
-			// aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
-			public static int[] ViewBackgroundHelper = new int[] {
-					16842964,
-					2130968645,
-					2130968646};
-			
-			// aapt resource value: 0
-			public const int ViewBackgroundHelper_android_background = 0;
-			
-			// aapt resource value: 1
-			public const int ViewBackgroundHelper_backgroundTint = 1;
-			
-			// aapt resource value: 2
-			public const int ViewBackgroundHelper_backgroundTintMode = 2;
-			
-			// aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
-			public static int[] ViewStubCompat = new int[] {
-					16842960,
-					16842994,
-					16842995};
-			
-			// aapt resource value: 0
-			public const int ViewStubCompat_android_id = 0;
-			
-			// aapt resource value: 2
-			public const int ViewStubCompat_android_inflatedId = 2;
-			
-			// aapt resource value: 1
-			public const int ViewStubCompat_android_layout = 1;
-			
-			// aapt resource value: 1
-			public const int View_android_focusable = 1;
-			
-			// aapt resource value: 0
-			public const int View_android_theme = 0;
-			
-			// aapt resource value: 2
-			public const int View_paddingEnd = 2;
-			
-			// aapt resource value: 3
-			public const int View_paddingStart = 3;
-			
-			// aapt resource value: 4
-			public const int View_theme = 4;
-			
-			static Styleable()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Styleable()
-			{
-			}
-		}
-		
 		public partial class Xml
 		{
 			
-			// aapt resource value: 0x7F100000
-			public const int file_paths = 2131755008;
-			
-			// aapt resource value: 0x7F100001
-			public const int hdl_filepaths = 2131755009;
+			// aapt resource value: 0x7F070000
+			public const int file_paths = 2131165184;
 			
 			static Xml()
 			{
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
index 856f57d..219e0b2 100644
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -25,6 +25,7 @@
 
         public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
         {
+            Shared.Application.IsGpsEnable = false;
             Shared.Application.IsMusicEnable = false;
             base.FinishedLaunching(application, launchOptions);
             Shared.Application.FontSize = 12;
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 4156507..2c5d995 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -1025,4 +1025,4 @@
     </ItemGroup>
     <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index e8893a2..d7319bb 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -237,12 +237,13 @@
 231=鎺ヨ繎鎰熷簲
 232=鎺ヨ繎鎰熷簲鍔熻兘璁剧疆缃け璐�
 233=鑾峰彇鎺ヨ繎鎰熷簲鍔熻兘澶辫触
-235=鎸変綇闈㈡澘妯″紡锛圡ode)鍜岄閫燂紙Fan)鎸夐敭{0}缁胯壊鎸囩ず鐏寒璧枫�傚垯閰嶇綉鎴愬姛
+235=鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛 
 236=缁胯壊鎸囩ず鐏棯鐑�
 237=鎸囩ず鐏�
 238=闀挎寜5绉掞紙鎸夐敭锛�
 239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
 242=鐢甸噺
 243=甯稿紑妯″紡宸插紑鍚�
 244=澶辨晥璁剧疆
@@ -263,10 +264,10 @@
 259=澶辨晥鏃堕棿涓嶅悎娉曪紝璇烽噸鍐欒缃�
 260=闊抽噺璁剧疆澶辫触
 261=闊抽噺璁剧疆鎴愬姛
-262=褰撳墠鏃跺尯
+262=褰撳墠鏃跺尯 
 263=鍖�
 264=涓�
-265=瑗�
+265=瑗� 
 266=褰撳墠璁惧涓嶅湪绾�
 267=鑾峰彇闊抽噺澶辫触
 268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
@@ -314,6 +315,7 @@
 311=鎵嬪姩
 312= 鑳屽厜鐏鑹�
 313=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
+314=鑷姩妯″紡涓嶆敮鎸佹搷浣�
 
 5097=鍙栨秷
 5098=纭畾
@@ -581,7 +583,7 @@
 5390=澶辨晥璁剧疆
 5391=灏忔椂
 5392=闂ㄩ攣濮嬬粓鎵撳紑
-5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
 5394=涓嶈兘灏忎簬1灏忔椂
 5395=澶т簬12灏忔椂
 5396=鎴�
@@ -1838,95 +1840,95 @@
 16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
 16116=娓稿浣撻獙
 
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
-18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
-18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
-18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
-18009=鎿嶄綔鏉冮檺涓嶈冻
-18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
-18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18012=瑙i櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18013=楠岃瘉鐮佸彂閫佸け璐�
-18015=璐﹀彿宸茬粡瀛樺湪
-18016=楠岃瘉鐮侀敊璇�
-18017=楠岃瘉鐮佸凡澶辨晥
-18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
-18019=鎸囧畾璐﹀彿宸插瓨鍦�
-18022=楠岃瘉鐮佸彂閫佸け璐�
-18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
-18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
-18026=鍘熷瘑鐮侀敊璇�
-18034=璐﹀彿鏈敞鍐�
-18035=璇锋眰鍙傛暟閿欒
-18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
-18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
-18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
-18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
-18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
-18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
-18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
-18047=鍏变韩鏁版嵁涓嶅瓨鍦�
-18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
-18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
-18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
-18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
-
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
-;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
-21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
-;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
-21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
-21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;Zigbee鏅鸿兘绠$姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
-21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
-;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
-21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
-;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
-21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
-;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
-21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
-;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21018=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
-;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21019=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
-;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21020=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
-;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
-21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
-21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
-21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-30000=绱ф�ユ寜閽�
-30001=鐕冩皵浼犳劅鍣�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
+18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
+18009=鎿嶄綔鏉冮檺涓嶈冻
+18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
+18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18012=瑙i櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18013=楠岃瘉鐮佸彂閫佸け璐�
+18015=璐﹀彿宸茬粡瀛樺湪
+18016=楠岃瘉鐮侀敊璇�
+18017=楠岃瘉鐮佸凡澶辨晥
+18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
+18019=鎸囧畾璐﹀彿宸插瓨鍦�
+18022=楠岃瘉鐮佸彂閫佸け璐�
+18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
+18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+18026=鍘熷瘑鐮侀敊璇�
+18034=璐﹀彿鏈敞鍐�
+18035=璇锋眰鍙傛暟閿欒
+18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
+18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
+18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
+18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
+18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
+18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
+18047=鍏变韩鏁版嵁涓嶅瓨鍦�
+18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
+18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
+18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
+
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
+;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
+21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
+;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
+21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
+21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;Zigbee鏅鸿兘绠$姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
+21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
+;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
+21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
+;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
+21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
+21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
+;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21018=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21019=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
+21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
+21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+30000=绱ф�ユ寜閽�
+30001=鐕冩皵浼犳劅鍣�
 30002=鐑熼浘浼犳劅鍣�
 30003=姘翠镜浼犳劅鍣�
 30004=閽ュ寵鎵�
@@ -1965,6 +1967,7 @@
 30037=S-one
 30038=鏂规偊鏂伴灏忔ā鍧�
 30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
+30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
 40000=閬槼
@@ -1987,9 +1990,9 @@
 40017=骞叉帴鐐�
 40018=鏂伴
 
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
-50000=绱ф�ユ寜閽�
-50001=Zigbee鐕冩皵浼犳劅鍣�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+50000=绱ф�ユ寜閽�
+50001=Zigbee鐕冩皵浼犳劅鍣�
 50002=Zigbee鐕冩皵浼犳劅鍣�
 50003=Zigbee姘存蹈浼犳劅鍣�
 50004=閽ュ寵鎵�
@@ -2028,8 +2031,9 @@
 50037=Zigbee鏅鸿兘闂ㄩ攣
 50038=鏂伴鎺у埗灏忔ā鍧�
 50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
+30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
 
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
 60000=浼犳劅鍣�
 60001=寮�鍏虫ā鍧�
 60002=閬槼妯″潡
@@ -2041,7 +2045,7 @@
 60008=杞崲鍣�
 60009=绌鸿皟妯″潡
 60010=鏅鸿兘闂ㄩ攣
-60011=鏂伴妯″潡
+60011=鏂伴妯″潡 
 
 ;//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭i噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
 70000=2鎸夐敭闈㈡澘
@@ -2070,4 +2074,4 @@
 70023=涓户鍣�
 70024=鏅鸿兘绌哄紑
 70025=鍚搁《鐕冩皵浼犳劅鍣�
-70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFive.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFive.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorPMTwoPointFive.png b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorPMTwoPointFive.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index aa1c7ba..14d2409 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -57,7 +57,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string CodeIDString = "1.0.20050601";
+        public static string CodeIDString = "1.0.20050701";
         /// <summary>
         /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
         /// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 30db26d..9c73532 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -271,7 +271,7 @@
                 //娣诲姞缂撳瓨
                 this.AddDeviceToMemory(ref device);
 
-                //绉婚櫎瀛樺湪鐨勮澶囧唴瀛�
+                //绉婚櫎瀛樺湪鐨勮澶囧唴瀛� 
                 string maikey = this.GetDeviceMainKeys(device);
                 if (dicExist.ContainsKey(maikey) == true)
                 {
@@ -2079,8 +2079,8 @@
             list.Add(DeviceBeloneType.A浼犳劅鍣�);
 
             //鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
-            list.Add(DeviceBeloneType.A鏈煡璁惧);
-
+            list.Add(DeviceBeloneType.A鏈煡璁惧);
+
             return list;
         }
 
@@ -2095,7 +2095,7 @@
         /// <returns></returns>
         public bool CheckDeviceIsOnline(CommonDevice i_device)
         {
-            //0:绂荤嚎 1:鍦ㄧ嚎 2:姝e湪鍒锋柊鐘舵��
+            //0:绂荤嚎 1:鍦ㄧ嚎 2:姝e湪鍒锋柊鐘舵�� 
             return i_device.IsOnline == 1 || i_device.IsOnline == 2;
         }
 
@@ -2673,6 +2673,9 @@
             this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1200-60000";//绱ф�ユ寜閿�
             this.dicDeviceModelIdEnum["MGCD01/ZB.10"] = "1306-1200-60000";//鍚搁《鐕冩皵浼犳劅鍣�
 
+            //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� 銆愯璁惧灞炰簬绗笁鏂硅澶囷紝娌℃湁闀滃儚ID銆�
+            this.dicDeviceModelIdEnum["SZ_PM100"] = "1307-1200-60000";//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� 
+
             //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
             this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3璺户鐢靛櫒灏忔ā鍧�
             this.dicDeviceModelIdEnum["MFA01-ZB.10"] = "2310-2300-60011";//鏂规偊鏂伴灏忔ā鍧�
@@ -2862,7 +2865,12 @@
         /// <summary>
         /// 鍚搁《鐕冩皵浼犳劅鍣�
         /// </summary>
-        Sensor_CeilingGas = 1306,
+        Sensor_CeilingGas = 1306,
+        /// <summary>
+        /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+        /// </summary>
+        Sensor_PMTwoPointFive = 1307,
+
         /// <summary>
         /// 杩愬姩浼犳劅鍣�
         /// </summary>
@@ -2896,9 +2904,9 @@
         /// <summary>
         /// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
         /// </summary>
-        Relay_FangyueFreshAirModul = 2310,
-
-        //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+        Relay_FangyueFreshAirModul = 2310,
+
+        //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
         /// <summary>
         /// 璋冨厜鍣�
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
old mode 100755
new mode 100644
index 5784b2d..0bdcf5f
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -131,7 +131,7 @@
             //搴旇鏄痓ody鍚�
             this.bodyFrameLayout = new FrameLayout();
             bodyFrameLayout.Y = topFrameLayout.Bottom;
-            bodyFrameLayout.Height = Application.GetRealHeight(1549);
+            bodyFrameLayout.Height = this.Height - topFrameLayout.Bottom;
             bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
             this.AddChidren(bodyFrameLayout);
 
@@ -316,7 +316,7 @@
             functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
             functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
 
-            //鎵ц鍒濆鍖�
+            //鎵ц鍒濆鍖� 
             roomSwitchContr.InitControl();
         }
 
@@ -529,7 +529,11 @@
                     {
                         cardContr = new Controls.DeviceFreshAirRowControl();
                     }
-                    //褰╃伅(璋冨厜鍣�)
+                    // PM2.5
+                    else if (device.Type == DeviceType.PMSensor)
+                    {
+                    }
+                    //褰╃伅(璋冨厜鍣�)
                     else if (device.Type == DeviceType.DimmableLight)
                     {
                         cardContr = new Controls.DeviceColorLightRowControl();
@@ -639,8 +643,8 @@
             {
                 listview2 = new VerticalListControl();
                 functionSceneBodyView.AddChidren(listview2);
-            }
-
+            }
+
             foreach (var scene in listScene)
             {
                 //鍦烘櫙鍗$墖鎺т欢
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 54a7aec..2789bd2 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -104,7 +104,7 @@
             btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
             btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
             this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
-
+            
             if (this.hadStatuFunction == false)
             {
                 //娌℃湁鐘舵�佸姛鑳�,鍒欐妸璁惧鍚嶅瓧鎺т欢涓�
@@ -358,7 +358,7 @@
                 }
             }
             else
-            {
+            {   
                 //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗$墖琚垹闄ょ殑鍑芥暟
                 var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
                 if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index 0a63986..ec84597 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -270,26 +270,27 @@
             {
                 if (string.IsNullOrEmpty(editTime.Text))
                 {
-                    ShowTip(Language.StringByID(R.MyInternationalizationString.timeNull),true);
+                    ShowErrorTip(Language.StringByID(R.MyInternationalizationString.timeNull),true);
                     return;
                 }
                 if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12)
                 {  ///闄愬埗杈撳叆鏁板瓧鑼冨洿;
                     string str = Language.StringByID(R.MyInternationalizationString.less) + Language.StringByID(R.MyInternationalizationString.or) + Language.StringByID(R.MyInternationalizationString.more);
-                    ShowTip(str, true);
+                    ShowErrorTip(str, true);
                     return;
 
 
                 }
                 dialog.Close();
                 action(editTime.Text);
-           };
+
+            };
 
         }
         /// <summary>
-        /// 鎻愮ず妗�
+        ///  閿欒鎻愮ず妗�
         /// </summary>
-        public static void ShowTip(string tipText,bool _if )
+        public static void ShowErrorTip(string tipText,bool _if )
         {
             ///涓绘帶浠�
             Dialog dialog = new Dialog();
@@ -411,5 +412,71 @@
                 dialog.Close();
             };
         }
+
+        /// <summary>
+        ///  闂敊鎻愮ず妗�
+        /// </summary>
+        public static void ShowFlashTip(string tipText,int timeValue=1)
+        {
+            ///涓绘帶浠�
+            Dialog dialog = new Dialog();
+            dialog.Show();
+            ///鑳屾櫙鐨勭埗鎺т欢
+            FrameLayout fLayout = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
+            dialog.AddChidren(fLayout);
+            fLayout.MouseUpEventHandler += (sender,e) => {
+                dialog.Close();
+
+            };
+            ///寮规鐖舵帶浠�
+            FrameLayout tipFLayout = new FrameLayout
+            {
+                X = Application.GetRealWidth(230),
+                Y = Application.GetRealHeight(717),
+                Width = Application.GetRealWidth(622),
+                Height = Application.GetRealHeight(317),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(17)
+            };
+            fLayout.AddChidren(tipFLayout);
+
+            ///鎻愮ず鎺т欢
+            Button tipBtn = new Button
+            {
+                Y = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(150),
+                Height = Application.GetRealHeight(63),
+                Width = Application.GetRealWidth(622 - 300),
+                TextID = R.MyInternationalizationString.tip,
+                TextAlignment = TextAlignment.Center,
+                TextColor = ZigbeeColor.Current.LogicTipColor,
+                TextSize = 16,
+
+            };
+            tipFLayout.AddChidren(tipBtn);
+            ///鏂囨湰鎺т欢
+            Button Text1Btn = new Button
+            {
+                Y = Application.GetRealHeight(156),
+                X = Application.GetRealWidth(50),
+                Height = Application.GetRealHeight(58),
+                Width = Application.GetRealWidth(622 - 100),
+                Text = tipText,
+                TextAlignment = TextAlignment.Center,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                TextSize = 14,
+            };
+            tipFLayout.AddChidren(Text1Btn);
+           
+            new System.Threading.Thread(() =>
+            {
+                System.Threading.Thread.Sleep(timeValue*1000);
+                Application.RunOnMainThread(() =>
+                {
+                    dialog.Close();
+                });
+            })
+            { IsBackground = true }.Start();
+        }
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 5df1e25..cb77e0c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -702,7 +702,11 @@
                     Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
                     pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
                 }
-                Send.Zj(LogicView.IfString.Tag, Common.Logic.CurrentLogic);
+                if (!Config.Instance.Home.IsVirtually)
+                {
+                    Send.Zj(LogicView.IfString.Tag, Common.Logic.CurrentLogic);
+
+                }
             };
 
             if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0)
@@ -759,43 +763,94 @@
             bool succeed = false;
             //鍒ゆ柇鏄柊娣诲姞閫昏緫(榛樿0)杩樻槸淇敼閫昏緫
             CommonPage.Loading.Start();
-            if (CurrentLogic.LogicId == 0)
-            {
-                //鍙戦�佹坊鍔犻�昏緫鍛戒护
-                var logicifon = await Send.AddModifyLogic(CurrentLogic);
-                if (logicifon != null && logicifon.LogicId != 0)
-                {
-                    succeed = true;
-                    CurrentLogic.LogicId = logicifon.LogicId;
-                    if (LogicView.IfString._Logic == if_logic || LogicView.IfString._SoneLogic == if_logic)
-                    {
-                        //鑷姩鍖栭�昏緫鍒楄〃
-                        Common.Logic.LogicList.Add(CurrentLogic);
-                    }
-                    if (LogicView.IfString._LockLogic == if_logic)
-                    {
-                        //闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
-                        Common.Logic.LockLogicList.Add(CurrentLogic);
-                    }
-                    if (LogicView.IfString._SoneLogic == if_logic)
-                    {
-                        //Sone闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
-                        Common.Logic.SoneLogicList.Add(CurrentLogic);
 
-                    }
-                    if (tag)
-                    {
-                        Send.Zj(tag, CurrentLogic);
-                    }
+            if (Config.Instance.Home.IsVirtually)
+            {
+                if (Common.Logic.LogicList.Count == 0)
+                {
+                    CurrentLogic.LogicId = 1;
+                    Common.Logic.LogicList.Add(CurrentLogic);
                 }
+
+                if (CurrentLogic.LogicId == 0)
+                {
+                    bool d = false;
+                    for (int i = 1; i < 50; i++)
+                    {
+                       
+                        for (int j = 0; j < Common.Logic.LogicList.Count; j++)
+                        {
+                            if (i != Common.Logic.LogicList[j].LogicId)
+                            {
+                                CurrentLogic.LogicId = i;
+                                Common.Logic.LogicList.Add(CurrentLogic);
+                                d = true;
+                                break;
+                            }
+                        }
+                        if (d)
+                        {
+                            break;
+                        }
+                    }
+
+                }
+                else
+                {
+                    for (int j = 0; j < Common.Logic.LogicList.Count; j++)
+                    {
+                        if (CurrentLogic.LogicId == Common.Logic.LogicList[j].LogicId)
+                        {
+                            Common.Logic.LogicList.RemoveAt(j);
+                            Common.Logic.LogicList.Insert(j,CurrentLogic);
+                            break;
+                        }
+                    }
+
+                }
+
+                //鑷姩鍖栭�昏緫鍒楄〃
             }
             else
             {
-                //鍙戦�佷慨鏀归�昏緫鍛戒护锛�
-                //淇敼鍛戒护涓嶉渶瑕佺瓑寰呭洖澶嶏紱
-                Send.AddModifyLogic(CurrentLogic);
-                //缂栬緫榛樿鎴愬姛锛堜笉鑰冭檻缃戠粶鎯呭喌锛夛紱
-                succeed = true;
+                if (CurrentLogic.LogicId == 0)
+                {
+                    //鍙戦�佹坊鍔犻�昏緫鍛戒护
+                    var logicifon = await Send.AddModifyLogic(CurrentLogic);
+                    if (logicifon != null && logicifon.LogicId != 0)
+                    {
+                        succeed = true;
+                        CurrentLogic.LogicId = logicifon.LogicId;
+                        if (LogicView.IfString._Logic == if_logic || LogicView.IfString._SoneLogic == if_logic)
+                        {
+                            //鑷姩鍖栭�昏緫鍒楄〃
+                            Common.Logic.LogicList.Add(CurrentLogic);
+                        }
+                        if (LogicView.IfString._LockLogic == if_logic)
+                        {
+                            //闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+                            Common.Logic.LockLogicList.Add(CurrentLogic);
+                        }
+                        if (LogicView.IfString._SoneLogic == if_logic)
+                        {
+                            //Sone闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+                            Common.Logic.SoneLogicList.Add(CurrentLogic);
+
+                        }
+                        if (tag)
+                        {
+                            Send.Zj(tag, CurrentLogic);
+                        }
+                    }
+                }
+                else
+                {
+                    //鍙戦�佷慨鏀归�昏緫鍛戒护锛�
+                    //淇敼鍛戒护涓嶉渶瑕佺瓑寰呭洖澶嶏紱
+                    Send.AddModifyLogic(CurrentLogic);
+                    //缂栬緫榛樿鎴愬姛锛堜笉鑰冭檻缃戠粶鎯呭喌锛夛紱
+                    succeed = true;
+                }
             }
             CommonPage.Loading.Hide();
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index e358680..374b643 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -20,10 +20,8 @@
             {
                 case 0:
                     {
-
-
-                        ////new涓�涓柊閫昏緫瀵硅薄锛�
-                        ////鏂板姝e父鑷姩鍖栧叆鍙�
+                        //new涓�涓柊閫昏緫瀵硅薄锛�
+                        //鏂板姝e父鑷姩鍖栧叆鍙�
                         Common.Logic.CurrentLogic = new Common.Logic();
                         Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
                         Common.Logic.CurrentLogic.LogicType = 0;//鏍囪閫昏緫绫诲瀷
@@ -62,12 +60,12 @@
                         doorLockLogicList.Show();
                     }
                     break;
-
+              
             }
 
         }
 
-
+       
         #region 鈼� 鑷姩鍖朹_________________________
         /// <summary>
         /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
@@ -263,34 +261,37 @@
             CommonPage.Loading.Start();
             try
             {
-                if (Common.Logic.LogicList.Count == 0)
+                if (!Config.Instance.Home.IsVirtually)//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
                 {
-                    var Idlist1 = await Send.GetLogicId(0);//
-                    var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
-                    if (Idlist1.Count != 0)
+                    if (Common.Logic.LogicList.Count == 0)
                     {
-                        var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
-                        for (int j = 0; j < listlogic1.Count; j++)
+                        var Idlist1 = await Send.GetLogicId(0);//
+                        var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+                        if (Idlist1.Count != 0)
                         {
-                            var logic = listlogic1[j];
-                            if (logic.LogicType != 0)
+                            var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+                            for (int j = 0; j < listlogic1.Count; j++)
                             {
-                                continue;
+                                var logic = listlogic1[j];
+                                if (logic.LogicType != 0)
+                                {
+                                    continue;
+                                }
+                                Common.Logic.LogicList.Add(logic);
                             }
-                            Common.Logic.LogicList.Add(logic);
                         }
-                    }
-                    if (Idlist2.Count != 0)
-                    {
-                        var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
-                        for (int j = 0; j < listlogic2.Count; j++)
+                        if (Idlist2.Count != 0)
                         {
-                            var logic = listlogic2[j];
-                            if (logic.LogicType != 2)
+                            var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
+                            for (int j = 0; j < listlogic2.Count; j++)
                             {
-                                continue;
+                                var logic = listlogic2[j];
+                                if (logic.LogicType != 2)
+                                {
+                                    continue;
+                                }
+                                Common.Logic.LogicList.Add(logic);
                             }
-                            Common.Logic.LogicList.Add(logic);
                         }
                     }
                 }
@@ -310,6 +311,7 @@
         /// <param name="refresview">Refresview.</param>
         private static async void Automationview(VerticalRefreshLayout refresview, bool no)
         {
+            
             refresview.RemoveAll();
             if (Common.Logic.LogicList.Count == 0 && no == false)
             {
@@ -398,7 +400,7 @@
                     //瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
                     fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
                     logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+                   
                 }
                 i++;
                 var logicnameBtn = new Button
@@ -441,7 +443,10 @@
                         logic.IsEnable = 0;
                         StatusColor(logic, logicRowlayout, 0);
                     }
-                    Send.LogicControlSwitch(logic);
+                    if (!Config.Instance.Home.IsVirtually)
+                    {
+                        Send.LogicControlSwitch(logic);
+                    }
                     //Logic.Send.AddModifyLogic(logic);
                 };
                 if (logic.IsEnable == 1)
@@ -503,7 +508,10 @@
                     {
                         Common.Logic.LogicList.Remove(logic);
                         Automationview(refresview, no);
-                        Send.DelLogic(logic.LogicId);
+                        if (!Config.Instance.Home.IsVirtually)
+                        {
+                            Send.DelLogic(logic.LogicId);
+                        }
                     };
 
                 };
@@ -780,6 +788,7 @@
             }
             return _if;
         }
-
+       
     }
 }
+
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
old mode 100755
new mode 100644
index c083b5c..9f042fa
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -16,11 +16,7 @@
         {
             Tag = "SoneLogic";
         }
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="action">缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�</param>
-        /// <param name="bool_If"></param>
+        /// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
         public Action<bool> action;
         public async void Show()
         {
@@ -33,13 +29,11 @@
             view.clickBtn.MouseDownEventHandler += (sender, e) =>
             {
                 UserView.HomePage.Instance.ScrollEnabled = true;
+                RemoveFromParent();
                 if (action != null)
                 {
                     action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
                 }
-
-                RemoveFromParent();
-
             };
 
             var middle = new FrameLayout
@@ -67,8 +61,6 @@
                 Y = Application.GetRealHeight(92),
                 Width = Application.GetMinRealAverage(294),
                 Height = Application.GetMinRealAverage(294),
-                UnSelectedImagePath = "ZigeeLogic/noMode.png",
-                SelectedImagePath = "ZigeeLogic/openMode.png",
             };
             fLayout.AddChidren(modeIconBtn);
 
@@ -78,7 +70,7 @@
                 var logic = await SkipView.GetLogicIfon();
 
                 fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
-                modeIconBtn.IsSelected = true;//鏀瑰彉鍥炬爣鐘舵��
+                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
                 ///绗簩绾х埗鎺т欢
                 var openModeFl = new FrameLayout
                 {
@@ -116,11 +108,12 @@
                         var soneLogicList = new SoneLogicList();
                         UserView.HomePage.Instance.AddChidren(soneLogicList);
                         UserView.HomePage.Instance.PageIndex += 1;
-                        soneLogicList.Show();
+                        soneLogicList.Show();
+                        soneLogicList.action = action;
                     }
                     else
                     {
-                        ///鎻愮ず澶辫触
+                        LogicView.TipView.ShowFlashTip("鍏抽棴澶辫触");
                     }
 
                 };
@@ -129,8 +122,8 @@
                 var timeTextBtn = new Button
                 {
                     Y = Application.GetRealHeight(127 + 69),
-                    X = Application.GetRealWidth(225),
-                    Width = Application.GetRealWidth(634),
+                    X = Application.GetRealWidth(125),
+                    Width = Application.GetRealWidth(634 + 200),
                     Height = Application.GetRealHeight(60),
                     TextSize = 15,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -152,7 +145,8 @@
                     var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
                     int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
                     int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
-                    timeTextBtn.Text = "鏃舵晥鎬у父寮�璁剧疆" + y + "骞�" + m + "鏈�" + d + dayInt + "鍙�" + timeInt + "鏃�" + "鎵ц";
+                    int days = int.Parse(d) + dayInt;
+                    timeTextBtn.Text = "鏃舵晥鎬у父寮�璁剧疆" + y + "骞�" + m + "鏈�" + days.ToString() + "鍙�" + hour.ToString() + "鏃�" + "鎵ц";
                 }
                 catch { }
 
@@ -160,7 +154,7 @@
             else
             {
                 fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
-                modeIconBtn.IsSelected = false;//鏀瑰彉鍥炬爣鐘舵��
+                modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
                 ///绗簩绾х埗鎺т欢
                 var modeFl = new FrameLayout
                 {
@@ -195,58 +189,65 @@
                     Height = Application.GetMinRealAverage(104),
                     X = Application.GetRealWidth(861),
                     Y = Application.GetRealHeight(17),
-                    UnSelectedImagePath = "ZigeeLogic/next.png",
+                    UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
                 };
                 modeFl.AddChidren(nextIconBtn);
 
 
 
                 nextIconBtn.MouseUpEventHandler += (sender, e) =>
-                 {
-                     LogicView.TipView.ShowConfrimTip(() =>
-                     {///鍐嶆纭
-                       LogicView.TipView.ShowInputTip(true, async (str) =>
-                         {///纭鍙戦�佸懡浠�
-                           try
-                             {
-                               ///xm
-                               var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
-                                 if (!result)
-                                 {
-                                     Application.RunOnMainThread(() =>
-                                     {
-                                       ///鎻愮ず澶辫触
-                                   });
-                                     return;
-                                 }
-                                 else
-                                 {
-                                   ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
-                                   SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
-                                   var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
-                                   if (!addResult)
-                                     {
-                                       ///鎻愮ず澶辫触
-                                       return;
-                                     }
-                                     Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
-                                     this.RemoveFromParent();
-                                     var soneLogicList = new SoneLogicList();
-                                     UserView.HomePage.Instance.AddChidren(soneLogicList);
-                                     UserView.HomePage.Instance.PageIndex += 1;
-                                     soneLogicList.Show();
+                {
 
-                                 }
-                             }
-                             catch
-                             {
+                    LogicView.TipView.ShowConfrimTip(() =>
 
-                             }
-                         });
+                    {///鍐嶆纭
+                        LogicView.TipView.ShowInputTip(true, async (str) =>
+                        {///纭鍙戦�佸懡浠�
+                            try
+                            {
+                                ///xm
+                                var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+                                if (!result)
+                                {
+                                    LogicView.TipView.ShowFlashTip("寮�鍚け璐�");
+                                    return;
+                                }
+                                else
+                                {
+                                    ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+                                    SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+                                    var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+                                    if (!addResult)
+                                    {
+                                        ///鎻愮ず澶辫触
+                                        LogicView.TipView.ShowFlashTip("娣诲姞澶辫触");
+                                        return;
+                                    }
+                                    Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+                                    this.RemoveFromParent();
+                                    var soneLogicList = new SoneLogicList();
+                                    UserView.HomePage.Instance.AddChidren(soneLogicList);
+                                    UserView.HomePage.Instance.PageIndex += 1;
+                                    soneLogicList.Show();
+                                    soneLogicList.action = action;
+                                    //soneLogicList.action += (c) => {
+                                    //    if (action != null)
+                                    //    {
+                                    //        action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
+                                    //    }
+                                    //};
 
-                     });
+                                }
+                            }
+                            catch
+                            {
 
-                 };
+                            }
+                        });
+
+                    });
+
+                };
             }
 
             #endregion
@@ -397,10 +398,11 @@
         /// 鍔犺浇鑷姩鍖栧垪琛�
         /// </summary>
         /// <param name="verticalRefresh"></param>
+        RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+        int a = 1;
         private void RefreshView(VerticalRefreshLayout verticalRefresh)
         {
             verticalRefresh.RemoveAll();
-
             foreach (var logic in Common.Logic.SoneLogicList)
             {
                 #region  鑷姩鍖栧竷灞�View
@@ -417,17 +419,19 @@
                     LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                     BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                     SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+                    Tag = a.ToString(),
                 };
                 fLayout.AddChidren(logicRow);
                 //宸︽粦鑿滃崟浜嬩欢
                 logicRow.OpenMenuAction += () =>
                 {
-                    //if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
-                    //{   //淇濈暀宸︽粦鍙湁涓�涓�;
-                    //    selectedRow.HideMenu();//
-                    //}
-                    //selectedRow = logicRowlayout;
+                    if (selectedRow.Tag.ToString() != logicRow.Tag.ToString())
+                    {   //淇濈暀宸︽粦鍙湁涓�涓�;
+                        selectedRow.HideMenu();//
+                    }
+                    selectedRow = logicRow;
                 };
+                a++;
                 ///鏄剧ず閫昏緫鍚嶇О鐨勬帶浠�
                 var nameBtn = new Button
                 {
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
index a1a20dd..91574a2 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
@@ -32,10 +32,9 @@
         /// <summary>
         /// 璁惧鍚嶇О鎺т欢
         /// </summary>
-        private NormalViewControl btnDeviceName = null;
-
-        #endregion
+        private NormalViewControl btnDeviceName = null;
 
+        #endregion
 
         #region 鈻� 鍒濆鍖朹____________________________
         public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
@@ -129,6 +128,13 @@
             this.listControl.Add(btnHighSpeed);
             btnHighSpeed.ButtonClickEvent += (sender, e) =>
             {
+                if (FreshAirDev.currentFanMode == 15)
+                {
+                    var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
+                    msgContr.Show();
+                    return;
+                }
+
                 if (!btnHighSpeed.IsSelected)
                 {
                     this.SetFanComand(3);
@@ -166,6 +172,12 @@
             this.listControl.Add(btnLowSpeed);
             btnLowSpeed.ButtonClickEvent += (sender, e) =>
             {
+                if (FreshAirDev.currentFanMode == 15)
+                {
+                    var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
+                    msgContr.Show();
+                    return;
+                }
                 if (!btnLowSpeed.IsSelected)
                 {
                     this.SetFanComand(1);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
old mode 100644
new mode 100755
index 25e2cdc..4a8087c
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -30,7 +30,7 @@
         /// </summary>
         public bool SetCanSelect
         {
-            set
+            set 
             {
                 m_SetCanSelect = value;
             }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
old mode 100644
new mode 100755
index 858ce2a..7975fd9
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
@@ -89,7 +89,7 @@
         public async Task<Panel.KeyColorData> GetPanelColorInfo(Panel panel)
         {
             panel.DeviceEpoint = 1;
-            Panel.KeyNum keyNum = (Panel.KeyNum)panel.DeviceEpoint;
+            Panel.KeyNum keyNum = (Panel.KeyNum)panel.DeviceEpoint;
             var result = await panel.GetPanelColorInfoAsync(keyNum);
             //鍏遍�氶敊璇娴�
             string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
@@ -118,7 +118,7 @@
         public async Task<bool> SetPanelEpointColorInfo(Panel panel, Panel.KeyColorData colorData)
         {
             var keyNum = new Panel.KeyNumStatus();
-            Type type = keyNum.GetType();
+            Type type = keyNum.GetType();
             type.InvokeMember("Key" + panel.DeviceEpoint, System.Reflection.BindingFlags.SetField, null, keyNum, new object[] { true });
 
             var result = await panel.SetPanelColorInfoAsync(colorData, keyNum);
@@ -173,7 +173,7 @@
         }
 
         #endregion
-
+
         #region 鈻� 浜害璋冭妭___________________________
         /// <summary>
         /// 鑾峰彇璁惧浜害閰嶇疆锛坲i鍙寒搴﹁皟鑺�,浣跨敤杩斿洖鍊肩殑panelDirectionsLevel锛�
@@ -302,7 +302,7 @@
         /// 閰嶇疆鎺ヨ繎浼犳劅
         /// </summary>
         /// <param name="device">璁惧瀵硅薄</param>
-        /// <para>sensorEnable:浼犳劅鍣ㄤ娇鑳�</para>
+        /// <para>sensorEnable:浼犳劅鍣ㄤ娇鑳�</para> 
         /// <returns></returns>
         public async Task<bool> SetProximitySensorStatus(CommonDevice device, bool sensorEnable)
         {
@@ -576,15 +576,15 @@
         /// </summary>
         /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
         /// <param name="parameter">
-        /// <para>鏂规硶1锛氬綋int[]浼犵┖锛岃繑鍥炲�兼槸鈥滈潰鏉垮叿鏈夌殑鍔熻兘澶х被,鍗宠繑鍥炩�滅涓�绾у埆銆�1024:鐏被锛�256:鎸夐敭绫伙紝768:PIR绫�</para>
+        /// <para>鏂规硶1锛氬綋int[]浼犵┖锛岃繑鍥炲�兼槸鈥滈潰鏉垮叿鏈夌殑鍔熻兘澶х被,鍗宠繑鍥炩�滅涓�绾у埆銆�1024:鐏被锛�256:鎸夐敭绫伙紝768:PIR绫�</para> 
         /// <para>鏂规硶2锛氥�佸綋int[]鍊间负绗竴绾у埆PrivateFuncTypeFir涓�夋嫨涓�涓��</para>
         /// <para>杩斿洖鍊兼槸鈥滈潰鎸夐敭鍙戦�佸姛鑳界被鈥濓紝鍗宠繑鍥炩�滅浜岀骇鍒��</para>
         /// <para>100:Switch,寮�鍏筹紙鎸夐敭绫伙級;200:Dimmer,璋冨厜锛堟寜閿被锛�;300:Curtain,绐楀笜锛堟寜閿被锛�</para>
         /// <para>0:EnergySavingMode,鑺傝兘妯″紡锛堢伅绫伙級;1:SleepMode,鐫$湢妯″紡锛堢伅绫伙級;100:WhiteBalance,鐧藉钩琛★紙鐏被锛�;101:RGBColor,RGB鎸囩ず鐏鑹诧紙鐏被锛�;102:RGBLevel,RGB鎸囩ず鐏寒搴︼紙鐏被锛�</para>
         /// <para>鏂规硶3锛氬綋int[]鍊间负绗竴绾у埆PrivateFuncTypeFir涓�夋嫨涓�涓紝鎺ョ潃鍐嶉�夌浜岀骇鍒玃rivateFunTypeSec涓�夋嫨涓�涓� </para>
         /// <para>杩斿洖鍊兼槸鈥滈潰鎸夐敭鍏蜂綋鍔熻兘閰嶇疆鈥濓紝鍗宠繑鍥炩�滅浜岀骇鍒��</para>
-        /// <para>100:SwitchOpen,寮�鍏冲紑锛堟寜閿被锛�;101:SwitchClose,寮�鍏冲叧锛堟寜閿被锛�;102:SwitchChange,寮�鍏冲垏鎹紙鎸夐敭绫伙級</para>
-        /// <para>200:DimmerStepUp,澧炲ぇ璋冨厜锛堟寜閿被锛�;201:DimmerStepDown,闄嶄綆璋冨厜锛堟寜閿被锛�;202:DimmerStepChange,璋冨厜鍒囨崲锛堟寜閿被锛�</para>
+        /// <para>100:SwitchOpen,寮�鍏冲紑锛堟寜閿被锛�;101:SwitchClose,寮�鍏冲叧锛堟寜閿被锛�;102:SwitchChange,寮�鍏冲垏鎹紙鎸夐敭绫伙級</para> 
+        /// <para>200:DimmerStepUp,澧炲ぇ璋冨厜锛堟寜閿被锛�;201:DimmerStepDown,闄嶄綆璋冨厜锛堟寜閿被锛�;202:DimmerStepChange,璋冨厜鍒囨崲锛堟寜閿被锛�</para> 
         /// <para>300:CurtainOpen,绐楀笜寮�锛堟寜閿被锛�;301:CurtainClose,绐楀笜鍏筹紙鎸夐敭绫伙級;302:CurtainStop,绐楀笜鍋�;303:CurtainUpStop,绐楀笜涓婂崌鍋�;304:CurtainDownstop,绐楀笜涓嬮檷鍋�</para>
         /// </param>
         /// <returns></returns>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index 6a0fd93..198308a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -561,6 +561,7 @@
                 //1涓紶鎰熷櫒
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 13;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1200, 1200, "MSPIR01-ZB.10", i_RoomId);
 
@@ -581,6 +582,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 43;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1300, 1300, "MSG01/M-ZB.10", i_RoomId);
 
@@ -594,6 +596,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 43;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1300, 1300, "MGCD01/ZB.10", i_RoomId);
 
@@ -607,6 +610,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 21;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1301, 1301, "MSDC01/M-ZB.10", i_RoomId);
 
@@ -620,6 +624,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 40;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1301, 1301, "MSS01/M-ZB.10", i_RoomId);
 
@@ -633,6 +638,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 13;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1303, 1303, "MSPIR01/M-ZB.10", i_RoomId);
 
@@ -646,6 +652,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 42;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1304, 1304, "MSW01/M-ZB.10", i_RoomId);
 
@@ -659,6 +666,7 @@
             {
                 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };
                 device.IasDeviceType = 44;
+                device.DeviceID = 1026;
                 //璁剧疆璁惧鐨勫熀鏈俊鎭�
                 this.SetBaseDataToDevice(device, 1305, 1305, "MBU01/M-ZB.10", i_RoomId);
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
old mode 100644
new mode 100755
index 4c2b01e..c4d3d74
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -546,7 +546,7 @@
                     {
                         HdlThreadLogic.Current.RunThread(async () =>
                         {
-                            //娓╁眳鍩庣殑瑕佺綉鍏充腑鏄惁鏈夐�昏緫瀛樺湪
+                            //娓╁眳鍩庣殑瑕佺綉鍏充腑鏄惁鏈夐�昏緫瀛樺湪 
                             //鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�
                             var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);
                             HdlThreadLogic.Current.RunMain(() =>
@@ -571,7 +571,7 @@
         /// 璁惧鍦ㄧ嚎鐘舵�佹洿鏂板弽棣�
         /// </summary>
         /// <param name="receiveData"></param>
-        private void DeviceOnlineChangePush(JObject receiveData)
+        private void DeviceOnlineChangePush (JObject receiveData)
         {
             if (this.dicDeviceEvent.Count == 0)
             {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index e5d5c93..5c90b24 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -940,6 +940,7 @@
         /// </summary>
         private static void InitUserCenterMenmoryByVirtualHome()
         {
+            UserCenterResourse.AccountOption.OldHomeStringId = Common.Config.Instance.Home.Id;
             //娓呯┖鎵�鏈夋垚鍛樼紦瀛�
             ClearAllMemberMemory();
             //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
@@ -975,6 +976,11 @@
             UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
             //褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖�
             UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
+
+            //鍒囨崲浣忓畢娓呴櫎涔嬪墠閫昏緫缂撳瓨鏁版嵁;
+            Common.Logic.LogicList.Clear();
+            Common.Logic.LockLogicList.Clear();
+            Common.Logic.SoneLogicList.Clear();
         }
 
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
old mode 100644
new mode 100755
index 5180833..14d3e84
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -88,8 +88,11 @@
                 {
                     localDeviceList.Clear();
                     scList.Clear();
-                    //鑾峰彇鏈湴璁惧鍒楄〃 
-                    localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
+                    //鑾峰彇鏈湴璁惧鍒楄〃
+                    foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
+                    {
+                        localDeviceList.Add(dev);
+                    }
                     //鑾峰彇鏈湴鍦烘櫙鍒楄〃
                     scList = HdlSceneLogic.Current.GetAllRoomSceneList();
                     //鑾峰彇缃戝叧鍦烘櫙琛�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index 2d8c35d..c399fee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -213,7 +213,7 @@
                 //娣诲姞璁惧鐨勭紦瀛�
                 device.IsOnline = 1;
                 Common.LocalDevice.Current.AddDeviceToMemory(ref device);
-
+ 
                 if (this.dicNewDevice.ContainsKey(device.DeviceAddr) == false)
                 {
                     this.dicNewDevice[device.DeviceAddr] = new List<CommonDevice>();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
old mode 100644
new mode 100755
index 7c87699..c7a8778
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -182,11 +182,6 @@
             unSelectPic = "Device/SensorPMTwoPointFive.png";
             this.AddMenuRow(objectText, unSelectPic, "SensorPMTwoPointFiveForm");
 
-            //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
-            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName26);
-            unSelectPic = "Device/SensorPMTwoPointFive.png";
-            this.AddMenuRow(objectText, unSelectPic, "SensorPMTwoPointFiveForm");
-
             //涓户鍣�
             objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName24);
             unSelectPic = "Device/RepeaterZigbee.png";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirDirectionForm.cs
old mode 100755
new mode 100644
index 3c20826..211a6db
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirDirectionForm.cs
@@ -51,8 +51,9 @@
             btnSecond.TextID = R.MyInternationalizationString.uPressAndHoldThisKey;
             framePic.AddChidren(btnSecond);
 
-            //闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑�
-            //杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+            //鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑�
+            //杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄
+            //鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
             string[] msgArry = Language.StringByID(R.MyInternationalizationString.AddFreshAirPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
 
             var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
@@ -61,6 +62,7 @@
             msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
             msg1.TextAlignment = TextAlignment.Center;
             bodyFrameLayout.AddChidren(msg1);
+
             var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
             msg2.Y = msg1.Bottom;
             if (msgArry.Length > 1)
@@ -70,6 +72,17 @@
             msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
             msg2.TextAlignment = TextAlignment.Center;
             bodyFrameLayout.AddChidren(msg2);
+
+            var msg3 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+            msg3.Y = msg2.Bottom;
+            if (msgArry.Length > 1)
+            {
+                msg3.Text = msgArry[2];
+            }
+            msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
+            msg3.TextAlignment = TextAlignment.Center;
+            bodyFrameLayout.AddChidren(msg3);
+
         }
         #endregion
     }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirModulDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueFreshAirModulDirectionForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPMTwoPointFiveForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPMTwoPointFiveForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index 3d6b287..7cf4f1f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -660,6 +660,10 @@
                     {
                         continue;
                     }
+                    if (data.CloudAccountId == null)
+                    {
+                        data.CloudAccountId = string.Empty;
+                    }
                     listLog.Add(data);
                 }
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
old mode 100644
new mode 100755
index 6e9b3c9..d47001c
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -98,7 +98,7 @@
 
         #endregion
 
-        #region 鈻� 灞忓箷浜害绾у埆_______________________
+        #region 鈻� 灞忓箷浜害绾у埆_______________________ 
         /// <summary>
         /// 娣诲姞灞忓箷浜害绾у埆鎺т欢
         /// </summary>
@@ -306,7 +306,7 @@
             int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
             uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
 
-            //棰滆壊澶栨
+            //棰滆壊澶栨 
             var btnColorLine = new FrameLayoutStatuControl();
             btnColorLine.Width = Application.GetRealHeight(79);
             btnColorLine.Height = this.GetPictrueRealSize(79);
@@ -350,7 +350,7 @@
 
         #endregion
 
-        #region 鈻� 鑺傝兘妯″紡琛宊________________________
+        #region 鈻� 鑺傝兘妯″紡琛宊________________________ 
         /// <summary>
         ///  娣诲姞鑺傝兘妯″紡琛�
         /// </summary>
@@ -575,7 +575,7 @@
         }
         #endregion
 
-        #region 鈻� 琛ュ厖瀹瑰櫒___________________________
+        #region 鈻� 琛ュ厖瀹瑰櫒___________________________ 
         /// <summary>
         /// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 17e06f4..49ce8de 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -37,6 +37,22 @@
         /// PM鐩爣鍚嶅瓧
         /// </summary>
         private string bindPmName = string.Empty;
+        /// <summary>
+        /// 琚粦鐩爣鏄柊椋�
+        /// </summary>
+        private CommonDevice bindFreshAirDev;
+        /// <summary>
+        /// 琚粦鐩爣鏄俯搴�
+        /// </summary>
+        private CommonDevice bindTemperatureDev;
+        /// <summary>
+        /// 琚粦鐩爣鏄箍搴�
+        /// </summary>
+        private CommonDevice bindHumidityDev;
+        /// <summary>
+        /// 琚粦鐩爣鏄疨M2.5
+        /// </summary>
+        private CommonDevice bindPMDev;
 
         #endregion
 
@@ -122,7 +138,7 @@
         }
         #endregion
 
-        #region 鈻� 鍒濆鍖栨暟鎹甠________________________
+        #region 鈻� 鍒濆鍖栨暟鎹甠________________________ 
 
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
@@ -164,7 +180,7 @@
         }
         #endregion
 
-        #region 鈻� 鏂伴鐩爣_________________________
+        #region 鈻� 鏂伴鐩爣_________________________ 
         /// <summary>
         ///  鏂伴鐩爣琛�
         /// </summary>
@@ -188,7 +204,7 @@
 
             rowNewWind.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 1);
+                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindFreshAirDev, 1);
                 Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                 addDevicePage.Show();
@@ -208,8 +224,6 @@
                     });
                 };
 
-                //var form = new PanelFangyueFreshAirTargetForm();
-                //form.AddForm(this.deviceObj, string.Empty, 3);
             };
         }
         #endregion
@@ -242,26 +256,39 @@
                             continue;
                         }
                         bindFreshAirName = device.DeviceEpointName;
+                        bindFreshAirDev = device;
                     }
                     if (device.Type == DeviceType.TemperatureSensor)
                     {
-                        bindTemperatureName = device.DeviceEpointName;
+                        var bD = device as TemperatureSensor;
+                        if (bD.SensorDiv == 1)
+                        {
+                            bindTemperatureName = device.DeviceEpointName;
+                            bindTemperatureDev = device;
+                        }
+                        if (bD.SensorDiv == 2)
+                        {
+                            bindHumidityName = device.DeviceEpointName;
+                            bindHumidityDev = device;
+                        }
                     }
                     if (device.Type == DeviceType.FreshAirHumiditySensor)
                     {
                         bindHumidityName = device.DeviceEpointName;
+                        bindHumidityDev = device;
                     }
-                    //if (device.Type == DeviceType.FreshAir)
-                    //{
-                    //    bindPmName  = device.DeviceEpointName;
-                    //}
+                    if (device.Type == DeviceType.PMSensor)
+                    {
+                        bindPmName = device.DeviceEpointName;
+                        bindPMDev = device;
+                    }
                 }
                 result = true;
             }
             return result;
         }
 
-        #region 鈻� PM2.5鏉ユ簮_________________________
+        #region 鈻� PM2.5鏉ユ簮_________________________ 
         /// <summary>
         ///  PM2.5鏉ユ簮琛�
         /// </summary>
@@ -283,7 +310,7 @@
             var btnPMStatu = rowPM.AddMostRightView(msg, 700);
             rowPM.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 4);
+                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindPMDev, 4);
                 Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                 addDevicePage.Show();
@@ -306,7 +333,7 @@
         }
         #endregion
 
-        #region 鈻� 娓╁害鏉ユ簮_________________________
+        #region 鈻� 娓╁害鏉ユ簮_________________________ 
         /// <summary>
         ///  娓╁害鏉ユ簮琛�
         /// </summary>
@@ -328,7 +355,7 @@
             var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
             rowTemPerature.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 2);
+                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindTemperatureDev, 2);
                 Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                 addDevicePage.Show();
@@ -351,7 +378,7 @@
         }
         #endregion
 
-        #region 鈻� 婀垮害鏉ユ簮_________________________
+        #region 鈻� 婀垮害鏉ユ簮_________________________ 
         /// <summary>
         ///  婀垮害鏉ユ簮琛�
         /// </summary>
@@ -373,7 +400,7 @@
             var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
             rowHumidity.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 3);
+                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindHumidityDev, 3);
                 Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                 addDevicePage.Show();
@@ -396,7 +423,7 @@
         }
         #endregion
 
-        #region 鈻� 浜害璋冭妭_________________________
+        #region 鈻� 浜害璋冭妭_________________________ 
         /// <summary>
         ///  浜害璋冭妭琛�
         /// </summary>
@@ -423,7 +450,7 @@
         }
         #endregion
 
-        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________ 
         /// <summary>
         /// 鍒濆鍖栧彸涓婅鑿滃崟
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
index 427baf6..e52c72f 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
@@ -16,23 +16,25 @@
         /// 鏋勯�犲嚱鏁�
         /// </summary>
         /// <param name="device"></param>
-        /// <param name="deviceBindType">1:鏂伴;2:娓╁害浼犳劅鍣�;3:婀垮害浼犳劅鍣�</param>
-        public PanelFangyueFreshAirTargetsForm(CommonDevice device, int deviceBindType)
+        /// <param name="deviceBindType">1:鏂伴;2:娓╁害浼犳劅鍣�;3:婀垮害浼犳劅鍣�;4:PM2.5浼犳劅鍣�</param>
+        /// <param name="bindDev">缁戝畾鐩爣 </param>
+        public PanelFangyueFreshAirTargetsForm(CommonDevice device, CommonDevice bindDev, int deviceBindType)
         {
             this.curControlDev = device as FreshAir;
+            this.curBindDevice = bindDev;
             this.curDeviceBindType = deviceBindType;
         }
         #endregion
 
-        #region  鍙橀噺鐢虫槑
-        /// <summary>
-        /// 褰撳墠鎺у埗璁惧
-        /// </summary>
-        //CommonDevice currentControlDevice;
+        #region  鍙橀噺鐢虫槑 
         /// <summary>
         /// 褰撳墠鏂伴闈㈡澘銆愭帶鍒惰澶囥��
         /// </summary>
         FreshAir curControlDev;
+        /// <summary>
+        /// 褰撳墠琚粦璁惧
+        /// </summary>
+        CommonDevice curBindDevice;
         /// <summary>
         /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
         /// </summary>
@@ -318,6 +320,19 @@
                     curentOldRoom = btnRoom;
                     curentOldRoomFrameLayout = btnRoomFrameLayout;
                 }
+
+                //琚粦瀹氱殑鐩爣杩樻湭鍒嗛厤鍖哄煙锛岄粯璁ゆ槸绗竴涓�
+                if (string.IsNullOrEmpty(curControlDev.currentSelectRoomId))
+                {
+                    if (index == 0)
+                    {
+                        btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                        btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                        curentOldRoom = btnRoom;
+                        curentOldRoomFrameLayout = btnRoomFrameLayout;
+                    }
+                }
+
                 EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
                 {
                     if (!btnRoom.IsSelected)
@@ -450,6 +465,21 @@
                     line2.Visible = false;
                 }
 
+                switch (curDeviceBindType)
+                {
+                    case 1:
+                        devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
+                        break;
+                    case 2:
+                        devicePic.UnSelectedImagePath = "Device/SensorTemperature.png";
+                        break;
+                    case 3:
+                        devicePic.UnSelectedImagePath = "Device/SensorHumidity.png";
+                        break;
+                    case 4:
+                        devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
+                        break;
+                }
                 #endregion
 
                 string mianKey = device.DeviceAddr + device.DeviceEpoint;
@@ -608,7 +638,7 @@
                     btnFloorText.Text = dicFloorList[floorId];
 
                     //鑾峰彇妤煎眰涓埧闂村垪琛� 
-                    supportRoomList = GetFloorRoomList(curFloorId);
+                    supportRoomList = GetFloorRoomList();
                     if (!btnMethodText.IsSelected)
                     {
                         if (oldbutton != null)
@@ -665,11 +695,13 @@
                     {
                         CommonPage.Loading.Start("");
                     });
+                    //鑾峰彇琚粦鐩爣绛変俊鎭�
+                    BindDevInfo(curBindDevice);
 
                     //鑾峰彇妤煎眰
                     dicFloorList = HdlRoomLogic.Current.GetFloorSortList();
                     //鑾峰彇妤煎眰涓埧闂村垪琛�
-                    supportRoomList = GetFloorRoomList(curControlDev.currentSelectFloorId);
+                    supportRoomList = GetFloorRoomList();
 
                     //鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩爣
                     currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();
@@ -725,11 +757,24 @@
                                         case 2:
                                             if (device.Type == DeviceType.TemperatureSensor)
                                             {
-                                                targetList.Add(device);
-                                                oldTargetList.Add(device);
+                                                var bDev = device as TemperatureSensor;
+                                                if (bDev.SensorDiv == 1)
+                                                {
+                                                    targetList.Add(device);
+                                                    oldTargetList.Add(device);
+                                                }
                                             }
                                             break;
                                         case 3:
+                                            if (device.Type == DeviceType.TemperatureSensor)
+                                            {
+                                                var bDev = device as TemperatureSensor;
+                                                if (bDev.SensorDiv == 2)
+                                                {
+                                                    targetList.Add(device);
+                                                    oldTargetList.Add(device);
+                                                }
+                                            }
                                             if (device.Type == DeviceType.FreshAirHumiditySensor)
                                             {
                                                 targetList.Add(device);
@@ -759,6 +804,7 @@
                         if (targetList.Count == 0)
                         {
                             curControlDev.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
+                            curControlDev.currentSelectRoomId = null;
                             if (BindInfo.GetCurrentSelectFloorIdName() != null)
                             {
                                 Application.RunOnMainThread(() =>
@@ -1141,6 +1187,31 @@
         }
 
         /// <summary>
+        /// 褰撳墠琚粦瀹氳澶囨墍灞炴ゼ灞傚拰鎴块棿
+        /// </summary>
+        /// <param name="bindDev"></param>
+        void BindDevInfo(CommonDevice bindDev)
+        {
+            if (bindDev == null)
+            {
+                return;
+            }
+            //鑾峰彇鏈湴璁惧鍒楄〃 
+            var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
+            var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
+            if (tempDev != null)
+            {
+                //鑾峰彇璁惧鎵�灞炴埧闂�
+                var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
+                if (tempDevRoom != null)
+                {
+                    curControlDev.currentSelectRoomId = tempDevRoom.Id;
+                    curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
+                }
+            }
+        }
+
+        /// <summary>
         /// 妫�娴嬬洰鏍囨槸鍚﹁缁戝畾杩�
         /// </summary>
         /// <returns></returns>
@@ -1211,19 +1282,10 @@
                             }
                             break;
                         case 2:
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-                                if (device != null)
-                                {
-                                    if (device.Type == DeviceType.TemperatureSensor)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
+                            roomIncludeMatchDevice = GetMatchTemperatureSensorDevice(room);
                             break;
                         case 3:
+                            roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
                             foreach (var de in room.ListDevice)
                             {
                                 var device = LocalDevice.Current.GetDevice(de);
@@ -1244,30 +1306,80 @@
                     {
                         continue;
                     }
-                }
 
-                if (!string.IsNullOrEmpty(room.FloorId))
-                {
-                    //鏈夋ゼ灞�
-                    if (room.FloorId == curControlDev.currentSelectFloorId)
+                    if (!string.IsNullOrEmpty(room.FloorId))
                     {
+                        //鏈夋ゼ灞�
+                        if (room.FloorId == curControlDev.currentSelectFloorId)
+                        {
+                            roomTempList.Add(room);
+                        }
+                    }
+                    else
+                    {
+                        //娌℃湁妤煎眰
                         roomTempList.Add(room);
                     }
-                }
-                else
-                {
-                    //娌℃湁妤煎眰
-                    roomTempList.Add(room);
                 }
             }
             return roomTempList;
         }
 
         /// <summary>
+        /// 鍖归厤娓╁害浼犳劅鍣�
+        /// </summary>
+        /// <param name="room"></param>
+        List<CommonDevice> GetMatchTemperatureSensorDevice(Room room)
+        {
+            List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
+            foreach (var de in room.ListDevice)
+            {
+                var device = LocalDevice.Current.GetDevice(de);
+                if (device != null)
+                {
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var dev = device as TemperatureSensor;
+                        if (dev.SensorDiv == 1)
+                        {
+                            roomIncludeMatchTempDevice.Add(device);
+                        }
+                    }
+                }
+            }
+            return roomIncludeMatchTempDevice;
+        }
+
+        /// <summary>
+        /// 鍖归厤婀垮害浼犳劅鍣�
+        /// </summary>
+        /// <param name="room"></param>
+        List<CommonDevice> GetMatchHumiditySensorDevice(Room room)
+        {
+            List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
+            foreach (var de in room.ListDevice)
+            {
+                var device = LocalDevice.Current.GetDevice(de);
+                if (device != null)
+                {
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var dev = device as TemperatureSensor;
+                        if (dev.SensorDiv == 2)
+                        {
+                            roomIncludeMatchHumpDevice.Add(device);
+                        }
+                    }
+                }
+            }
+            return roomIncludeMatchHumpDevice;
+        }
+
+        /// <summary>
         /// 鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂村垪琛�
         /// </summary>
         /// <returns></returns>
-        private List<Room> GetFloorRoomList(string floorId)
+        private List<Room> GetFloorRoomList()
         {
             supportRoomList.Clear();
             var supportRoomListTemp = new List<Room>();
@@ -1279,10 +1391,6 @@
                 {
                     if (string.IsNullOrEmpty(room.FloorId))
                     {
-                        if (room.FloorId != floorId)
-                        {
-                            continue;
-                        }
                         if (room.IsLove)
                         {
                             continue;
@@ -1350,16 +1458,10 @@
                         {
                             continue;
                         }
-                        foreach (var deviceKeys in r.ListDevice)
+                        var deviceListTemp = GetMatchTemperatureSensorDevice(r);
+                        foreach (var dev in deviceListTemp)
                         {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                if (device.Type == DeviceType.TemperatureSensor)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
+                            currentPanelBindSupportDeviceListTemp.Add(dev);
                         }
                     }
                     break;
@@ -1369,6 +1471,11 @@
                         if (r.ListDevice.Count == 0)
                         {
                             continue;
+                        }
+                        var deviceListTemp = GetMatchHumiditySensorDevice(r);
+                        foreach (var dev in deviceListTemp)
+                        {
+                            currentPanelBindSupportDeviceListTemp.Add(dev);
                         }
                         foreach (var deviceKeys in r.ListDevice)
                         {
@@ -1420,19 +1527,10 @@
                     }
                     break;
                 case 2:
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            if (device.Type == DeviceType.TemperatureSensor)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
+                    curRoomDeviceListTemp = GetMatchTemperatureSensorDevice(curRoom);
                     break;
                 case 3:
+                    curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
                     foreach (var deviceKeys in curRoom.ListDevice)
                     {
                         var device = LocalDevice.Current.GetDevice(deviceKeys);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 9d2ce5c..6a50add 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -101,10 +101,10 @@
 
         #region 甯稿紑妯″紡 API
         /// <summary>
-        /// 鑾峰彇褰撳墠闂ㄩ攣鐨勫父寮�妯″紡
+        /// 鑾峰彇褰撳墠闂ㄩ攣鐨勫父寮�妯″紡 
         /// </summary>
-        /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
-        /// <returns>null:娌℃湁鍥炲  锛� true:闂ㄩ攣甯稿紑锛沠alse锛氶棬閿佸父鍏�</returns>
+        /// <param name="doorLock:褰撳墠闂ㄩ攣"></param> 
+        /// <returns>null:娌℃湁鍥炲  锛� true:闂ㄩ攣甯稿紑锛沠alse锛氶棬閿佸父鍏�</returns> 
         public static async System.Threading.Tasks.Task<bool?> GetNormallyOpenMode(ZigBee.Device.DoorLock doorLock)
         {
             bool? IsDoorLockNormallyMode = null;
@@ -131,8 +131,8 @@
         /// <summary>
         /// 闂ㄩ攣鏄惁鏀寔甯稿紑[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸�, 鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
         /// </summary>
-        /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
-        /// <returns>true:鏀寔甯稿紑锛沠alse锛� 涓嶆敮鎸佸父寮�</returns>
+        /// <param name="doorLock:褰撳墠闂ㄩ攣"></param> 
+        /// <returns>true:鏀寔甯稿紑锛沠alse锛� 涓嶆敮鎸佸父寮�</returns> 
         public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
         {
             var listDevice = new List<CommonDevice> { };
@@ -165,7 +165,7 @@
         /// <param name="doorLockMessType">瀵艰嚧闂ㄩ攣澶辨晥鐨勬搷浣滅被鍨�</param>
         /// <param name="haveLogic">缃戝叧涓槸鍚﹀瓨鍦ㄩ�昏緫甯稿紑妯″紡</param>
         /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
-        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action action = null)
+        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null)
         {
             //甯稿紑妯″紡鍙兘涓讳汉鎿嶄綔
             if (UserCenterResourse.UserInfo.AuthorityNo != 1)
@@ -194,7 +194,7 @@
             {
                 if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
                 {
-                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
+                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                 }
                 else
@@ -202,7 +202,8 @@
                     //淇濇寔甯稿紑
                     NormallyOpenModeValue(doorLock, true);
                 }
-                action?.Invoke();
+                action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                action = null;
             };
 
             alert.CancelClickEvent += async () =>
@@ -226,7 +227,8 @@
                             NormallyOpenModeValue(doorLock, false);
                             CommonPage.Loading.Hide();
                         });
-                        action?.Invoke();
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
                         return;
                     }
                     if (result.defaultControlResponseData.status != 0)
@@ -238,12 +240,13 @@
                             NormallyOpenModeValue(doorLock, false);
                             CommonPage.Loading.Hide();
                         });
-                        action?.Invoke();
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
                         return;
                     }
                     else
                     {
-                        //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+                        //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
                         var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                         Application.RunOnMainThread(() =>
                         {
@@ -256,10 +259,11 @@
                 }
                 else
                 {
-                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
+                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥� 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                 }
-                action?.Invoke();
+                action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                action = null;
             };
 
             alert.ConfirmClickEvent += async () =>
@@ -285,7 +289,8 @@
                             ShowTipMsg(Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
                             CommonPage.Loading.Hide();
                         });
-                        action?.Invoke();
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
                         return;
                     }
                     if (result.defaultControlResponseData.status != 0)
@@ -296,21 +301,22 @@
                             ShowTipMsg(msg1);
                             CommonPage.Loading.Hide();
                         });
-                        action?.Invoke();
+                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                        action = null;
                         return;
                     }
                     else
                     {
                         //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
                         HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(doorLock, 9002, string.Empty);
-                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔� 
                         NormallyOpenModeValue(doorLock, false);
                         //鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
                         if (haveLogic)
                         {
                             var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                             //娓╁眳鍩庢柟娉曪紵锛燂紵
-                            //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+                            //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫 
                         }
                         Application.RunOnMainThread(() =>
                         {
@@ -320,7 +326,8 @@
                         });
                     }
                 }
-                action?.Invoke();
+                action?.Invoke(doorLock.IsDoorLockNormallyMode);
+                action = null;
             };
         }
 
@@ -332,7 +339,7 @@
         /// <returns></returns>
         public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
         {
-            //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
+            //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥� 
             var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
             if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
             {
@@ -342,7 +349,7 @@
 
             if (result.defaultControlResponseData.status == 0)
             {
-                //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+                //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔� 
                 NormallyOpenModeValue(doorLock, false);
                 action?.Invoke();
                 return true;
@@ -358,8 +365,8 @@
         /// <returns></returns>
         public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
         {
-            //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
-            var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+            //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐� 
+            var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
             if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
             {
                 return false;
@@ -367,7 +374,7 @@
 
             if (result.defaultControlResponseData.status == 0)
             {
-                //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
+                //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�  
                 NormallyOpenModeValue(doorLock, false);
                 return true;
             }
@@ -392,7 +399,7 @@
                 return;
             }
 
-            //璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁堝浜庢墦寮�鐘舵�侊紝纭寮�鍚紵
+            //璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁堝浜庢墦寮�鐘舵�侊紝纭寮�鍚紵 
             string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
             var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
             var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
@@ -409,7 +416,7 @@
         /// </summary>
         public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock, Action action)
         {
-            //澶辨晥璁剧疆
+            //澶辨晥璁剧疆 
             string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
             var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
             var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
@@ -465,8 +472,8 @@
         /// <summary>
         /// 闂ㄩ攣鏄惁鏀寔闊抽噺[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸侊紝鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
         /// </summary>
-        /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
-        /// <returns></returns>
+        /// <param name="doorLock:褰撳墠闂ㄩ攣"></param> 
+        /// <returns></returns> 
         public static bool CanVolume(ZigBee.Device.DoorLock doorLock)
         {
             var listDevice = new List<CommonDevice> { };
@@ -481,7 +488,7 @@
 
         #endregion
 
-        #region 浠庝簯绔幏鍙栫殑鏂规硶
+        #region 浠庝簯绔幏鍙栫殑鏂规硶 
         /// <summary>
         /// 鑾峰彇褰撳墠璐︽埛闂ㄩ攣鎿嶄綔鏉冮檺锛堟槸鍚﹁鍐荤粨锛�
         /// </summary>
@@ -633,7 +640,7 @@
                     }
 
 
-                    //2銆佽鍙栦簯绔棬閿佷俊鎭�
+                    //2銆佽鍙栦簯绔棬閿佷俊鎭�  
                     var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
                     var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
                     if (getDoorLockInfoList != null)
@@ -1119,7 +1126,7 @@
         /// <returns></returns>
         public static DateTime GetDoorLockZoneTime()
         {
-            //閫氳繃缁忓害鑾峰彇鏃跺尯
+            //閫氳繃缁忓害鑾峰彇鏃跺尯 
             var gwZone = int.Parse(CaculateTimeZone(Common.Config.Instance.Home.Longitude));
             //灏嗘湰鍦版椂闂磋浆鎹㈡垚涓栫晫鏃�
             var utc = DateTime.Now.AddHours(-gwZone);
@@ -1133,7 +1140,7 @@
         }
 
         /// <summary>
-        ///  鑾峰彇鏃跺尯
+        ///  鑾峰彇鏃跺尯 
         /// </summary>
         /// <param name="currentLon">currentLon:"+"涓轰笢鍖猴紝鈥�-鈥濅负瑗垮尯</param>
         /// <returns></returns>
@@ -1194,7 +1201,7 @@
 
         #endregion
 
-        #region 涓�鑸柟娉�
+        #region 涓�鑸柟娉� 
         /// <summary>
         /// 鏄剧ず閿欒淇℃伅绐楀彛
         /// </summary>
@@ -1221,6 +1228,6 @@
             });
         }
 
-        #endregion
+        #endregion 
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
old mode 100755
new mode 100644
index 37945a5..2364376
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -73,7 +73,7 @@
             EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
             {
                 RemoveFromParent();
-
+                UserDoorLockPage.canShowDialog = true;
                 //鏆傛椂涓嶈�冭檻涓嬬骇鐣岄潰绛夋帹閫佸鑷村父寮�妯″紡澶辨晥鐨勯棶棰�
                 //var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
                 //HomePage.Instance.AddChidren(userDoorLockPage);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 5831374..9a3861b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -28,7 +28,7 @@
         #endregion
 
         /// <summary>
-        /// UI鏄剧ず
+        /// UI鏄剧ず 
         /// </summary>
         public void Show()
         {
@@ -145,4 +145,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
old mode 100644
new mode 100755
index 9a42055..3ac8d1e
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
@@ -236,7 +236,7 @@
         /// <param name="frameBack"></param>
         private void InitInValidTimeDialog(FrameLayout frameBack)
         {
-            //娑堟伅
+            //娑堟伅 
             string[] msgArray = msgText.Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
             var btnMsg1 = new Button()
             {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 39a423b..90e4420 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -41,7 +41,13 @@
         /// <summary>
         /// 閫昏緫涓槸鍚︽湁甯稿紑妯″紡
         /// </summary>
-        private bool HaveLogicNormallyOpenMode = false;
+        private bool haveLogicNormallyOpenMode = false;
+
+        /// <summary>
+        /// 闂ㄩ攣娣卞害鎺у埗涓婃姤绐楀彛鏄惁寮瑰嚭
+        /// </summary>
+        public static bool canShowDialog = true;
+
         /// <summary>
         /// 褰撳墠鐢甸噺
         /// </summary>
@@ -182,7 +188,7 @@
         #endregion
 
         /// <summary>
-        /// UI鏄剧ず
+        /// UI鏄剧ず 
         /// </summary>
         public void Show()
         {
@@ -510,7 +516,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
             };
             btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
-            #endregion
+            #endregion 
         }
 
         #region 闊抽噺寮圭獥
@@ -565,7 +571,7 @@
                 ThumbImagePath = "DoorLock/UnLockButton.png",//杩涘害鏉℃寜閽浘鏍�
                 ThumbImageHeight = Application.GetRealHeight(81),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
                 ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
-                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� 
                 SeekBarViewHeight = Application.GetRealHeight(17),//杩涘害鏉$殑瀹藉害
                 Progress = currentVolume,
             };
@@ -609,7 +615,14 @@
                         {
                             if (canOpenNormallyMode)
                             {
-                                Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
+                                Application.RunOnMainThread(() =>
+                                {
+                                    Action<bool> action = (obj) =>
+                                    {
+                                        UpdateNomallyOpenStatus();
+                                    };
+                                    DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.ServicePush, haveLogicNormallyOpenMode, action);
+                                });
                             }
                         }
                     }
@@ -687,11 +700,11 @@
                                 var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2);
                                 if (resTemp == 1)
                                 {
-                                    HaveLogicNormallyOpenMode = true;
+                                    haveLogicNormallyOpenMode = true;
                                 }
                                 else if (resTemp == 0)
                                 {
-                                    HaveLogicNormallyOpenMode = false;
+                                    haveLogicNormallyOpenMode = false;
                                 }
                             });
                         }
@@ -708,7 +721,7 @@
                     canVolume = DoorLockCommonInfo.CanVolume(doorLock);
                     if (canVolume)
                     {
-                        //璇诲彇闊抽噺
+                        //璇诲彇闊抽噺 
                         var resultRes = await doorLock.GetVolumeAsync();
                         if (resultRes == null || resultRes.volumeResponseData == null)
                         {
@@ -764,9 +777,9 @@
 
         #endregion
 
-        #region 鍏叡浜嬩欢澶勭悊
+        #region 鍏叡浜嬩欢澶勭悊 
         /// <summary>
-        /// 浜嬩欢澶勭悊
+        /// 浜嬩欢澶勭悊 
         /// </summary>
         public void ClickHandle()
         {
@@ -784,14 +797,11 @@
             //璁剧疆
             EventHandler<MouseEventArgs> btnFuncSetHander = (sender, e) =>
             {
-                //鎵撳紑鍏朵粬鐣岄潰鏃跺墠绉婚櫎銆愭殏鏃朵笉绉婚櫎銆�
-                //RemoveFromParent();
-
                 var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
                 Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                 functionSetting.Show();
-
+                canShowDialog = false;
                 functionSetting.devicNameAction += (deviceRename) =>
                 {
                     if (!string.IsNullOrEmpty(deviceRename))
@@ -822,6 +832,7 @@
                 //鍘嗗彶璁板綍 ----   stan
                 var form = new DeviceDoorLock.DoorLockHistoryLogForm();
                 form.AddForm(this.doorLock.DeviceAddr);
+                canShowDialog = false;
             };
             btnRecordFrameLayout.MouseDownEventHandler += handerRecord;
             btnRecord.MouseDownEventHandler += handerRecord;
@@ -832,11 +843,11 @@
                 btnCollect.IsSelected = !btnCollect.IsSelected;
                 if (btnCollect.IsSelected)
                 {
-                    HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌
+                    HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌 
                 }
                 else
                 {
-                    HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌
+                    HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌 
                 }
             };
             btnCollectFrameLayout.MouseDownEventHandler += handerCollect;
@@ -848,8 +859,15 @@
                 if (doorLock.IsDoorLockNormallyMode)
                 {
                     if (canOpenNormallyMode)
-                    {
-                        NomallyOpenModeInvalidDialog(false);
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            Action<bool> action = (obj) =>
+                            {
+                                UpdateNomallyOpenStatus();
+                            };
+                            DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
+                        });
                     }
                     else
                     {
@@ -875,7 +893,14 @@
                 {
                     if (doorLock.IsDoorLockNormallyMode)
                     {
-                        NomallyOpenModeInvalidDialog();
+                        Application.RunOnMainThread(() =>
+                        {
+                            Action<bool> action = (obj) =>
+                            {
+                                UpdateNomallyOpenStatus();
+                            };
+                            DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
+                        });
                     }
                 }
                 else
@@ -943,7 +968,7 @@
         }
         #endregion
 
-        #region 闊抽噺
+        #region 闊抽噺 
         /// <summary>
         /// 鏇存柊闊抽噺
         /// </summary>
@@ -1018,7 +1043,7 @@
         }
         #endregion
 
-        #region 甯稿紑妯″紡
+        #region 甯稿紑妯″紡  
         /// <summary>
         /// 甯稿紑妯″紡澶勭悊
         /// </summary>
@@ -1040,84 +1065,32 @@
             action = () =>
             {
                 //绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
-                var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
-                Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
-                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                functionSetting.Show();
-                // functionSetting.aaaAction = () =>
-                //{
-                //    UpdateNomallyOpenStatus();
-                //};
+                if (doorLock == null)
+                {
+                    ///闃叉鎶涘紓甯�
+                    return;
+                }
+                ///澶囨敞锛歐JC鐨�
+                Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+                ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+                Common.Logic.LogicDviceList.Clear();
+                if (Common.Logic.LogicDviceList.Count == 0)
+                {
+                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+                }
+                var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
+                UserView.HomePage.Instance.AddChidren(addLogicPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                addLogicPage.Show();
+                addLogicPage.action += (w) =>
+                {
+                    doorLock.IsDoorLockNormallyMode = w;
+                    ///鐣欑粰寰愭鐢ㄧ殑
+                    UpdateNomallyOpenStatus();
+                };
             };
             HdlCheckLogic.Current.CheckSecondarySecurity(action);
-            #endregion
-
-            #region 鏆傛椂鐗堟湰 (鏈�缁堝幓鎺夛級
-            if (!btnNormallyOpen.IsSelected)
-            {
-                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-                {
-                    this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
-                    return;
-                }
-
-                if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
-                {
-                    SystemSecondAuthentication();
-                    return;
-                }
-
-                action = () =>
-                {
-                    string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
-                    var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
-                    var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
-                    alert.Show();
-
-                    alert.ConfirmClickEvent += async () =>
-                    {
-                        Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
-                        var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
-                        if (result == null || result.defaultControlResponseData == null)
-                        {
-                            string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
-                            this.ShowTipMsg(msg0);
-                            return;
-                        }
-                        if (result.defaultControlResponseData.status != 0)
-                        {
-                            string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
-                            this.ShowTipMsg(msg1);
-                            return;
-                        }
-                        else
-                        {
-                            //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
-                            HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9001, string.Empty);
-
-                            //姣忔閲嶆柊璁剧疆甯稿紑锛岄粯璁ゆ椂闂撮兘鏄�12灏忔椂
-                            DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
-                            DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
-                            Application.RunOnMainThread(() =>
-                            {
-                                UpdateNomallyOpenStatus();
-                                CommonPage.Loading.Hide();
-                            });
-
-                            //甯稿紑妯″紡寮�鍚彁绀�
-                            AlreadyOpenNormallyMode();
-                        }
-                    };
-
-                };
-                HdlCheckLogic.Current.CheckSecondarySecurity(action);
-            }
-            else
-            {
-                NomallyOpenModeInvalidDialog();
-            }
-
-            #endregion
+            #endregion 
         }
 
         /// <summary>
@@ -1125,6 +1098,11 @@
         /// </summary>
         public void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
         {
+            if (!canShowDialog)
+            {
+                return;
+            }
+
             if (UserCenterResourse.UserInfo.AuthorityNo != 1)
             {
                 this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
@@ -1133,7 +1111,7 @@
             string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
             var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
             var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
-            if (HaveLogicNormallyOpenMode)
+            if (haveLogicNormallyOpenMode)
             {
                 //鏈夐�昏緫璁剧疆鐨勫脊绐�
                 alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
@@ -1144,14 +1122,14 @@
             {
                 if (IsFromReport)
                 {
-                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
+                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                     Application.RunOnMainThread(() =>
                     {
                         UpdateNomallyOpenStatus();
                     });
                     //鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
-                    if (HaveLogicNormallyOpenMode)
+                    if (haveLogicNormallyOpenMode)
                     {
                         var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                         //if (resTemp == 3)
@@ -1163,7 +1141,7 @@
                 }
                 else
                 {
-                    //app榛樿鈥滃父寮�妯″紡鈥濊繕鏄紑鍚�
+                    //app榛樿鈥滃父寮�妯″紡鈥濊繕鏄紑鍚� 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                     Application.RunOnMainThread(() =>
                     {
@@ -1179,7 +1157,7 @@
                     //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
                     Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
                     //鍏堝垹闄ゅ凡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
-                    if (HaveLogicNormallyOpenMode)
+                    if (haveLogicNormallyOpenMode)
                     {
                         var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                         //if (resTemp == 3)
@@ -1215,14 +1193,14 @@
                     }
                     else
                     {
-                        //淇濇寔鈥滃父寮�鎴愬姛鈥�
+                        //淇濇寔鈥滃父寮�鎴愬姛鈥� 
                         DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                         Application.RunOnMainThread(() =>
                         {
                             UpdateNomallyOpenStatus();
                         });
 
-                        //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+                        //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
                         var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                         //if (!resu)
                         //{
@@ -1235,7 +1213,7 @@
                 }
                 else
                 {
-                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
+                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥� 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                     Application.RunOnMainThread(() =>
                     {
@@ -1248,7 +1226,7 @@
             {
                 if (IsFromReport)
                 {
-                    //涓婃姤闂ㄩ攣鈥滃父寮�妯″紡鈥濆凡缁忓彇娑堬紝鐜板湪app纭鈥滃父寮�妯″紡鈥濆彇娑�
+                    //涓婃姤闂ㄩ攣鈥滃父寮�妯″紡鈥濆凡缁忓彇娑堬紝鐜板湪app纭鈥滃父寮�妯″紡鈥濆彇娑� 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                     Application.RunOnMainThread(() =>
                     {
@@ -1256,7 +1234,7 @@
                     });
 
                     //鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
-                    if (HaveLogicNormallyOpenMode)
+                    if (haveLogicNormallyOpenMode)
                     {
                         var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                         //if (resTemp == 3)
@@ -1288,14 +1266,14 @@
                         //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
                         HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);
 
-                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔� 
                         DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                         Application.RunOnMainThread(() =>
                         {
                             UpdateNomallyOpenStatus();
                         });
                         //鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
-                        if (HaveLogicNormallyOpenMode)
+                        if (haveLogicNormallyOpenMode)
                         {
                             var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                             //鍥犱负鐩墠鏈哄埗闂锛岄�昏緫缁忓父澶辫触锛屾墍浠ヤ笉鎻愮ず锛屽悗鏈熸満鍒惰鏀癸紝閲嶆柊鍋氫竴涓繖涓晫闈�
@@ -1329,7 +1307,7 @@
             alertNomallyModeIsTurnOn.Show();
             alertNomallyModeIsTurnOn.MsgControlClickEvent += async () =>
             {
-                //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+                //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
                 var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                 //if (!res)
                 //{
@@ -1357,7 +1335,7 @@
         /// </summary>
         private void NomallyOpenModeInvalidTimeDialog()
         {
-            //澶辨晥璁剧疆
+            //澶辨晥璁剧疆 
             string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
             var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
             var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
@@ -1368,7 +1346,7 @@
                  //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
                  var temp = int.Parse(obj);
                  DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
-                 //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+                 //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
                  var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                  if (!res)
                  {
@@ -1410,7 +1388,7 @@
         }
         #endregion
 
-        #region 寮�閿佸鐞�
+        #region 寮�閿佸鐞� 
         /// <summary>
         /// 寮�閿佸鐞�
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index ee92d35..0f13170 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -59,8 +59,7 @@
 
             //body鍗犲畬鏁翠釜灞忓箷,闄や簡搴曢儴鑿滃崟
             bodyFrameLayout.Y = 0;
-            bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight
-                + ControlCommonResourse.BodyFrameHeight - ControlCommonResourse.BottomFrameHeight;
+            bodyFrameLayout.Height = this.Height;
             bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BlackBackGround;
 
             //鍒濆鍖栦腑閮ㄦ帶浠�
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
old mode 100755
new mode 100644
index f2e05ad..2eb6f8a
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -182,6 +182,10 @@
             {
                 return Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
             }
+            else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
+            }
             return null;
         }
 
@@ -248,6 +252,11 @@
                     //鏂伴 
                     IconPath = "Device/FreshAirEpoint.png";
                 }
+                else if (this.Type == DeviceType.FreshAir)
+                {
+                    //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� 
+                    IconPath = "Device/FreshAirEpoint.png";
+                }
                 else if (this.Type == DeviceType.FreshAirHumiditySensor)
                 {
                     //婀垮害浼犳劅鍣�
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
old mode 100755
new mode 100644
index 6928ccf..d43893c
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -94,6 +94,12 @@
         /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
         /// </summary>
         TemperatureSensor = 770,
+        /// <summary>
+        /// <para>PM2.5浼犳劅鍣�</para>
+        /// <para>璁惧ID涓�777</para>
+        /// <para>瀹氫箟瀵硅薄锛歅MSensor</para>
+        /// </summary>
+        PMSensor = 777,
     }
 
     /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
new file mode 100644
index 0000000..f2dece7
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -0,0 +1,16 @@
+锘縰sing System;
+using ZigBee.Device;
+
+namespace ZigBee.Device
+{
+    public class PMSensor : CommonDevice
+    {
+        /// <summary>
+        /// PM2.5浼犳劅鍣ㄥ璞�
+        /// </summary>
+        public PMSensor()
+        {
+            this.Type = DeviceType.PMSensor;
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
old mode 100644
new mode 100755
index 05f1cf9..104c55f
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -101,7 +101,7 @@
             }
         }
 
-        #region variable
+        #region variable 
         /// <summary>
         /// 杩滅▼杩炴帴鎴愬姛鏃剁殑鏃堕棿
         /// </summary>
@@ -2857,8 +2857,8 @@
         /// <summary>
         /// 杩滅▼MqttClient
         /// </summary>
-        public static IMqttClient RemoteMqttClient = new MqttFactory().CreateMqttClient();
-        static bool remoteIsConnected;
+        public static IMqttClient RemoteMqttClient= new MqttFactory().CreateMqttClient();
+        static bool remoteIsConnected; 
         private int IsLogin = 0;
         [Newtonsoft.Json.JsonIgnore]
         static Action actionTemp;
@@ -3051,8 +3051,8 @@
            .WithTcpServer(domain, int.Parse(port))
            .WithCredentials(connEmqUserName, connEmqPwd)
            .WithKeepAlivePeriod(TimeSpan.FromSeconds(20))
-           .WithCleanSession()
-           //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
+           .WithCleanSession()
+           //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
            .Build();
                                 await DisConnectRemoteMqttClient("StartRemoteMqtt");
                                 await RemoteMqttClient.ConnectAsync(options, CancellationToken.None);
@@ -3087,7 +3087,7 @@
                     localIsConnected = false;
                     DebugPrintLog($"Local涓诲姩鏂紑_{s}");
                     //await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions {  }, CancellationToken.None);
-                    await localMqttClient.DisconnectAsync();
+                    await localMqttClient.DisconnectAsync(); 
                 }
             }
             catch (Exception ex)
@@ -3099,7 +3099,7 @@
         /// <summary>
         /// 鏂紑杩滅▼Mqtt鐨勯摼鎺�
         /// </summary>
-        public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s = "")
+        public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s="")
         {
             try
             {
@@ -3218,7 +3218,7 @@
                         {
                             await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
                         }
-                        catch (Exception e)
+                        catch(Exception e)
                         {
                             DebugPrintLog($"Local涓诲姩鏂紑_{e.Message}");
                             await DisConnectLocalMqttClient(e.Message);
@@ -3424,7 +3424,7 @@
         /// <param name="topic">Topic.</param>
         /// <param name="message">Message.</param>
         /// <param name="e">E.</param>
-        static void ReceiveMessage(string topic, string message, byte[] payload)
+        static void ReceiveMessage(string topic, string message, byte []payload)
         {
             try
             {
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index a3747df..8891f66 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -330,7 +330,7 @@
         /// </summary>
         public const int GetPanelProximityFail = 233;
         /// <summary>
-        /// 鎸変綇闈㈡澘妯″紡
+        /// 鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
         /// </summary>
         public const int AddFreshAirPanelMsg = 235;
         /// <summary>
@@ -350,7 +350,7 @@
         /// </summary>
         public const int AddFreshAirModulPanelMsg = 239;
         /// <summary>
-        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
         /// </summary>
         public const int SetDoorLockNomallyOpen = 241;
         /// <summary>
@@ -566,6 +566,10 @@
         /// PM2.5鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
         /// </summary>
         public const int AddSensorPMMsg = 313;
+        /// <summary>
+        /// 鑷姩妯″紡涓嶆敮鎸佹搷浣�
+        /// </summary>
+        public const int AutoModeForbiddenOperate = 314;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -829,7 +833,7 @@
         public readonly static int daySone = 5386;
         public readonly static int numberSone = 5387;
         public readonly static int openAutomationSone = 5388;
-        public readonly static int timeSetSone= 5389;
+        public readonly static int timeSetSone = 5389;
         public readonly static int invalidSetting = 5390;
         public readonly static int hour = 5391;
         public readonly static int lockOpen = 5392;
@@ -1152,90 +1156,90 @@
         /// 鍔熻兘璁剧疆
         /// </summary>
         public const int FunctionSetting = 11012;
-		/// <summary>
-		/// 淇℃伅缂栬緫
-		/// </summary>
-		public const int EditInfo = 11013;
-		/// <summary>
-		/// 鍔熻兘鍚嶇О
-		/// </summary>
-		public const int FunctionName = 11014;
-		/// <summary>
-		/// 鎵�灞炲尯鍩�
-		/// </summary>
-		public const int BelongZone = 11015;
-		/// <summary>
-		/// 鎵�灞炶澶�
-		/// </summary>
-		public const int BelongDevice = 11016;
-		/// <summary>
-		/// 鏈煡
-		/// </summary>
-		public const int UNKnown = 11017;
-		/// <summary>
-		/// 鍒嗕韩
-		/// </summary>
-		public const int Share = 11018;
-		/// <summary>
-		/// 鍒嗕韩鐨�
-		/// </summary>
-		public const int Shared = 11019;
-		/// <summary>
-		/// 閫夋嫨鍥炬爣
-		/// </summary>
-		public const int SelectIcon = 11020;
-		/// <summary>
-		/// 淇濆瓨
-		/// </summary>
-		public const int Save = 11021;
-		/// <summary>
-		/// 鎻愰啋
-		/// </summary>
-		public const int TIP = 11022;
-		/// <summary>
-		/// 鍙栨秷
-		/// </summary>
-		public const int Cancel = 11023;
-		/// <summary>
-		/// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
-		/// </summary>
-		public const int NoScene = 11024;
-		/// <summary>
-		/// 璁剧疆
-		/// </summary>
-		public const int Setting = 11025;
-		/// <summary>
-		/// 寤舵椂
-		/// </summary>
-		public const int Delay = 11026;
-		/// <summary>
-		/// 纭畾鍒犻櫎鍚楋紵
-		/// </summary>
-		public const int ConfirmDelete = 11027;
-		/// <summary>
-		/// 娣诲姞鍦烘櫙
-		/// </summary>
-		public const int AddScence = 11028;
-		/// <summary>
-		/// 鍦烘櫙鍚嶇О
-		/// </summary>
-		public const int SceneName = 11029;
-		/// <summary>
-		/// 璇疯緭鍏ュ満鏅悕绉�
-		/// </summary>
-		public const int PleaseInputSceneName = 11030;
-		/// <summary>
-		/// 娣诲姞鎵ц鐩爣
-		/// </summary>
-		public const int AddScentTargetAction = 11031;
-		/// <summary>
-		/// 閫夋嫨鍖哄煙
-		/// </summary>
-		public const int SelectZone = 11032;
-		/// <summary>
-		/// 閫夋嫨鍦烘櫙鍥剧墖
-		/// </summary>
-		public const int SelectScenePic = 11033;
+        /// <summary>
+        /// 淇℃伅缂栬緫
+        /// </summary>
+        public const int EditInfo = 11013;
+        /// <summary>
+        /// 鍔熻兘鍚嶇О
+        /// </summary>
+        public const int FunctionName = 11014;
+        /// <summary>
+        /// 鎵�灞炲尯鍩�
+        /// </summary>
+        public const int BelongZone = 11015;
+        /// <summary>
+        /// 鎵�灞炶澶�
+        /// </summary>
+        public const int BelongDevice = 11016;
+        /// <summary>
+        /// 鏈煡
+        /// </summary>
+        public const int UNKnown = 11017;
+        /// <summary>
+        /// 鍒嗕韩
+        /// </summary>
+        public const int Share = 11018;
+        /// <summary>
+        /// 鍒嗕韩鐨�
+        /// </summary>
+        public const int Shared = 11019;
+        /// <summary>
+        /// 閫夋嫨鍥炬爣
+        /// </summary>
+        public const int SelectIcon = 11020;
+        /// <summary>
+        /// 淇濆瓨
+        /// </summary>
+        public const int Save = 11021;
+        /// <summary>
+        /// 鎻愰啋
+        /// </summary>
+        public const int TIP = 11022;
+        /// <summary>
+        /// 鍙栨秷
+        /// </summary>
+        public const int Cancel = 11023;
+        /// <summary>
+        /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+        /// </summary>
+        public const int NoScene = 11024;
+        /// <summary>
+        /// 璁剧疆
+        /// </summary>
+        public const int Setting = 11025;
+        /// <summary>
+        /// 寤舵椂
+        /// </summary>
+        public const int Delay = 11026;
+        /// <summary>
+        /// 纭畾鍒犻櫎鍚楋紵
+        /// </summary>
+        public const int ConfirmDelete = 11027;
+        /// <summary>
+        /// 娣诲姞鍦烘櫙
+        /// </summary>
+        public const int AddScence = 11028;
+        /// <summary>
+        /// 鍦烘櫙鍚嶇О
+        /// </summary>
+        public const int SceneName = 11029;
+        /// <summary>
+        /// 璇疯緭鍏ュ満鏅悕绉�
+        /// </summary>
+        public const int PleaseInputSceneName = 11030;
+        /// <summary>
+        /// 娣诲姞鎵ц鐩爣
+        /// </summary>
+        public const int AddScentTargetAction = 11031;
+        /// <summary>
+        /// 閫夋嫨鍖哄煙
+        /// </summary>
+        public const int SelectZone = 11032;
+        /// <summary>
+        /// 閫夋嫨鍦烘櫙鍥剧墖
+        /// </summary>
+        public const int SelectScenePic = 11033;
         /// <summary>
         /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
         /// </summary>
@@ -5962,15 +5966,15 @@
         /// </summary>
         public const int uAddSensorTemperatureAndHumidityMsg = 21017;
         /// <summary>
-        /// 鏂规偊2鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+        /// 鍗曞紑鍙屾帶闈㈡澘 -> 闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
         /// </summary>
         public const int uAddFangyueTwoButtonPanelMsg = 21018;
         /// <summary>
-        /// 鏂规偊4鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+        /// 鍙屽紑鍥涙帶闈㈡澘 -> 闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
         /// </summary>
         public const int uAddFangyueFourButtonPanelMsg = 21019;
         /// <summary>
-        /// 鏂规偊8鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+        /// 鍥涘紑鍏帶闈㈡澘-> 闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
         /// </summary>
         public const int uAddFangyueEightButtonPanelMsg = 21020;
         /// <summary>
@@ -5978,7 +5982,7 @@
         /// </summary>
         public const int uAddFangyueEnvironmentPanelMsg = 21021;
         /// <summary>
-        /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+        /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔� 
         /// </summary>
         public const int uAddCurtaunPanelMsg = 21022;
         /// <summary>
@@ -6147,7 +6151,11 @@
         /// <summary>
         /// 闀滃儚ID涓�1306鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鍚搁《鐕冩皵浼犳劅鍣�
         /// </summary>
-        public const int uDeviceModelId1306 = 30039;
+        public const int uDeviceModelId1306 = 30039;
+        /// <summary>
+        /// 闀滃儚ID涓�1307鐨勮澶囩殑榛樿鍚嶅瓧锛歅M2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+        /// </summary>
+        public const int uDeviceModelId1307 = 30040;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 6f6d9b4..20b7b9d 100644
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -209,6 +209,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorWorkModeMenuForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethod.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethodTip.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonLayout.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorlockDialog.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\EntryStatusPage.cs" />
@@ -220,6 +221,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TimeSettignPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UndistributeDoorlockUserPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UnLockMethod.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserDoorLockPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserManagement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\AddGatewayHelpForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection1Form.cs" />
@@ -475,13 +477,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\IO\LocalFileUtils.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSafeguardLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAlarmsLogic.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirBackLightSettionForm.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserDoorLockPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\ShowDoorLockMsgControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DoorLock.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceFreshAirCardControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPMTwoPointFiveForm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PMSensor.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)Phone\CommonForm\" />
@@ -516,4 +512,4 @@
     <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Ios.xml" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

--
Gitblit v1.8.0