From 6c71e8a178d9cb83a178f08e3411090fe8da505d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 15:33:33 +0800
Subject: [PATCH] 删除了萤石功能,埃克斯影音中控,海信电视,

---
 HDL-ON_Android/Properties/AndroidManifest.xml                     |   94 
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs                         |   29 
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs                              |   12 
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs    |  142 
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |  134 
 HDL_ON/UI/UI2/UserPage.cs                                         |   22 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs      |   20 
 HDL_ON/HDL_ON.projitems                                           |   51 
 HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs              |    4 
 HDL-ON_Android/HDL-ON_Android.csproj                              |   27 
 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs          |    1 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs       |    6 
 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs       |  376 -
 HDL-ON_Android/SplashActivity.cs                                  |    1 
 HDL_ON/Common/HDLCommon.cs                                        |  147 
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs            |   22 
 HDL_ON/Entity/Enumerative/MyEnum.cs                               |   30 
 HDL-ON_Android/Resources/Resource.designer.cs                     | 10182 ++++++++++++++++++++++-------------------------
 HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs               |    1 
 HDL_ON/UI/MainPage.cs                                             |    1 
 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs          |    2 
 HDL_ON/UI/UI1-Login/LoginPage.cs                                  |   16 
 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs                     |    3 
 HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs        |   80 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs           |    2 
 HDL_ON/Entity/DB_ResidenceData.cs                                 |    3 
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs              |   81 
 HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs              |    5 
 HDL_ON/Entity/FunctionList.cs                                     |   23 
 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs    |  105 
 /dev/null                                                         |  837 ---
 HDL_ON/Entity/Function/Function.cs                                |   88 
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs             |    9 
 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs                    |   29 
 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs                   |   23 
 HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs                |    1 
 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs    |   29 
 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs                             |   37 
 38 files changed, 4,941 insertions(+), 7,734 deletions(-)

diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/caidan.png b/HDL-ON_Android/Assets/Phone/HisenseTv/caidan.png
deleted file mode 100644
index f4fe166..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/caidan.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png b/HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png
deleted file mode 100644
index 1e204f8..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/guan.png b/HDL-ON_Android/Assets/Phone/HisenseTv/guan.png
deleted file mode 100644
index 53ba654..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/guan.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/kai.png b/HDL-ON_Android/Assets/Phone/HisenseTv/kai.png
deleted file mode 100644
index ddce0db..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/kai.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/kaiguanSelected.png b/HDL-ON_Android/Assets/Phone/HisenseTv/kaiguanSelected.png
deleted file mode 100644
index 0b65164..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/kaiguanSelected.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/offbj.png b/HDL-ON_Android/Assets/Phone/HisenseTv/offbj.png
deleted file mode 100644
index 823db9a..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/offbj.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/offtvbj.png b/HDL-ON_Android/Assets/Phone/HisenseTv/offtvbj.png
deleted file mode 100644
index c4335fc..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/offtvbj.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/onbj.png b/HDL-ON_Android/Assets/Phone/HisenseTv/onbj.png
deleted file mode 100644
index 0e424cf..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/onbj.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/shouye.png b/HDL-ON_Android/Assets/Phone/HisenseTv/shouye.png
deleted file mode 100644
index 3542edb..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/shouye.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/shouyeSelected.png b/HDL-ON_Android/Assets/Phone/HisenseTv/shouyeSelected.png
deleted file mode 100644
index 933d5ec..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/shouyeSelected.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjia.png b/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjia.png
deleted file mode 100644
index 268d70b..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjia.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjiaSelected.png b/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjiaSelected.png
deleted file mode 100644
index 1785e81..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjiaSelected.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjian.png b/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjian.png
deleted file mode 100644
index 31369e7..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjian.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjianSelected.png b/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjianSelected.png
deleted file mode 100644
index aa459fe..0000000
--- a/HDL-ON_Android/Assets/Phone/HisenseTv/yingliangjianSelected.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 376b279..13a63d3 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -69,9 +69,6 @@
     <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Shared.Droid.JPush">
-      <HintPath>..\DLL\Shared.Droid.JPush.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -195,9 +192,11 @@
     <Reference Include="Shared.Droid.HDLLinphone">
       <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
     </Reference>
+    <Reference Include="Shared.Droid.JPush-Google">
+      <HintPath>..\..\绗笁鏂瑰姛鑳絓鏋佸厜\lib\Shared.Droid.JPush-Google.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MainActivity.cs" />
     <Compile Include="Other\JPush\JPushFirmBroadcast.cs" />
     <Compile Include="Other\JPush\JPushOpenClickActivity.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
@@ -224,7 +223,6 @@
     <Compile Include="Zxing\CustomCaptureActivity.cs" />
     <Compile Include="Zxing\ScanActivity.cs" />
     <Compile Include="LeChengVideo\LeTest.cs" />
-    <Compile Include="Other\LocationUtils.cs" />
     <Compile Include="Other\MyLocationListener_V2.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -555,21 +553,7 @@
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
     <AndroidAsset Include="Assets\Phone\AksIcon\aks.png" />
     <AndroidAsset Include="Assets\Phone\AksIcon\like.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\caidan.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\offbj.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\offtvbj.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\onbj.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\guan.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\kai.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguanSelected.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\shouyeSelected.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjianSelected.png" />
-    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
     <AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
@@ -945,7 +929,6 @@
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
     <PackageReference Include="Xamarin.Android.Support.v4">
       <Version>28.0.0.3</Version>
     </PackageReference>
@@ -984,6 +967,9 @@
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
       <Version>1.0.0.23</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Browser">
+      <Version>1.8.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -1838,7 +1824,6 @@
     <Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
     <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
     <Folder Include="Assets\Phone\AksIcon\" />
-    <Folder Include="Assets\Phone\HisenseTv\" />
     <Folder Include="Assets\Phone\FunctionIcon\GroupControl\" />
   </ItemGroup>
   <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
diff --git a/HDL-ON_Android/MainActivity.cs b/HDL-ON_Android/MainActivity.cs
deleted file mode 100644
index 4c7e169..0000000
--- a/HDL-ON_Android/MainActivity.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-锘�//using System;
-//using Android.App;
-//using Android.OS;
-//using Android.Runtime;
-//using Android.Support.Design.Widget;
-//using Android.Support.V7.App;
-//using Android.Views;
-//using Android.Widget;
-
-//namespace HDL_ON_Android
-//{
-//    [Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)]
-//    public class MainActivity : AppCompatActivity
-//    {
-//        protected override void OnCreate(Bundle savedInstanceState)
-//        {
-//            base.OnCreate(savedInstanceState);
-//            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
-//            SetContentView(Resource.Layout.activity_main);
-//            Android.Support.V7.Widget.Toolbar toolbar = FindViewById<Android.Support.V7.Widget.Toolbar>(Resource.Id.toolbar);
-//            SetSupportActionBar(toolbar);
-//        }
-//    }
-//}
-
diff --git a/HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs b/HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs
index b974874..2401591 100644
--- a/HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs
+++ b/HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs
@@ -1,9 +1,6 @@
 锘縰sing Android.App;
 using Android.Content;
 using Android.OS;
-
-using Com.Hdl.ON.Jpush.Androidjpush;
-
 using Android.Views;
 
 namespace HDL_ON_Android
@@ -37,7 +34,7 @@
             {
                 broadcastIntent.SetComponent(componentName);
             }
-            FirmOpenClickHelper.Instance.HandleOpenClick(this, intent, broadcastIntent);
+            //FirmOpenClickHelper.Instance.HandleOpenClick(this, intent, broadcastIntent);
             Finish();
 
         }
diff --git a/HDL-ON_Android/Other/LocationUtils.cs b/HDL-ON_Android/Other/LocationUtils.cs
deleted file mode 100644
index 7a1af91..0000000
--- a/HDL-ON_Android/Other/LocationUtils.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-锘�//using System;
-//using System.Threading.Tasks;
-//using Xamarin.Essentials;
-
-//namespace HDL_ON_Android
-//{
-//    public static class LocationUtils
-//    {
-//        public static async Task<Location> GetCurrentLocationAsync()
-//        {
-//            try
-//            {
-//                var request = new GeolocationRequest(GeolocationAccuracy.Medium);
-//                var location = await Geolocation.GetLocationAsync(request);
-//                return location;
-//            }
-//            catch (Exception ex)
-//            {
-//                // 澶勭悊寮傚父
-//                Console.WriteLine($"鑾峰彇浣嶇疆淇℃伅澶辫触: {ex.Message}");
-//                return null;
-//            }
-//        }
-//    }
-//}
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 67ddb66..e1766c9 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,110 +1,52 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.5" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202405201">
 	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="33" />
-	<uses-permission android:name="android.permission.RECEIVE_SMS" />
-	<!--鍙嬬洘-->
-	<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
-	<!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
-	<!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
-	<!--<uses-permission android:name="android.permission.READ_PHONE_STATE"/>-->
-	<!--<uses-permission android:name="android.permission.INTERNET"/>-->
-	<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
-	<!--<uses-permission android:name="android.permission.INTERNET" />-->
-	<!--缃戠粶璁块棶-->
-	<!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
-	<!--鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍,濡係D鍗′笂鍐欐枃浠讹紝鎶撳浘銆佸綍鍒剁瓑-->
-	<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
-	<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
 	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
-	<!--鍏佽绋嬪簭璇锋眰楠岃瘉浠嶢ccountManager锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />-->
-	<!--鍏佽鏀瑰彉WiFi澶氭挱鐘舵�侊紵锛燂紵-->
-	<!--<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />-->
-	<!--鍏佽绋嬪簭鏄剧ず绯荤粺绐楀彛锛屽簲璇ュ凡缁忎笉閫傜敤浜嗭紵锛燂紵-->
-	<!--<uses-permission android:name="android.permission.RECORD_AUDIO" />-->
-	<!--鍏佽绋嬪簭褰曞埗澹伴煶閫氳繃鎵嬫満鎴栬�虫満鐨勯害鍏嬶紝瀵硅銆佽嚜瀹氫箟鎶ヨ闊崇瓑-->
-	<!--<uses-permission android:name="android.permission.CAMERA" />-->
-	<!--鍏佽绋嬪簭璁块棶鎽勫儚澶磋繘琛屾媿鐓э紝浜岀淮鐮佹壂鎻忚ˉ鍏夈�佹媿鐓т笂浼犲浘鐗囩瓑-->
 	<uses-permission android:name="android.permission.FLASHLIGHT" />
-	<!--鍏佽璁块棶闂厜鐏紝浜岀淮鐮佹壂鎻忚ˉ鍏�-->
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-	<!--鍏佽绋嬪簭淇敼澹伴煶璁剧疆淇℃伅锛屽0娉㈤厤瀵癸紝鑷姩璋冨ぇ闊抽噺銆傞渶姹傚彉鏇翠箣鍚庡簲璇ヤ笉闇�瑕佷簡锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />-->
-	<!--鍏佽绋嬪簭鑾峰彇褰撳墠WiFi鎺ュ叆鐨勭姸鎬佷互鍙奧LAN鐑偣鐨勪俊鎭紝璁惧娣诲姞浣曠閰嶇綉娴佺▼浣跨敤-->
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-	<!--鍏佽绋嬪簭鏀瑰彉WiFi鐘舵�侊紝閰嶇綉绛�-->
-	<!--<uses-feature android:name="android.hardware.camera" />-->
-	<!--<uses-feature android:name="android.hardware.camera.autofocus" />-->
-	<!-- 纭欢鍔犻�熷X5瑙嗛鎾斁闈炲父閲嶈锛屽缓璁紑鍚� -->
 	<uses-permission android:name="android.permission.READ_SETTINGS" />
-	<!--鍏佽绋嬪簭璇诲彇绯荤粺璁剧疆锛屽0娉㈤厤瀵硅幏鍙栧綋鍓嶇郴缁熼煶閲忕瓑-->
-	<!-- Optional for location -->
-	<!--<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
-	<!--鍏佽涓�涓▼搴忚闂瓹ellID鎴� WiFi鐑偣鏉ヨ幏鍙栫矖鐣ョ殑浣嶇疆锛岀櫥闄嗐�佽澶囨坊鍔犵瓑-->
-	<!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
-	<!--鍏佽涓�涓▼搴忚闂瓹ellID鎴� WiFi鐑偣鏉ヨ幏鍙栫簿纭殑浣嶇疆锛岀櫥闄嗐�佽澶囨坊鍔犵瓑锛燂紵锛�-->
 	<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-	<!--鍏佽搴旂敤绋嬪簭璁块棶棰濆鐨勪綅缃彁渚涘懡浠わ紝鐧婚檰銆佽澶囨坊鍔犵瓑锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />-->
-	<!--鍏佽绋嬪簭鏀瑰彉缃戠粶鐘舵��,濡傛槸鍚﹁仈缃戯紝閰嶇綉锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-	<!--鍏佽搴旂敤绋嬪簭璇锋眰瀹夎鍖呫�傞拡瀵笰PI澶т簬22蹇呴』鎸佹湁璇ヨ鍙娇鐢ˋCTION_INSTALL_PACKAGE搴旂敤銆傚簲璇ユ病鍦ㄧ敤锛燂紵锛�-->
-	<uses-permission android:name="android.permission.VIBRATE" />
-	<!--  鍙瀵硅鏉冮檺-->
-	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-feature android:name="android.hardware.camera" />
 	<uses-feature android:name="android.hardware.camera.autofocus" />
-	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
 	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-	<!--  瀹氫綅鏉冮檺 -->
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-	<!--  鎷嶇収鏉冮檺 -->
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.CAMERA" />
-	<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 -->
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-	<!--  鎾斁鏈湴闊充箰鏉冮檺-->
 	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<!--鏋佸厜鎺ㄩ�� Required  涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
-	<!-- Required  涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
 	<permission android:name="com.hdl.onpro.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
-	<!-- Required -->
 	<uses-permission android:name="com.hdl.onpro.permission.JPUSH_MESSAGE" />
 	<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.READ_LOGS" />
 	<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
-	<application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
-		<!--/鎵弿浜岀淮鐮乤ctivity-->
-		<!--<activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />-->
-		<!--CustomCaptureActivity-->
-		<!--<activity
-            android:name=".CustomCaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />-->
-		<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
+	<application
+		android:allowBackup="true"
+		android:supportsRtl="true"
+		tools:replace="android:allowBackup,android:label,android:supportsRtl"
+		android:debuggable="false"
+		android:icon="@drawable/Icon"
+		android:requestLegacyExternalStorage="true"
+		android:networkSecurityConfig="@xml/network_security_config"
+		android:largeHeap="true"
+		android:label="On Pro">
+		<provider 
+            tools:replace="android:authorities"
+			android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
 		</provider>
 		<!--鏋佸厜鎺ㄩ��-->
-		<provider android:name="Shared.Droid.JPush.HmsContentProvider" android:authorities="${applicationId}.hmspushprovider" android:exported="false"></provider>
 		<!-- Required SDK 鏍稿績鍔熻兘-->
 		<!-- 鍙厤缃� android:process 鍙傛暟灏� PushService 鏀惧湪鍏朵粬杩涚▼涓� -->
 		<service android:name="cn.jpush.android.service.PushService" android:enabled="true" android:exported="false">
@@ -128,7 +70,8 @@
 		<!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘-->
 		<provider android:authorities="com.hdl.onpro.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
 		<!-- Required SDK 鏍稿績鍔熻兘-->
-		<receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true">
+		<receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true"
+			android:exported="true">
 			<intent-filter android:priority="1000">
 				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
 				<category android:name="com.hdl.onpro" />
@@ -187,13 +130,6 @@
 		<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
 		<!-- Required. AppKey copied from Portal -->
 		<meta-data android:name="JPUSH_APPKEY" android:value="cbd90743ac45cbca06c8118b" />
-		<meta-data android:name="XIAOMI_APPKEY" android:value="MI-5871892343860" />
-		<meta-data android:name="XIAOMI_APPID" android:value="MI-2882303761518923860" />
-		<meta-data android:name="OPPO_APPKEY" android:value="OP-e942dafe77cf4b9f868d5421d701655a" />
-		<meta-data android:name="OPPO_APPID" android:value="OP-30619979" />
-		<meta-data android:name="OPPO_APPSECRET" android:value="OP-11d511c42f654cafac99588322681003" />
 		<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
-		<!-- 璁剧疆楂樺痉鍦板浘key -->
-		<meta-data android:name="com.amap.api.v2.apikey" android:value="9901dd06e30b229efdd4c5bf5e076224" />
 	</application>
 </manifest>
\ No newline at end of file
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 43e41ce..b811c3e 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -26,197 +26,6 @@
 		
 		public static void UpdateIdValues()
 		{
-			global::Xamarin.Essentials.Resource.Attribute.alpha = global::HDL_ON_Android.Resource.Attribute.alpha;
-			global::Xamarin.Essentials.Resource.Attribute.font = global::HDL_ON_Android.Resource.Attribute.font;
-			global::Xamarin.Essentials.Resource.Attribute.fontProviderAuthority = global::HDL_ON_Android.Resource.Attribute.fontProviderAuthority;
-			global::Xamarin.Essentials.Resource.Attribute.fontProviderCerts = global::HDL_ON_Android.Resource.Attribute.fontProviderCerts;
-			global::Xamarin.Essentials.Resource.Attribute.fontProviderFetchStrategy = global::HDL_ON_Android.Resource.Attribute.fontProviderFetchStrategy;
-			global::Xamarin.Essentials.Resource.Attribute.fontProviderFetchTimeout = global::HDL_ON_Android.Resource.Attribute.fontProviderFetchTimeout;
-			global::Xamarin.Essentials.Resource.Attribute.fontProviderPackage = global::HDL_ON_Android.Resource.Attribute.fontProviderPackage;
-			global::Xamarin.Essentials.Resource.Attribute.fontProviderQuery = global::HDL_ON_Android.Resource.Attribute.fontProviderQuery;
-			global::Xamarin.Essentials.Resource.Attribute.fontStyle = global::HDL_ON_Android.Resource.Attribute.fontStyle;
-			global::Xamarin.Essentials.Resource.Attribute.fontVariationSettings = global::HDL_ON_Android.Resource.Attribute.fontVariationSettings;
-			global::Xamarin.Essentials.Resource.Attribute.fontWeight = global::HDL_ON_Android.Resource.Attribute.fontWeight;
-			global::Xamarin.Essentials.Resource.Attribute.ttcIndex = global::HDL_ON_Android.Resource.Attribute.ttcIndex;
-			global::Xamarin.Essentials.Resource.Color.androidx_core_ripple_material_light = global::HDL_ON_Android.Resource.Color.androidx_core_ripple_material_light;
-			global::Xamarin.Essentials.Resource.Color.androidx_core_secondary_text_default_material_light = global::HDL_ON_Android.Resource.Color.androidx_core_secondary_text_default_material_light;
-			global::Xamarin.Essentials.Resource.Color.browser_actions_bg_grey = global::HDL_ON_Android.Resource.Color.browser_actions_bg_grey;
-			global::Xamarin.Essentials.Resource.Color.browser_actions_divider_color = global::HDL_ON_Android.Resource.Color.browser_actions_divider_color;
-			global::Xamarin.Essentials.Resource.Color.browser_actions_text_color = global::HDL_ON_Android.Resource.Color.browser_actions_text_color;
-			global::Xamarin.Essentials.Resource.Color.browser_actions_title_color = global::HDL_ON_Android.Resource.Color.browser_actions_title_color;
-			global::Xamarin.Essentials.Resource.Color.notification_action_color_filter = global::HDL_ON_Android.Resource.Color.notification_action_color_filter;
-			global::Xamarin.Essentials.Resource.Color.notification_icon_bg_color = global::HDL_ON_Android.Resource.Color.notification_icon_bg_color;
-			global::Xamarin.Essentials.Resource.Dimension.browser_actions_context_menu_max_width = global::HDL_ON_Android.Resource.Dimension.browser_actions_context_menu_max_width;
-			global::Xamarin.Essentials.Resource.Dimension.browser_actions_context_menu_min_padding = global::HDL_ON_Android.Resource.Dimension.browser_actions_context_menu_min_padding;
-			global::Xamarin.Essentials.Resource.Dimension.compat_button_inset_horizontal_material = global::HDL_ON_Android.Resource.Dimension.compat_button_inset_horizontal_material;
-			global::Xamarin.Essentials.Resource.Dimension.compat_button_inset_vertical_material = global::HDL_ON_Android.Resource.Dimension.compat_button_inset_vertical_material;
-			global::Xamarin.Essentials.Resource.Dimension.compat_button_padding_horizontal_material = global::HDL_ON_Android.Resource.Dimension.compat_button_padding_horizontal_material;
-			global::Xamarin.Essentials.Resource.Dimension.compat_button_padding_vertical_material = global::HDL_ON_Android.Resource.Dimension.compat_button_padding_vertical_material;
-			global::Xamarin.Essentials.Resource.Dimension.compat_control_corner_material = global::HDL_ON_Android.Resource.Dimension.compat_control_corner_material;
-			global::Xamarin.Essentials.Resource.Dimension.compat_notification_large_icon_max_height = global::HDL_ON_Android.Resource.Dimension.compat_notification_large_icon_max_height;
-			global::Xamarin.Essentials.Resource.Dimension.compat_notification_large_icon_max_width = global::HDL_ON_Android.Resource.Dimension.compat_notification_large_icon_max_width;
-			global::Xamarin.Essentials.Resource.Dimension.notification_action_icon_size = global::HDL_ON_Android.Resource.Dimension.notification_action_icon_size;
-			global::Xamarin.Essentials.Resource.Dimension.notification_action_text_size = global::HDL_ON_Android.Resource.Dimension.notification_action_text_size;
-			global::Xamarin.Essentials.Resource.Dimension.notification_big_circle_margin = global::HDL_ON_Android.Resource.Dimension.notification_big_circle_margin;
-			global::Xamarin.Essentials.Resource.Dimension.notification_content_margin_start = global::HDL_ON_Android.Resource.Dimension.notification_content_margin_start;
-			global::Xamarin.Essentials.Resource.Dimension.notification_large_icon_height = global::HDL_ON_Android.Resource.Dimension.notification_large_icon_height;
-			global::Xamarin.Essentials.Resource.Dimension.notification_large_icon_width = global::HDL_ON_Android.Resource.Dimension.notification_large_icon_width;
-			global::Xamarin.Essentials.Resource.Dimension.notification_main_column_padding_top = global::HDL_ON_Android.Resource.Dimension.notification_main_column_padding_top;
-			global::Xamarin.Essentials.Resource.Dimension.notification_media_narrow_margin = global::HDL_ON_Android.Resource.Dimension.notification_media_narrow_margin;
-			global::Xamarin.Essentials.Resource.Dimension.notification_right_icon_size = global::HDL_ON_Android.Resource.Dimension.notification_right_icon_size;
-			global::Xamarin.Essentials.Resource.Dimension.notification_right_side_padding_top = global::HDL_ON_Android.Resource.Dimension.notification_right_side_padding_top;
-			global::Xamarin.Essentials.Resource.Dimension.notification_small_icon_background_padding = global::HDL_ON_Android.Resource.Dimension.notification_small_icon_background_padding;
-			global::Xamarin.Essentials.Resource.Dimension.notification_small_icon_size_as_large = global::HDL_ON_Android.Resource.Dimension.notification_small_icon_size_as_large;
-			global::Xamarin.Essentials.Resource.Dimension.notification_subtext_size = global::HDL_ON_Android.Resource.Dimension.notification_subtext_size;
-			global::Xamarin.Essentials.Resource.Dimension.notification_top_pad = global::HDL_ON_Android.Resource.Dimension.notification_top_pad;
-			global::Xamarin.Essentials.Resource.Dimension.notification_top_pad_large_text = global::HDL_ON_Android.Resource.Dimension.notification_top_pad_large_text;
-			global::Xamarin.Essentials.Resource.Drawable.notification_action_background = global::HDL_ON_Android.Resource.Drawable.notification_action_background;
-			global::Xamarin.Essentials.Resource.Drawable.notification_bg = global::HDL_ON_Android.Resource.Drawable.notification_bg;
-			global::Xamarin.Essentials.Resource.Drawable.notification_bg_low = global::HDL_ON_Android.Resource.Drawable.notification_bg_low;
-			global::Xamarin.Essentials.Resource.Drawable.notification_bg_low_normal = global::HDL_ON_Android.Resource.Drawable.notification_bg_low_normal;
-			global::Xamarin.Essentials.Resource.Drawable.notification_bg_low_pressed = global::HDL_ON_Android.Resource.Drawable.notification_bg_low_pressed;
-			global::Xamarin.Essentials.Resource.Drawable.notification_bg_normal = global::HDL_ON_Android.Resource.Drawable.notification_bg_normal;
-			global::Xamarin.Essentials.Resource.Drawable.notification_bg_normal_pressed = global::HDL_ON_Android.Resource.Drawable.notification_bg_normal_pressed;
-			global::Xamarin.Essentials.Resource.Drawable.notification_icon_background = global::HDL_ON_Android.Resource.Drawable.notification_icon_background;
-			global::Xamarin.Essentials.Resource.Drawable.notification_template_icon_bg = global::HDL_ON_Android.Resource.Drawable.notification_template_icon_bg;
-			global::Xamarin.Essentials.Resource.Drawable.notification_template_icon_low_bg = global::HDL_ON_Android.Resource.Drawable.notification_template_icon_low_bg;
-			global::Xamarin.Essentials.Resource.Drawable.notification_tile_bg = global::HDL_ON_Android.Resource.Drawable.notification_tile_bg;
-			global::Xamarin.Essentials.Resource.Drawable.notify_panel_notification_icon_bg = global::HDL_ON_Android.Resource.Drawable.notify_panel_notification_icon_bg;
-			global::Xamarin.Essentials.Resource.Id.accessibility_action_clickable_span = global::HDL_ON_Android.Resource.Id.accessibility_action_clickable_span;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_0 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_0;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_1 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_1;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_10 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_10;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_11 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_11;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_12 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_12;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_13 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_13;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_14 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_14;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_15 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_15;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_16 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_16;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_17 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_17;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_18 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_18;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_19 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_19;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_2 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_2;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_20 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_20;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_21 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_21;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_22 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_22;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_23 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_23;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_24 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_24;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_25 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_25;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_26 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_26;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_27 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_27;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_28 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_28;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_29 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_29;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_3 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_3;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_30 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_30;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_31 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_31;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_4 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_4;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_5 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_5;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_6 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_6;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_7 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_7;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_8 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_8;
-			global::Xamarin.Essentials.Resource.Id.accessibility_custom_action_9 = global::HDL_ON_Android.Resource.Id.accessibility_custom_action_9;
-			global::Xamarin.Essentials.Resource.Id.actions = global::HDL_ON_Android.Resource.Id.actions;
-			global::Xamarin.Essentials.Resource.Id.action_container = global::HDL_ON_Android.Resource.Id.action_container;
-			global::Xamarin.Essentials.Resource.Id.action_divider = global::HDL_ON_Android.Resource.Id.action_divider;
-			global::Xamarin.Essentials.Resource.Id.action_image = global::HDL_ON_Android.Resource.Id.action_image;
-			global::Xamarin.Essentials.Resource.Id.action_text = global::HDL_ON_Android.Resource.Id.action_text;
-			global::Xamarin.Essentials.Resource.Id.async = global::HDL_ON_Android.Resource.Id.async;
-			global::Xamarin.Essentials.Resource.Id.blocking = global::HDL_ON_Android.Resource.Id.blocking;
-			global::Xamarin.Essentials.Resource.Id.browser_actions_header_text = global::HDL_ON_Android.Resource.Id.browser_actions_header_text;
-			global::Xamarin.Essentials.Resource.Id.browser_actions_menu_items = global::HDL_ON_Android.Resource.Id.browser_actions_menu_items;
-			global::Xamarin.Essentials.Resource.Id.browser_actions_menu_item_icon = global::HDL_ON_Android.Resource.Id.browser_actions_menu_item_icon;
-			global::Xamarin.Essentials.Resource.Id.browser_actions_menu_item_text = global::HDL_ON_Android.Resource.Id.browser_actions_menu_item_text;
-			global::Xamarin.Essentials.Resource.Id.browser_actions_menu_view = global::HDL_ON_Android.Resource.Id.browser_actions_menu_view;
-			global::Xamarin.Essentials.Resource.Id.chronometer = global::HDL_ON_Android.Resource.Id.chronometer;
-			global::Xamarin.Essentials.Resource.Id.dialog_button = global::HDL_ON_Android.Resource.Id.dialog_button;
-			global::Xamarin.Essentials.Resource.Id.forever = global::HDL_ON_Android.Resource.Id.forever;
-			global::Xamarin.Essentials.Resource.Id.icon = global::HDL_ON_Android.Resource.Id.icon;
-			global::Xamarin.Essentials.Resource.Id.icon_group = global::HDL_ON_Android.Resource.Id.icon_group;
-			global::Xamarin.Essentials.Resource.Id.info = global::HDL_ON_Android.Resource.Id.info;
-			global::Xamarin.Essentials.Resource.Id.italic = global::HDL_ON_Android.Resource.Id.italic;
-			global::Xamarin.Essentials.Resource.Id.line1 = global::HDL_ON_Android.Resource.Id.line1;
-			global::Xamarin.Essentials.Resource.Id.line3 = global::HDL_ON_Android.Resource.Id.line3;
-			global::Xamarin.Essentials.Resource.Id.normal = global::HDL_ON_Android.Resource.Id.normal;
-			global::Xamarin.Essentials.Resource.Id.notification_background = global::HDL_ON_Android.Resource.Id.notification_background;
-			global::Xamarin.Essentials.Resource.Id.notification_main_column = global::HDL_ON_Android.Resource.Id.notification_main_column;
-			global::Xamarin.Essentials.Resource.Id.notification_main_column_container = global::HDL_ON_Android.Resource.Id.notification_main_column_container;
-			global::Xamarin.Essentials.Resource.Id.right_icon = global::HDL_ON_Android.Resource.Id.right_icon;
-			global::Xamarin.Essentials.Resource.Id.right_side = global::HDL_ON_Android.Resource.Id.right_side;
-			global::Xamarin.Essentials.Resource.Id.tag_accessibility_actions = global::HDL_ON_Android.Resource.Id.tag_accessibility_actions;
-			global::Xamarin.Essentials.Resource.Id.tag_accessibility_clickable_spans = global::HDL_ON_Android.Resource.Id.tag_accessibility_clickable_spans;
-			global::Xamarin.Essentials.Resource.Id.tag_accessibility_heading = global::HDL_ON_Android.Resource.Id.tag_accessibility_heading;
-			global::Xamarin.Essentials.Resource.Id.tag_accessibility_pane_title = global::HDL_ON_Android.Resource.Id.tag_accessibility_pane_title;
-			global::Xamarin.Essentials.Resource.Id.tag_screen_reader_focusable = global::HDL_ON_Android.Resource.Id.tag_screen_reader_focusable;
-			global::Xamarin.Essentials.Resource.Id.tag_transition_group = global::HDL_ON_Android.Resource.Id.tag_transition_group;
-			global::Xamarin.Essentials.Resource.Id.tag_unhandled_key_event_manager = global::HDL_ON_Android.Resource.Id.tag_unhandled_key_event_manager;
-			global::Xamarin.Essentials.Resource.Id.tag_unhandled_key_listeners = global::HDL_ON_Android.Resource.Id.tag_unhandled_key_listeners;
-			global::Xamarin.Essentials.Resource.Id.text = global::HDL_ON_Android.Resource.Id.text;
-			global::Xamarin.Essentials.Resource.Id.text2 = global::HDL_ON_Android.Resource.Id.text2;
-			global::Xamarin.Essentials.Resource.Id.time = global::HDL_ON_Android.Resource.Id.time;
-			global::Xamarin.Essentials.Resource.Id.title = global::HDL_ON_Android.Resource.Id.title;
-			global::Xamarin.Essentials.Resource.Id.view_tree_lifecycle_owner = global::HDL_ON_Android.Resource.Id.view_tree_lifecycle_owner;
-			global::Xamarin.Essentials.Resource.Integer.status_bar_notification_info_maxnum = global::HDL_ON_Android.Resource.Integer.status_bar_notification_info_maxnum;
-			global::Xamarin.Essentials.Resource.Layout.browser_actions_context_menu_page = global::HDL_ON_Android.Resource.Layout.browser_actions_context_menu_page;
-			global::Xamarin.Essentials.Resource.Layout.browser_actions_context_menu_row = global::HDL_ON_Android.Resource.Layout.browser_actions_context_menu_row;
-			global::Xamarin.Essentials.Resource.Layout.custom_dialog = global::HDL_ON_Android.Resource.Layout.custom_dialog;
-			global::Xamarin.Essentials.Resource.Layout.notification_action = global::HDL_ON_Android.Resource.Layout.notification_action;
-			global::Xamarin.Essentials.Resource.Layout.notification_action_tombstone = global::HDL_ON_Android.Resource.Layout.notification_action_tombstone;
-			global::Xamarin.Essentials.Resource.Layout.notification_template_custom_big = global::HDL_ON_Android.Resource.Layout.notification_template_custom_big;
-			global::Xamarin.Essentials.Resource.Layout.notification_template_icon_group = global::HDL_ON_Android.Resource.Layout.notification_template_icon_group;
-			global::Xamarin.Essentials.Resource.Layout.notification_template_part_chronometer = global::HDL_ON_Android.Resource.Layout.notification_template_part_chronometer;
-			global::Xamarin.Essentials.Resource.Layout.notification_template_part_time = global::HDL_ON_Android.Resource.Layout.notification_template_part_time;
-			global::Xamarin.Essentials.Resource.String.copy_toast_msg = global::HDL_ON_Android.Resource.String.copy_toast_msg;
-			global::Xamarin.Essentials.Resource.String.fallback_menu_item_copy_link = global::HDL_ON_Android.Resource.String.fallback_menu_item_copy_link;
-			global::Xamarin.Essentials.Resource.String.fallback_menu_item_open_in_browser = global::HDL_ON_Android.Resource.String.fallback_menu_item_open_in_browser;
-			global::Xamarin.Essentials.Resource.String.fallback_menu_item_share_link = global::HDL_ON_Android.Resource.String.fallback_menu_item_share_link;
-			global::Xamarin.Essentials.Resource.String.status_bar_notification_info_overflow = global::HDL_ON_Android.Resource.String.status_bar_notification_info_overflow;
-			global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification;
-			global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification_Info = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification_Info;
-			global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification_Line2 = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification_Line2;
-			global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification_Time = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification_Time;
-			global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification_Title = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification_Title;
-			global::Xamarin.Essentials.Resource.Style.Widget_Compat_NotificationActionContainer = global::HDL_ON_Android.Resource.Style.Widget_Compat_NotificationActionContainer;
-			global::Xamarin.Essentials.Resource.Style.Widget_Compat_NotificationActionText = global::HDL_ON_Android.Resource.Style.Widget_Compat_NotificationActionText;
-			global::Xamarin.Essentials.Resource.Styleable.ColorStateListItem = global::HDL_ON_Android.Resource.Styleable.ColorStateListItem;
-			global::Xamarin.Essentials.Resource.Styleable.ColorStateListItem_alpha = global::HDL_ON_Android.Resource.Styleable.ColorStateListItem_alpha;
-			global::Xamarin.Essentials.Resource.Styleable.ColorStateListItem_android_alpha = global::HDL_ON_Android.Resource.Styleable.ColorStateListItem_android_alpha;
-			global::Xamarin.Essentials.Resource.Styleable.ColorStateListItem_android_color = global::HDL_ON_Android.Resource.Styleable.ColorStateListItem_android_color;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily = global::HDL_ON_Android.Resource.Styleable.FontFamily;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_android_font = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_android_font;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_android_fontStyle = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_android_fontStyle;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_android_fontVariationSettings = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_android_fontVariationSettings;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_android_fontWeight = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_android_fontWeight;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_android_ttcIndex = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_android_ttcIndex;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_font = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_font;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontStyle = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontStyle;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontVariationSettings = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontVariationSettings;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontWeight = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontWeight;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_ttcIndex = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_ttcIndex;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderAuthority = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderAuthority;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderCerts = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderCerts;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderFetchStrategy;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderFetchTimeout;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderPackage = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderPackage;
-			global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderQuery = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderQuery;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor = global::HDL_ON_Android.Resource.Styleable.GradientColor;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColorItem = global::HDL_ON_Android.Resource.Styleable.GradientColorItem;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColorItem_android_color = global::HDL_ON_Android.Resource.Styleable.GradientColorItem_android_color;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColorItem_android_offset = global::HDL_ON_Android.Resource.Styleable.GradientColorItem_android_offset;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_centerColor = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_centerColor;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_centerX = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_centerX;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_centerY = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_centerY;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_endColor = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_endColor;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_endX = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_endX;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_endY = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_endY;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_gradientRadius = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_gradientRadius;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_startColor = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_startColor;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_startX = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_startX;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_startY = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_startY;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_tileMode = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_tileMode;
-			global::Xamarin.Essentials.Resource.Styleable.GradientColor_android_type = global::HDL_ON_Android.Resource.Styleable.GradientColor_android_type;
-			global::Xamarin.Essentials.Resource.Xml.image_share_filepaths = global::HDL_ON_Android.Resource.Xml.image_share_filepaths;
-			global::Xamarin.Essentials.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::HDL_ON_Android.Resource.Xml.xamarin_essentials_fileprovider_file_paths;
 			global::ZXing.Mobile.Resource.Id.contentFrame = global::HDL_ON_Android.Resource.Id.contentFrame;
 			global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::HDL_ON_Android.Resource.Layout.zxingscanneractivitylayout;
 			global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::HDL_ON_Android.Resource.Layout.zxingscannerfragmentlayout;
@@ -5757,2119 +5566,2110 @@
 			public const int dim_foreground_material_light = 2131099786;
 			
 			// aapt resource value: 0x7F06008B
-			public const int emui_color_gray_1 = 2131099787;
+			public const int error_color_material_dark = 2131099787;
 			
 			// aapt resource value: 0x7F06008C
-			public const int emui_color_gray_10 = 2131099788;
+			public const int error_color_material_light = 2131099788;
 			
 			// aapt resource value: 0x7F06008D
-			public const int emui_color_gray_7 = 2131099789;
+			public const int foreground_material_dark = 2131099789;
 			
 			// aapt resource value: 0x7F06008E
-			public const int error_color_material_dark = 2131099790;
+			public const int foreground_material_light = 2131099790;
 			
 			// aapt resource value: 0x7F06008F
-			public const int error_color_material_light = 2131099791;
+			public const int gd_top_view = 2131099791;
 			
 			// aapt resource value: 0x7F060090
-			public const int foreground_material_dark = 2131099792;
+			public const int highlighted_text_material_dark = 2131099792;
 			
 			// aapt resource value: 0x7F060091
-			public const int foreground_material_light = 2131099793;
+			public const int highlighted_text_material_light = 2131099793;
 			
 			// aapt resource value: 0x7F060092
-			public const int gd_top_view = 2131099794;
+			public const int ic_launcher_background = 2131099794;
 			
 			// aapt resource value: 0x7F060093
-			public const int highlighted_text_material_dark = 2131099795;
+			public const int lc_color_4ea7f2 = 2131099795;
 			
 			// aapt resource value: 0x7F060094
-			public const int highlighted_text_material_light = 2131099796;
+			public const int lc_demo_color_000000 = 2131099796;
 			
 			// aapt resource value: 0x7F060095
-			public const int ic_launcher_background = 2131099797;
+			public const int lc_demo_color_00ffffff = 2131099797;
 			
 			// aapt resource value: 0x7F060096
-			public const int lc_color_4ea7f2 = 2131099798;
+			public const int lc_demo_color_0B8C0D = 2131099798;
 			
 			// aapt resource value: 0x7F060097
-			public const int lc_demo_color_000000 = 2131099799;
+			public const int lc_demo_color_2c2c2c = 2131099799;
 			
 			// aapt resource value: 0x7F060098
-			public const int lc_demo_color_00ffffff = 2131099800;
+			public const int lc_demo_color_442c2c2c = 2131099800;
 			
 			// aapt resource value: 0x7F060099
-			public const int lc_demo_color_0B8C0D = 2131099801;
+			public const int lc_demo_color_66000000 = 2131099801;
 			
 			// aapt resource value: 0x7F06009A
-			public const int lc_demo_color_2c2c2c = 2131099802;
+			public const int lc_demo_color_66f18d00 = 2131099802;
 			
 			// aapt resource value: 0x7F06009B
-			public const int lc_demo_color_442c2c2c = 2131099803;
+			public const int lc_demo_color_880B8C0D = 2131099803;
 			
 			// aapt resource value: 0x7F06009C
-			public const int lc_demo_color_66000000 = 2131099804;
-			
-			// aapt resource value: 0x7F06009D
-			public const int lc_demo_color_66f18d00 = 2131099805;
+			public const int lc_demo_color_8f8f8f = 2131099804;
 			
 			// aapt resource value: 0x7F06009E
-			public const int lc_demo_color_880B8C0D = 2131099806;
+			public const int lc_demo_color_d9d9d9 = 2131099806;
 			
 			// aapt resource value: 0x7F06009F
-			public const int lc_demo_color_8f8f8f = 2131099807;
-			
-			// aapt resource value: 0x7F0600A1
-			public const int lc_demo_color_d9d9d9 = 2131099809;
-			
-			// aapt resource value: 0x7F0600A2
-			public const int lc_demo_color_f18d00 = 2131099810;
-			
-			// aapt resource value: 0x7F0600A3
-			public const int lc_demo_color_f2f2f2 = 2131099811;
+			public const int lc_demo_color_f18d00 = 2131099807;
 			
 			// aapt resource value: 0x7F0600A0
-			public const int lc_demo_color_FF4F4F = 2131099808;
+			public const int lc_demo_color_f2f2f2 = 2131099808;
+			
+			// aapt resource value: 0x7F06009D
+			public const int lc_demo_color_FF4F4F = 2131099805;
+			
+			// aapt resource value: 0x7F0600A1
+			public const int lc_demo_color_ffffff = 2131099809;
+			
+			// aapt resource value: 0x7F0600A2
+			public const int lpsdk_app_bg = 2131099810;
+			
+			// aapt resource value: 0x7F0600A3
+			public const int lpsdk_app_line = 2131099811;
 			
 			// aapt resource value: 0x7F0600A4
-			public const int lc_demo_color_ffffff = 2131099812;
+			public const int lpsdk_color_white = 2131099812;
 			
 			// aapt resource value: 0x7F0600A5
-			public const int lpsdk_app_bg = 2131099813;
+			public const int lpsdk_textColor = 2131099813;
 			
 			// aapt resource value: 0x7F0600A6
-			public const int lpsdk_app_line = 2131099814;
+			public const int m3_appbar_overlay_color = 2131099814;
 			
 			// aapt resource value: 0x7F0600A7
-			public const int lpsdk_color_white = 2131099815;
+			public const int m3_assist_chip_icon_tint_color = 2131099815;
 			
 			// aapt resource value: 0x7F0600A8
-			public const int lpsdk_textColor = 2131099816;
+			public const int m3_assist_chip_stroke_color = 2131099816;
 			
 			// aapt resource value: 0x7F0600A9
-			public const int m3_appbar_overlay_color = 2131099817;
+			public const int m3_bottom_sheet_drag_handle_color = 2131099817;
 			
 			// aapt resource value: 0x7F0600AA
-			public const int m3_assist_chip_icon_tint_color = 2131099818;
+			public const int m3_button_background_color_selector = 2131099818;
 			
 			// aapt resource value: 0x7F0600AB
-			public const int m3_assist_chip_stroke_color = 2131099819;
+			public const int m3_button_foreground_color_selector = 2131099819;
 			
 			// aapt resource value: 0x7F0600AC
-			public const int m3_bottom_sheet_drag_handle_color = 2131099820;
+			public const int m3_button_outline_color_selector = 2131099820;
 			
 			// aapt resource value: 0x7F0600AD
-			public const int m3_button_background_color_selector = 2131099821;
+			public const int m3_button_ripple_color = 2131099821;
 			
 			// aapt resource value: 0x7F0600AE
-			public const int m3_button_foreground_color_selector = 2131099822;
+			public const int m3_button_ripple_color_selector = 2131099822;
 			
 			// aapt resource value: 0x7F0600AF
-			public const int m3_button_outline_color_selector = 2131099823;
+			public const int m3_calendar_item_disabled_text = 2131099823;
 			
 			// aapt resource value: 0x7F0600B0
-			public const int m3_button_ripple_color = 2131099824;
+			public const int m3_calendar_item_stroke_color = 2131099824;
 			
 			// aapt resource value: 0x7F0600B1
-			public const int m3_button_ripple_color_selector = 2131099825;
+			public const int m3_card_foreground_color = 2131099825;
 			
 			// aapt resource value: 0x7F0600B2
-			public const int m3_calendar_item_disabled_text = 2131099826;
+			public const int m3_card_ripple_color = 2131099826;
 			
 			// aapt resource value: 0x7F0600B3
-			public const int m3_calendar_item_stroke_color = 2131099827;
+			public const int m3_card_stroke_color = 2131099827;
 			
 			// aapt resource value: 0x7F0600B4
-			public const int m3_card_foreground_color = 2131099828;
+			public const int m3_checkbox_button_icon_tint = 2131099828;
 			
 			// aapt resource value: 0x7F0600B5
-			public const int m3_card_ripple_color = 2131099829;
+			public const int m3_checkbox_button_tint = 2131099829;
 			
 			// aapt resource value: 0x7F0600B6
-			public const int m3_card_stroke_color = 2131099830;
+			public const int m3_chip_assist_text_color = 2131099830;
 			
 			// aapt resource value: 0x7F0600B7
-			public const int m3_checkbox_button_icon_tint = 2131099831;
+			public const int m3_chip_background_color = 2131099831;
 			
 			// aapt resource value: 0x7F0600B8
-			public const int m3_checkbox_button_tint = 2131099832;
+			public const int m3_chip_ripple_color = 2131099832;
 			
 			// aapt resource value: 0x7F0600B9
-			public const int m3_chip_assist_text_color = 2131099833;
+			public const int m3_chip_stroke_color = 2131099833;
 			
 			// aapt resource value: 0x7F0600BA
-			public const int m3_chip_background_color = 2131099834;
+			public const int m3_chip_text_color = 2131099834;
 			
 			// aapt resource value: 0x7F0600BB
-			public const int m3_chip_ripple_color = 2131099835;
+			public const int m3_dark_default_color_primary_text = 2131099835;
 			
 			// aapt resource value: 0x7F0600BC
-			public const int m3_chip_stroke_color = 2131099836;
+			public const int m3_dark_default_color_secondary_text = 2131099836;
 			
 			// aapt resource value: 0x7F0600BD
-			public const int m3_chip_text_color = 2131099837;
+			public const int m3_dark_highlighted_text = 2131099837;
 			
 			// aapt resource value: 0x7F0600BE
-			public const int m3_dark_default_color_primary_text = 2131099838;
+			public const int m3_dark_hint_foreground = 2131099838;
 			
 			// aapt resource value: 0x7F0600BF
-			public const int m3_dark_default_color_secondary_text = 2131099839;
+			public const int m3_dark_primary_text_disable_only = 2131099839;
 			
 			// aapt resource value: 0x7F0600C0
-			public const int m3_dark_highlighted_text = 2131099840;
+			public const int m3_default_color_primary_text = 2131099840;
 			
 			// aapt resource value: 0x7F0600C1
-			public const int m3_dark_hint_foreground = 2131099841;
+			public const int m3_default_color_secondary_text = 2131099841;
 			
 			// aapt resource value: 0x7F0600C2
-			public const int m3_dark_primary_text_disable_only = 2131099842;
+			public const int m3_dynamic_dark_default_color_primary_text = 2131099842;
 			
 			// aapt resource value: 0x7F0600C3
-			public const int m3_default_color_primary_text = 2131099843;
+			public const int m3_dynamic_dark_default_color_secondary_text = 2131099843;
 			
 			// aapt resource value: 0x7F0600C4
-			public const int m3_default_color_secondary_text = 2131099844;
+			public const int m3_dynamic_dark_highlighted_text = 2131099844;
 			
 			// aapt resource value: 0x7F0600C5
-			public const int m3_dynamic_dark_default_color_primary_text = 2131099845;
+			public const int m3_dynamic_dark_hint_foreground = 2131099845;
 			
 			// aapt resource value: 0x7F0600C6
-			public const int m3_dynamic_dark_default_color_secondary_text = 2131099846;
+			public const int m3_dynamic_dark_primary_text_disable_only = 2131099846;
 			
 			// aapt resource value: 0x7F0600C7
-			public const int m3_dynamic_dark_highlighted_text = 2131099847;
+			public const int m3_dynamic_default_color_primary_text = 2131099847;
 			
 			// aapt resource value: 0x7F0600C8
-			public const int m3_dynamic_dark_hint_foreground = 2131099848;
+			public const int m3_dynamic_default_color_secondary_text = 2131099848;
 			
 			// aapt resource value: 0x7F0600C9
-			public const int m3_dynamic_dark_primary_text_disable_only = 2131099849;
+			public const int m3_dynamic_highlighted_text = 2131099849;
 			
 			// aapt resource value: 0x7F0600CA
-			public const int m3_dynamic_default_color_primary_text = 2131099850;
+			public const int m3_dynamic_hint_foreground = 2131099850;
 			
 			// aapt resource value: 0x7F0600CB
-			public const int m3_dynamic_default_color_secondary_text = 2131099851;
+			public const int m3_dynamic_primary_text_disable_only = 2131099851;
 			
 			// aapt resource value: 0x7F0600CC
-			public const int m3_dynamic_highlighted_text = 2131099852;
+			public const int m3_efab_ripple_color_selector = 2131099852;
 			
 			// aapt resource value: 0x7F0600CD
-			public const int m3_dynamic_hint_foreground = 2131099853;
+			public const int m3_elevated_chip_background_color = 2131099853;
 			
 			// aapt resource value: 0x7F0600CE
-			public const int m3_dynamic_primary_text_disable_only = 2131099854;
+			public const int m3_fab_efab_background_color_selector = 2131099854;
 			
 			// aapt resource value: 0x7F0600CF
-			public const int m3_efab_ripple_color_selector = 2131099855;
+			public const int m3_fab_efab_foreground_color_selector = 2131099855;
 			
 			// aapt resource value: 0x7F0600D0
-			public const int m3_elevated_chip_background_color = 2131099856;
+			public const int m3_fab_ripple_color_selector = 2131099856;
 			
 			// aapt resource value: 0x7F0600D1
-			public const int m3_fab_efab_background_color_selector = 2131099857;
+			public const int m3_filled_icon_button_container_color_selector = 2131099857;
 			
 			// aapt resource value: 0x7F0600D2
-			public const int m3_fab_efab_foreground_color_selector = 2131099858;
+			public const int m3_highlighted_text = 2131099858;
 			
 			// aapt resource value: 0x7F0600D3
-			public const int m3_fab_ripple_color_selector = 2131099859;
+			public const int m3_hint_foreground = 2131099859;
 			
 			// aapt resource value: 0x7F0600D4
-			public const int m3_filled_icon_button_container_color_selector = 2131099860;
+			public const int m3_icon_button_icon_color_selector = 2131099860;
 			
 			// aapt resource value: 0x7F0600D5
-			public const int m3_highlighted_text = 2131099861;
+			public const int m3_navigation_bar_item_with_indicator_icon_tint = 2131099861;
 			
 			// aapt resource value: 0x7F0600D6
-			public const int m3_hint_foreground = 2131099862;
+			public const int m3_navigation_bar_item_with_indicator_label_tint = 2131099862;
 			
 			// aapt resource value: 0x7F0600D7
-			public const int m3_icon_button_icon_color_selector = 2131099863;
+			public const int m3_navigation_bar_ripple_color_selector = 2131099863;
 			
 			// aapt resource value: 0x7F0600D8
-			public const int m3_navigation_bar_item_with_indicator_icon_tint = 2131099864;
+			public const int m3_navigation_item_background_color = 2131099864;
 			
 			// aapt resource value: 0x7F0600D9
-			public const int m3_navigation_bar_item_with_indicator_label_tint = 2131099865;
+			public const int m3_navigation_item_icon_tint = 2131099865;
 			
 			// aapt resource value: 0x7F0600DA
-			public const int m3_navigation_bar_ripple_color_selector = 2131099866;
+			public const int m3_navigation_item_ripple_color = 2131099866;
 			
 			// aapt resource value: 0x7F0600DB
-			public const int m3_navigation_item_background_color = 2131099867;
+			public const int m3_navigation_item_text_color = 2131099867;
 			
 			// aapt resource value: 0x7F0600DC
-			public const int m3_navigation_item_icon_tint = 2131099868;
+			public const int m3_navigation_rail_item_with_indicator_icon_tint = 2131099868;
 			
 			// aapt resource value: 0x7F0600DD
-			public const int m3_navigation_item_ripple_color = 2131099869;
+			public const int m3_navigation_rail_item_with_indicator_label_tint = 2131099869;
 			
 			// aapt resource value: 0x7F0600DE
-			public const int m3_navigation_item_text_color = 2131099870;
+			public const int m3_navigation_rail_ripple_color_selector = 2131099870;
 			
 			// aapt resource value: 0x7F0600DF
-			public const int m3_navigation_rail_item_with_indicator_icon_tint = 2131099871;
+			public const int m3_popupmenu_overlay_color = 2131099871;
 			
 			// aapt resource value: 0x7F0600E0
-			public const int m3_navigation_rail_item_with_indicator_label_tint = 2131099872;
+			public const int m3_primary_text_disable_only = 2131099872;
 			
 			// aapt resource value: 0x7F0600E1
-			public const int m3_navigation_rail_ripple_color_selector = 2131099873;
+			public const int m3_radiobutton_button_tint = 2131099873;
 			
 			// aapt resource value: 0x7F0600E2
-			public const int m3_popupmenu_overlay_color = 2131099874;
+			public const int m3_radiobutton_ripple_tint = 2131099874;
 			
 			// aapt resource value: 0x7F0600E3
-			public const int m3_primary_text_disable_only = 2131099875;
+			public const int m3_ref_palette_black = 2131099875;
 			
 			// aapt resource value: 0x7F0600E4
-			public const int m3_radiobutton_button_tint = 2131099876;
+			public const int m3_ref_palette_dynamic_neutral0 = 2131099876;
 			
 			// aapt resource value: 0x7F0600E5
-			public const int m3_radiobutton_ripple_tint = 2131099877;
+			public const int m3_ref_palette_dynamic_neutral10 = 2131099877;
 			
 			// aapt resource value: 0x7F0600E6
-			public const int m3_ref_palette_black = 2131099878;
+			public const int m3_ref_palette_dynamic_neutral100 = 2131099878;
 			
 			// aapt resource value: 0x7F0600E7
-			public const int m3_ref_palette_dynamic_neutral0 = 2131099879;
+			public const int m3_ref_palette_dynamic_neutral12 = 2131099879;
 			
 			// aapt resource value: 0x7F0600E8
-			public const int m3_ref_palette_dynamic_neutral10 = 2131099880;
+			public const int m3_ref_palette_dynamic_neutral17 = 2131099880;
 			
 			// aapt resource value: 0x7F0600E9
-			public const int m3_ref_palette_dynamic_neutral100 = 2131099881;
+			public const int m3_ref_palette_dynamic_neutral20 = 2131099881;
 			
 			// aapt resource value: 0x7F0600EA
-			public const int m3_ref_palette_dynamic_neutral12 = 2131099882;
+			public const int m3_ref_palette_dynamic_neutral22 = 2131099882;
 			
 			// aapt resource value: 0x7F0600EB
-			public const int m3_ref_palette_dynamic_neutral17 = 2131099883;
+			public const int m3_ref_palette_dynamic_neutral24 = 2131099883;
 			
 			// aapt resource value: 0x7F0600EC
-			public const int m3_ref_palette_dynamic_neutral20 = 2131099884;
+			public const int m3_ref_palette_dynamic_neutral30 = 2131099884;
 			
 			// aapt resource value: 0x7F0600ED
-			public const int m3_ref_palette_dynamic_neutral22 = 2131099885;
+			public const int m3_ref_palette_dynamic_neutral4 = 2131099885;
 			
 			// aapt resource value: 0x7F0600EE
-			public const int m3_ref_palette_dynamic_neutral24 = 2131099886;
+			public const int m3_ref_palette_dynamic_neutral40 = 2131099886;
 			
 			// aapt resource value: 0x7F0600EF
-			public const int m3_ref_palette_dynamic_neutral30 = 2131099887;
+			public const int m3_ref_palette_dynamic_neutral50 = 2131099887;
 			
 			// aapt resource value: 0x7F0600F0
-			public const int m3_ref_palette_dynamic_neutral4 = 2131099888;
+			public const int m3_ref_palette_dynamic_neutral6 = 2131099888;
 			
 			// aapt resource value: 0x7F0600F1
-			public const int m3_ref_palette_dynamic_neutral40 = 2131099889;
+			public const int m3_ref_palette_dynamic_neutral60 = 2131099889;
 			
 			// aapt resource value: 0x7F0600F2
-			public const int m3_ref_palette_dynamic_neutral50 = 2131099890;
+			public const int m3_ref_palette_dynamic_neutral70 = 2131099890;
 			
 			// aapt resource value: 0x7F0600F3
-			public const int m3_ref_palette_dynamic_neutral6 = 2131099891;
+			public const int m3_ref_palette_dynamic_neutral80 = 2131099891;
 			
 			// aapt resource value: 0x7F0600F4
-			public const int m3_ref_palette_dynamic_neutral60 = 2131099892;
+			public const int m3_ref_palette_dynamic_neutral87 = 2131099892;
 			
 			// aapt resource value: 0x7F0600F5
-			public const int m3_ref_palette_dynamic_neutral70 = 2131099893;
+			public const int m3_ref_palette_dynamic_neutral90 = 2131099893;
 			
 			// aapt resource value: 0x7F0600F6
-			public const int m3_ref_palette_dynamic_neutral80 = 2131099894;
+			public const int m3_ref_palette_dynamic_neutral92 = 2131099894;
 			
 			// aapt resource value: 0x7F0600F7
-			public const int m3_ref_palette_dynamic_neutral87 = 2131099895;
+			public const int m3_ref_palette_dynamic_neutral94 = 2131099895;
 			
 			// aapt resource value: 0x7F0600F8
-			public const int m3_ref_palette_dynamic_neutral90 = 2131099896;
+			public const int m3_ref_palette_dynamic_neutral95 = 2131099896;
 			
 			// aapt resource value: 0x7F0600F9
-			public const int m3_ref_palette_dynamic_neutral92 = 2131099897;
+			public const int m3_ref_palette_dynamic_neutral96 = 2131099897;
 			
 			// aapt resource value: 0x7F0600FA
-			public const int m3_ref_palette_dynamic_neutral94 = 2131099898;
+			public const int m3_ref_palette_dynamic_neutral98 = 2131099898;
 			
 			// aapt resource value: 0x7F0600FB
-			public const int m3_ref_palette_dynamic_neutral95 = 2131099899;
+			public const int m3_ref_palette_dynamic_neutral99 = 2131099899;
 			
 			// aapt resource value: 0x7F0600FC
-			public const int m3_ref_palette_dynamic_neutral96 = 2131099900;
+			public const int m3_ref_palette_dynamic_neutral_variant0 = 2131099900;
 			
 			// aapt resource value: 0x7F0600FD
-			public const int m3_ref_palette_dynamic_neutral98 = 2131099901;
+			public const int m3_ref_palette_dynamic_neutral_variant10 = 2131099901;
 			
 			// aapt resource value: 0x7F0600FE
-			public const int m3_ref_palette_dynamic_neutral99 = 2131099902;
+			public const int m3_ref_palette_dynamic_neutral_variant100 = 2131099902;
 			
 			// aapt resource value: 0x7F0600FF
-			public const int m3_ref_palette_dynamic_neutral_variant0 = 2131099903;
+			public const int m3_ref_palette_dynamic_neutral_variant20 = 2131099903;
 			
 			// aapt resource value: 0x7F060100
-			public const int m3_ref_palette_dynamic_neutral_variant10 = 2131099904;
+			public const int m3_ref_palette_dynamic_neutral_variant30 = 2131099904;
 			
 			// aapt resource value: 0x7F060101
-			public const int m3_ref_palette_dynamic_neutral_variant100 = 2131099905;
+			public const int m3_ref_palette_dynamic_neutral_variant40 = 2131099905;
 			
 			// aapt resource value: 0x7F060102
-			public const int m3_ref_palette_dynamic_neutral_variant20 = 2131099906;
+			public const int m3_ref_palette_dynamic_neutral_variant50 = 2131099906;
 			
 			// aapt resource value: 0x7F060103
-			public const int m3_ref_palette_dynamic_neutral_variant30 = 2131099907;
+			public const int m3_ref_palette_dynamic_neutral_variant60 = 2131099907;
 			
 			// aapt resource value: 0x7F060104
-			public const int m3_ref_palette_dynamic_neutral_variant40 = 2131099908;
+			public const int m3_ref_palette_dynamic_neutral_variant70 = 2131099908;
 			
 			// aapt resource value: 0x7F060105
-			public const int m3_ref_palette_dynamic_neutral_variant50 = 2131099909;
+			public const int m3_ref_palette_dynamic_neutral_variant80 = 2131099909;
 			
 			// aapt resource value: 0x7F060106
-			public const int m3_ref_palette_dynamic_neutral_variant60 = 2131099910;
+			public const int m3_ref_palette_dynamic_neutral_variant90 = 2131099910;
 			
 			// aapt resource value: 0x7F060107
-			public const int m3_ref_palette_dynamic_neutral_variant70 = 2131099911;
+			public const int m3_ref_palette_dynamic_neutral_variant95 = 2131099911;
 			
 			// aapt resource value: 0x7F060108
-			public const int m3_ref_palette_dynamic_neutral_variant80 = 2131099912;
+			public const int m3_ref_palette_dynamic_neutral_variant99 = 2131099912;
 			
 			// aapt resource value: 0x7F060109
-			public const int m3_ref_palette_dynamic_neutral_variant90 = 2131099913;
+			public const int m3_ref_palette_dynamic_primary0 = 2131099913;
 			
 			// aapt resource value: 0x7F06010A
-			public const int m3_ref_palette_dynamic_neutral_variant95 = 2131099914;
+			public const int m3_ref_palette_dynamic_primary10 = 2131099914;
 			
 			// aapt resource value: 0x7F06010B
-			public const int m3_ref_palette_dynamic_neutral_variant99 = 2131099915;
+			public const int m3_ref_palette_dynamic_primary100 = 2131099915;
 			
 			// aapt resource value: 0x7F06010C
-			public const int m3_ref_palette_dynamic_primary0 = 2131099916;
+			public const int m3_ref_palette_dynamic_primary20 = 2131099916;
 			
 			// aapt resource value: 0x7F06010D
-			public const int m3_ref_palette_dynamic_primary10 = 2131099917;
+			public const int m3_ref_palette_dynamic_primary30 = 2131099917;
 			
 			// aapt resource value: 0x7F06010E
-			public const int m3_ref_palette_dynamic_primary100 = 2131099918;
+			public const int m3_ref_palette_dynamic_primary40 = 2131099918;
 			
 			// aapt resource value: 0x7F06010F
-			public const int m3_ref_palette_dynamic_primary20 = 2131099919;
+			public const int m3_ref_palette_dynamic_primary50 = 2131099919;
 			
 			// aapt resource value: 0x7F060110
-			public const int m3_ref_palette_dynamic_primary30 = 2131099920;
+			public const int m3_ref_palette_dynamic_primary60 = 2131099920;
 			
 			// aapt resource value: 0x7F060111
-			public const int m3_ref_palette_dynamic_primary40 = 2131099921;
+			public const int m3_ref_palette_dynamic_primary70 = 2131099921;
 			
 			// aapt resource value: 0x7F060112
-			public const int m3_ref_palette_dynamic_primary50 = 2131099922;
+			public const int m3_ref_palette_dynamic_primary80 = 2131099922;
 			
 			// aapt resource value: 0x7F060113
-			public const int m3_ref_palette_dynamic_primary60 = 2131099923;
+			public const int m3_ref_palette_dynamic_primary90 = 2131099923;
 			
 			// aapt resource value: 0x7F060114
-			public const int m3_ref_palette_dynamic_primary70 = 2131099924;
+			public const int m3_ref_palette_dynamic_primary95 = 2131099924;
 			
 			// aapt resource value: 0x7F060115
-			public const int m3_ref_palette_dynamic_primary80 = 2131099925;
+			public const int m3_ref_palette_dynamic_primary99 = 2131099925;
 			
 			// aapt resource value: 0x7F060116
-			public const int m3_ref_palette_dynamic_primary90 = 2131099926;
+			public const int m3_ref_palette_dynamic_secondary0 = 2131099926;
 			
 			// aapt resource value: 0x7F060117
-			public const int m3_ref_palette_dynamic_primary95 = 2131099927;
+			public const int m3_ref_palette_dynamic_secondary10 = 2131099927;
 			
 			// aapt resource value: 0x7F060118
-			public const int m3_ref_palette_dynamic_primary99 = 2131099928;
+			public const int m3_ref_palette_dynamic_secondary100 = 2131099928;
 			
 			// aapt resource value: 0x7F060119
-			public const int m3_ref_palette_dynamic_secondary0 = 2131099929;
+			public const int m3_ref_palette_dynamic_secondary20 = 2131099929;
 			
 			// aapt resource value: 0x7F06011A
-			public const int m3_ref_palette_dynamic_secondary10 = 2131099930;
+			public const int m3_ref_palette_dynamic_secondary30 = 2131099930;
 			
 			// aapt resource value: 0x7F06011B
-			public const int m3_ref_palette_dynamic_secondary100 = 2131099931;
+			public const int m3_ref_palette_dynamic_secondary40 = 2131099931;
 			
 			// aapt resource value: 0x7F06011C
-			public const int m3_ref_palette_dynamic_secondary20 = 2131099932;
+			public const int m3_ref_palette_dynamic_secondary50 = 2131099932;
 			
 			// aapt resource value: 0x7F06011D
-			public const int m3_ref_palette_dynamic_secondary30 = 2131099933;
+			public const int m3_ref_palette_dynamic_secondary60 = 2131099933;
 			
 			// aapt resource value: 0x7F06011E
-			public const int m3_ref_palette_dynamic_secondary40 = 2131099934;
+			public const int m3_ref_palette_dynamic_secondary70 = 2131099934;
 			
 			// aapt resource value: 0x7F06011F
-			public const int m3_ref_palette_dynamic_secondary50 = 2131099935;
+			public const int m3_ref_palette_dynamic_secondary80 = 2131099935;
 			
 			// aapt resource value: 0x7F060120
-			public const int m3_ref_palette_dynamic_secondary60 = 2131099936;
+			public const int m3_ref_palette_dynamic_secondary90 = 2131099936;
 			
 			// aapt resource value: 0x7F060121
-			public const int m3_ref_palette_dynamic_secondary70 = 2131099937;
+			public const int m3_ref_palette_dynamic_secondary95 = 2131099937;
 			
 			// aapt resource value: 0x7F060122
-			public const int m3_ref_palette_dynamic_secondary80 = 2131099938;
+			public const int m3_ref_palette_dynamic_secondary99 = 2131099938;
 			
 			// aapt resource value: 0x7F060123
-			public const int m3_ref_palette_dynamic_secondary90 = 2131099939;
+			public const int m3_ref_palette_dynamic_tertiary0 = 2131099939;
 			
 			// aapt resource value: 0x7F060124
-			public const int m3_ref_palette_dynamic_secondary95 = 2131099940;
+			public const int m3_ref_palette_dynamic_tertiary10 = 2131099940;
 			
 			// aapt resource value: 0x7F060125
-			public const int m3_ref_palette_dynamic_secondary99 = 2131099941;
+			public const int m3_ref_palette_dynamic_tertiary100 = 2131099941;
 			
 			// aapt resource value: 0x7F060126
-			public const int m3_ref_palette_dynamic_tertiary0 = 2131099942;
+			public const int m3_ref_palette_dynamic_tertiary20 = 2131099942;
 			
 			// aapt resource value: 0x7F060127
-			public const int m3_ref_palette_dynamic_tertiary10 = 2131099943;
+			public const int m3_ref_palette_dynamic_tertiary30 = 2131099943;
 			
 			// aapt resource value: 0x7F060128
-			public const int m3_ref_palette_dynamic_tertiary100 = 2131099944;
+			public const int m3_ref_palette_dynamic_tertiary40 = 2131099944;
 			
 			// aapt resource value: 0x7F060129
-			public const int m3_ref_palette_dynamic_tertiary20 = 2131099945;
+			public const int m3_ref_palette_dynamic_tertiary50 = 2131099945;
 			
 			// aapt resource value: 0x7F06012A
-			public const int m3_ref_palette_dynamic_tertiary30 = 2131099946;
+			public const int m3_ref_palette_dynamic_tertiary60 = 2131099946;
 			
 			// aapt resource value: 0x7F06012B
-			public const int m3_ref_palette_dynamic_tertiary40 = 2131099947;
+			public const int m3_ref_palette_dynamic_tertiary70 = 2131099947;
 			
 			// aapt resource value: 0x7F06012C
-			public const int m3_ref_palette_dynamic_tertiary50 = 2131099948;
+			public const int m3_ref_palette_dynamic_tertiary80 = 2131099948;
 			
 			// aapt resource value: 0x7F06012D
-			public const int m3_ref_palette_dynamic_tertiary60 = 2131099949;
+			public const int m3_ref_palette_dynamic_tertiary90 = 2131099949;
 			
 			// aapt resource value: 0x7F06012E
-			public const int m3_ref_palette_dynamic_tertiary70 = 2131099950;
+			public const int m3_ref_palette_dynamic_tertiary95 = 2131099950;
 			
 			// aapt resource value: 0x7F06012F
-			public const int m3_ref_palette_dynamic_tertiary80 = 2131099951;
+			public const int m3_ref_palette_dynamic_tertiary99 = 2131099951;
 			
 			// aapt resource value: 0x7F060130
-			public const int m3_ref_palette_dynamic_tertiary90 = 2131099952;
+			public const int m3_ref_palette_error0 = 2131099952;
 			
 			// aapt resource value: 0x7F060131
-			public const int m3_ref_palette_dynamic_tertiary95 = 2131099953;
+			public const int m3_ref_palette_error10 = 2131099953;
 			
 			// aapt resource value: 0x7F060132
-			public const int m3_ref_palette_dynamic_tertiary99 = 2131099954;
+			public const int m3_ref_palette_error100 = 2131099954;
 			
 			// aapt resource value: 0x7F060133
-			public const int m3_ref_palette_error0 = 2131099955;
+			public const int m3_ref_palette_error20 = 2131099955;
 			
 			// aapt resource value: 0x7F060134
-			public const int m3_ref_palette_error10 = 2131099956;
+			public const int m3_ref_palette_error30 = 2131099956;
 			
 			// aapt resource value: 0x7F060135
-			public const int m3_ref_palette_error100 = 2131099957;
+			public const int m3_ref_palette_error40 = 2131099957;
 			
 			// aapt resource value: 0x7F060136
-			public const int m3_ref_palette_error20 = 2131099958;
+			public const int m3_ref_palette_error50 = 2131099958;
 			
 			// aapt resource value: 0x7F060137
-			public const int m3_ref_palette_error30 = 2131099959;
+			public const int m3_ref_palette_error60 = 2131099959;
 			
 			// aapt resource value: 0x7F060138
-			public const int m3_ref_palette_error40 = 2131099960;
+			public const int m3_ref_palette_error70 = 2131099960;
 			
 			// aapt resource value: 0x7F060139
-			public const int m3_ref_palette_error50 = 2131099961;
+			public const int m3_ref_palette_error80 = 2131099961;
 			
 			// aapt resource value: 0x7F06013A
-			public const int m3_ref_palette_error60 = 2131099962;
+			public const int m3_ref_palette_error90 = 2131099962;
 			
 			// aapt resource value: 0x7F06013B
-			public const int m3_ref_palette_error70 = 2131099963;
+			public const int m3_ref_palette_error95 = 2131099963;
 			
 			// aapt resource value: 0x7F06013C
-			public const int m3_ref_palette_error80 = 2131099964;
+			public const int m3_ref_palette_error99 = 2131099964;
 			
 			// aapt resource value: 0x7F06013D
-			public const int m3_ref_palette_error90 = 2131099965;
+			public const int m3_ref_palette_neutral0 = 2131099965;
 			
 			// aapt resource value: 0x7F06013E
-			public const int m3_ref_palette_error95 = 2131099966;
+			public const int m3_ref_palette_neutral10 = 2131099966;
 			
 			// aapt resource value: 0x7F06013F
-			public const int m3_ref_palette_error99 = 2131099967;
+			public const int m3_ref_palette_neutral100 = 2131099967;
 			
 			// aapt resource value: 0x7F060140
-			public const int m3_ref_palette_neutral0 = 2131099968;
+			public const int m3_ref_palette_neutral12 = 2131099968;
 			
 			// aapt resource value: 0x7F060141
-			public const int m3_ref_palette_neutral10 = 2131099969;
+			public const int m3_ref_palette_neutral17 = 2131099969;
 			
 			// aapt resource value: 0x7F060142
-			public const int m3_ref_palette_neutral100 = 2131099970;
+			public const int m3_ref_palette_neutral20 = 2131099970;
 			
 			// aapt resource value: 0x7F060143
-			public const int m3_ref_palette_neutral12 = 2131099971;
+			public const int m3_ref_palette_neutral22 = 2131099971;
 			
 			// aapt resource value: 0x7F060144
-			public const int m3_ref_palette_neutral17 = 2131099972;
+			public const int m3_ref_palette_neutral24 = 2131099972;
 			
 			// aapt resource value: 0x7F060145
-			public const int m3_ref_palette_neutral20 = 2131099973;
+			public const int m3_ref_palette_neutral30 = 2131099973;
 			
 			// aapt resource value: 0x7F060146
-			public const int m3_ref_palette_neutral22 = 2131099974;
+			public const int m3_ref_palette_neutral4 = 2131099974;
 			
 			// aapt resource value: 0x7F060147
-			public const int m3_ref_palette_neutral24 = 2131099975;
+			public const int m3_ref_palette_neutral40 = 2131099975;
 			
 			// aapt resource value: 0x7F060148
-			public const int m3_ref_palette_neutral30 = 2131099976;
+			public const int m3_ref_palette_neutral50 = 2131099976;
 			
 			// aapt resource value: 0x7F060149
-			public const int m3_ref_palette_neutral4 = 2131099977;
+			public const int m3_ref_palette_neutral6 = 2131099977;
 			
 			// aapt resource value: 0x7F06014A
-			public const int m3_ref_palette_neutral40 = 2131099978;
+			public const int m3_ref_palette_neutral60 = 2131099978;
 			
 			// aapt resource value: 0x7F06014B
-			public const int m3_ref_palette_neutral50 = 2131099979;
+			public const int m3_ref_palette_neutral70 = 2131099979;
 			
 			// aapt resource value: 0x7F06014C
-			public const int m3_ref_palette_neutral6 = 2131099980;
+			public const int m3_ref_palette_neutral80 = 2131099980;
 			
 			// aapt resource value: 0x7F06014D
-			public const int m3_ref_palette_neutral60 = 2131099981;
+			public const int m3_ref_palette_neutral87 = 2131099981;
 			
 			// aapt resource value: 0x7F06014E
-			public const int m3_ref_palette_neutral70 = 2131099982;
+			public const int m3_ref_palette_neutral90 = 2131099982;
 			
 			// aapt resource value: 0x7F06014F
-			public const int m3_ref_palette_neutral80 = 2131099983;
+			public const int m3_ref_palette_neutral92 = 2131099983;
 			
 			// aapt resource value: 0x7F060150
-			public const int m3_ref_palette_neutral87 = 2131099984;
+			public const int m3_ref_palette_neutral94 = 2131099984;
 			
 			// aapt resource value: 0x7F060151
-			public const int m3_ref_palette_neutral90 = 2131099985;
+			public const int m3_ref_palette_neutral95 = 2131099985;
 			
 			// aapt resource value: 0x7F060152
-			public const int m3_ref_palette_neutral92 = 2131099986;
+			public const int m3_ref_palette_neutral96 = 2131099986;
 			
 			// aapt resource value: 0x7F060153
-			public const int m3_ref_palette_neutral94 = 2131099987;
+			public const int m3_ref_palette_neutral98 = 2131099987;
 			
 			// aapt resource value: 0x7F060154
-			public const int m3_ref_palette_neutral95 = 2131099988;
+			public const int m3_ref_palette_neutral99 = 2131099988;
 			
 			// aapt resource value: 0x7F060155
-			public const int m3_ref_palette_neutral96 = 2131099989;
+			public const int m3_ref_palette_neutral_variant0 = 2131099989;
 			
 			// aapt resource value: 0x7F060156
-			public const int m3_ref_palette_neutral98 = 2131099990;
+			public const int m3_ref_palette_neutral_variant10 = 2131099990;
 			
 			// aapt resource value: 0x7F060157
-			public const int m3_ref_palette_neutral99 = 2131099991;
+			public const int m3_ref_palette_neutral_variant100 = 2131099991;
 			
 			// aapt resource value: 0x7F060158
-			public const int m3_ref_palette_neutral_variant0 = 2131099992;
+			public const int m3_ref_palette_neutral_variant20 = 2131099992;
 			
 			// aapt resource value: 0x7F060159
-			public const int m3_ref_palette_neutral_variant10 = 2131099993;
+			public const int m3_ref_palette_neutral_variant30 = 2131099993;
 			
 			// aapt resource value: 0x7F06015A
-			public const int m3_ref_palette_neutral_variant100 = 2131099994;
+			public const int m3_ref_palette_neutral_variant40 = 2131099994;
 			
 			// aapt resource value: 0x7F06015B
-			public const int m3_ref_palette_neutral_variant20 = 2131099995;
+			public const int m3_ref_palette_neutral_variant50 = 2131099995;
 			
 			// aapt resource value: 0x7F06015C
-			public const int m3_ref_palette_neutral_variant30 = 2131099996;
+			public const int m3_ref_palette_neutral_variant60 = 2131099996;
 			
 			// aapt resource value: 0x7F06015D
-			public const int m3_ref_palette_neutral_variant40 = 2131099997;
+			public const int m3_ref_palette_neutral_variant70 = 2131099997;
 			
 			// aapt resource value: 0x7F06015E
-			public const int m3_ref_palette_neutral_variant50 = 2131099998;
+			public const int m3_ref_palette_neutral_variant80 = 2131099998;
 			
 			// aapt resource value: 0x7F06015F
-			public const int m3_ref_palette_neutral_variant60 = 2131099999;
+			public const int m3_ref_palette_neutral_variant90 = 2131099999;
 			
 			// aapt resource value: 0x7F060160
-			public const int m3_ref_palette_neutral_variant70 = 2131100000;
+			public const int m3_ref_palette_neutral_variant95 = 2131100000;
 			
 			// aapt resource value: 0x7F060161
-			public const int m3_ref_palette_neutral_variant80 = 2131100001;
+			public const int m3_ref_palette_neutral_variant99 = 2131100001;
 			
 			// aapt resource value: 0x7F060162
-			public const int m3_ref_palette_neutral_variant90 = 2131100002;
+			public const int m3_ref_palette_primary0 = 2131100002;
 			
 			// aapt resource value: 0x7F060163
-			public const int m3_ref_palette_neutral_variant95 = 2131100003;
+			public const int m3_ref_palette_primary10 = 2131100003;
 			
 			// aapt resource value: 0x7F060164
-			public const int m3_ref_palette_neutral_variant99 = 2131100004;
+			public const int m3_ref_palette_primary100 = 2131100004;
 			
 			// aapt resource value: 0x7F060165
-			public const int m3_ref_palette_primary0 = 2131100005;
+			public const int m3_ref_palette_primary20 = 2131100005;
 			
 			// aapt resource value: 0x7F060166
-			public const int m3_ref_palette_primary10 = 2131100006;
+			public const int m3_ref_palette_primary30 = 2131100006;
 			
 			// aapt resource value: 0x7F060167
-			public const int m3_ref_palette_primary100 = 2131100007;
+			public const int m3_ref_palette_primary40 = 2131100007;
 			
 			// aapt resource value: 0x7F060168
-			public const int m3_ref_palette_primary20 = 2131100008;
+			public const int m3_ref_palette_primary50 = 2131100008;
 			
 			// aapt resource value: 0x7F060169
-			public const int m3_ref_palette_primary30 = 2131100009;
+			public const int m3_ref_palette_primary60 = 2131100009;
 			
 			// aapt resource value: 0x7F06016A
-			public const int m3_ref_palette_primary40 = 2131100010;
+			public const int m3_ref_palette_primary70 = 2131100010;
 			
 			// aapt resource value: 0x7F06016B
-			public const int m3_ref_palette_primary50 = 2131100011;
+			public const int m3_ref_palette_primary80 = 2131100011;
 			
 			// aapt resource value: 0x7F06016C
-			public const int m3_ref_palette_primary60 = 2131100012;
+			public const int m3_ref_palette_primary90 = 2131100012;
 			
 			// aapt resource value: 0x7F06016D
-			public const int m3_ref_palette_primary70 = 2131100013;
+			public const int m3_ref_palette_primary95 = 2131100013;
 			
 			// aapt resource value: 0x7F06016E
-			public const int m3_ref_palette_primary80 = 2131100014;
+			public const int m3_ref_palette_primary99 = 2131100014;
 			
 			// aapt resource value: 0x7F06016F
-			public const int m3_ref_palette_primary90 = 2131100015;
+			public const int m3_ref_palette_secondary0 = 2131100015;
 			
 			// aapt resource value: 0x7F060170
-			public const int m3_ref_palette_primary95 = 2131100016;
+			public const int m3_ref_palette_secondary10 = 2131100016;
 			
 			// aapt resource value: 0x7F060171
-			public const int m3_ref_palette_primary99 = 2131100017;
+			public const int m3_ref_palette_secondary100 = 2131100017;
 			
 			// aapt resource value: 0x7F060172
-			public const int m3_ref_palette_secondary0 = 2131100018;
+			public const int m3_ref_palette_secondary20 = 2131100018;
 			
 			// aapt resource value: 0x7F060173
-			public const int m3_ref_palette_secondary10 = 2131100019;
+			public const int m3_ref_palette_secondary30 = 2131100019;
 			
 			// aapt resource value: 0x7F060174
-			public const int m3_ref_palette_secondary100 = 2131100020;
+			public const int m3_ref_palette_secondary40 = 2131100020;
 			
 			// aapt resource value: 0x7F060175
-			public const int m3_ref_palette_secondary20 = 2131100021;
+			public const int m3_ref_palette_secondary50 = 2131100021;
 			
 			// aapt resource value: 0x7F060176
-			public const int m3_ref_palette_secondary30 = 2131100022;
+			public const int m3_ref_palette_secondary60 = 2131100022;
 			
 			// aapt resource value: 0x7F060177
-			public const int m3_ref_palette_secondary40 = 2131100023;
+			public const int m3_ref_palette_secondary70 = 2131100023;
 			
 			// aapt resource value: 0x7F060178
-			public const int m3_ref_palette_secondary50 = 2131100024;
+			public const int m3_ref_palette_secondary80 = 2131100024;
 			
 			// aapt resource value: 0x7F060179
-			public const int m3_ref_palette_secondary60 = 2131100025;
+			public const int m3_ref_palette_secondary90 = 2131100025;
 			
 			// aapt resource value: 0x7F06017A
-			public const int m3_ref_palette_secondary70 = 2131100026;
+			public const int m3_ref_palette_secondary95 = 2131100026;
 			
 			// aapt resource value: 0x7F06017B
-			public const int m3_ref_palette_secondary80 = 2131100027;
+			public const int m3_ref_palette_secondary99 = 2131100027;
 			
 			// aapt resource value: 0x7F06017C
-			public const int m3_ref_palette_secondary90 = 2131100028;
+			public const int m3_ref_palette_tertiary0 = 2131100028;
 			
 			// aapt resource value: 0x7F06017D
-			public const int m3_ref_palette_secondary95 = 2131100029;
+			public const int m3_ref_palette_tertiary10 = 2131100029;
 			
 			// aapt resource value: 0x7F06017E
-			public const int m3_ref_palette_secondary99 = 2131100030;
+			public const int m3_ref_palette_tertiary100 = 2131100030;
 			
 			// aapt resource value: 0x7F06017F
-			public const int m3_ref_palette_tertiary0 = 2131100031;
+			public const int m3_ref_palette_tertiary20 = 2131100031;
 			
 			// aapt resource value: 0x7F060180
-			public const int m3_ref_palette_tertiary10 = 2131100032;
+			public const int m3_ref_palette_tertiary30 = 2131100032;
 			
 			// aapt resource value: 0x7F060181
-			public const int m3_ref_palette_tertiary100 = 2131100033;
+			public const int m3_ref_palette_tertiary40 = 2131100033;
 			
 			// aapt resource value: 0x7F060182
-			public const int m3_ref_palette_tertiary20 = 2131100034;
+			public const int m3_ref_palette_tertiary50 = 2131100034;
 			
 			// aapt resource value: 0x7F060183
-			public const int m3_ref_palette_tertiary30 = 2131100035;
+			public const int m3_ref_palette_tertiary60 = 2131100035;
 			
 			// aapt resource value: 0x7F060184
-			public const int m3_ref_palette_tertiary40 = 2131100036;
+			public const int m3_ref_palette_tertiary70 = 2131100036;
 			
 			// aapt resource value: 0x7F060185
-			public const int m3_ref_palette_tertiary50 = 2131100037;
+			public const int m3_ref_palette_tertiary80 = 2131100037;
 			
 			// aapt resource value: 0x7F060186
-			public const int m3_ref_palette_tertiary60 = 2131100038;
+			public const int m3_ref_palette_tertiary90 = 2131100038;
 			
 			// aapt resource value: 0x7F060187
-			public const int m3_ref_palette_tertiary70 = 2131100039;
+			public const int m3_ref_palette_tertiary95 = 2131100039;
 			
 			// aapt resource value: 0x7F060188
-			public const int m3_ref_palette_tertiary80 = 2131100040;
+			public const int m3_ref_palette_tertiary99 = 2131100040;
 			
 			// aapt resource value: 0x7F060189
-			public const int m3_ref_palette_tertiary90 = 2131100041;
+			public const int m3_ref_palette_white = 2131100041;
 			
 			// aapt resource value: 0x7F06018A
-			public const int m3_ref_palette_tertiary95 = 2131100042;
+			public const int m3_selection_control_ripple_color_selector = 2131100042;
 			
 			// aapt resource value: 0x7F06018B
-			public const int m3_ref_palette_tertiary99 = 2131100043;
+			public const int m3_simple_item_ripple_color = 2131100043;
 			
 			// aapt resource value: 0x7F06018C
-			public const int m3_ref_palette_white = 2131100044;
+			public const int m3_slider_active_track_color = 2131100044;
 			
 			// aapt resource value: 0x7F06018D
-			public const int m3_selection_control_ripple_color_selector = 2131100045;
+			public const int m3_slider_halo_color = 2131100045;
 			
 			// aapt resource value: 0x7F06018E
-			public const int m3_simple_item_ripple_color = 2131100046;
+			public const int m3_slider_inactive_track_color = 2131100046;
 			
 			// aapt resource value: 0x7F06018F
-			public const int m3_slider_active_track_color = 2131100047;
+			public const int m3_slider_thumb_color = 2131100047;
 			
 			// aapt resource value: 0x7F060190
-			public const int m3_slider_halo_color = 2131100048;
+			public const int m3_switch_thumb_tint = 2131100048;
 			
 			// aapt resource value: 0x7F060191
-			public const int m3_slider_inactive_track_color = 2131100049;
+			public const int m3_switch_track_tint = 2131100049;
 			
 			// aapt resource value: 0x7F060192
-			public const int m3_slider_thumb_color = 2131100050;
+			public const int m3_sys_color_dark_background = 2131100050;
 			
 			// aapt resource value: 0x7F060193
-			public const int m3_switch_thumb_tint = 2131100051;
+			public const int m3_sys_color_dark_error = 2131100051;
 			
 			// aapt resource value: 0x7F060194
-			public const int m3_switch_track_tint = 2131100052;
+			public const int m3_sys_color_dark_error_container = 2131100052;
 			
 			// aapt resource value: 0x7F060195
-			public const int m3_sys_color_dark_background = 2131100053;
+			public const int m3_sys_color_dark_inverse_on_surface = 2131100053;
 			
 			// aapt resource value: 0x7F060196
-			public const int m3_sys_color_dark_error = 2131100054;
+			public const int m3_sys_color_dark_inverse_primary = 2131100054;
 			
 			// aapt resource value: 0x7F060197
-			public const int m3_sys_color_dark_error_container = 2131100055;
+			public const int m3_sys_color_dark_inverse_surface = 2131100055;
 			
 			// aapt resource value: 0x7F060198
-			public const int m3_sys_color_dark_inverse_on_surface = 2131100056;
+			public const int m3_sys_color_dark_on_background = 2131100056;
 			
 			// aapt resource value: 0x7F060199
-			public const int m3_sys_color_dark_inverse_primary = 2131100057;
+			public const int m3_sys_color_dark_on_error = 2131100057;
 			
 			// aapt resource value: 0x7F06019A
-			public const int m3_sys_color_dark_inverse_surface = 2131100058;
+			public const int m3_sys_color_dark_on_error_container = 2131100058;
 			
 			// aapt resource value: 0x7F06019B
-			public const int m3_sys_color_dark_on_background = 2131100059;
+			public const int m3_sys_color_dark_on_primary = 2131100059;
 			
 			// aapt resource value: 0x7F06019C
-			public const int m3_sys_color_dark_on_error = 2131100060;
+			public const int m3_sys_color_dark_on_primary_container = 2131100060;
 			
 			// aapt resource value: 0x7F06019D
-			public const int m3_sys_color_dark_on_error_container = 2131100061;
+			public const int m3_sys_color_dark_on_secondary = 2131100061;
 			
 			// aapt resource value: 0x7F06019E
-			public const int m3_sys_color_dark_on_primary = 2131100062;
+			public const int m3_sys_color_dark_on_secondary_container = 2131100062;
 			
 			// aapt resource value: 0x7F06019F
-			public const int m3_sys_color_dark_on_primary_container = 2131100063;
+			public const int m3_sys_color_dark_on_surface = 2131100063;
 			
 			// aapt resource value: 0x7F0601A0
-			public const int m3_sys_color_dark_on_secondary = 2131100064;
+			public const int m3_sys_color_dark_on_surface_variant = 2131100064;
 			
 			// aapt resource value: 0x7F0601A1
-			public const int m3_sys_color_dark_on_secondary_container = 2131100065;
+			public const int m3_sys_color_dark_on_tertiary = 2131100065;
 			
 			// aapt resource value: 0x7F0601A2
-			public const int m3_sys_color_dark_on_surface = 2131100066;
+			public const int m3_sys_color_dark_on_tertiary_container = 2131100066;
 			
 			// aapt resource value: 0x7F0601A3
-			public const int m3_sys_color_dark_on_surface_variant = 2131100067;
+			public const int m3_sys_color_dark_outline = 2131100067;
 			
 			// aapt resource value: 0x7F0601A4
-			public const int m3_sys_color_dark_on_tertiary = 2131100068;
+			public const int m3_sys_color_dark_outline_variant = 2131100068;
 			
 			// aapt resource value: 0x7F0601A5
-			public const int m3_sys_color_dark_on_tertiary_container = 2131100069;
+			public const int m3_sys_color_dark_primary = 2131100069;
 			
 			// aapt resource value: 0x7F0601A6
-			public const int m3_sys_color_dark_outline = 2131100070;
+			public const int m3_sys_color_dark_primary_container = 2131100070;
 			
 			// aapt resource value: 0x7F0601A7
-			public const int m3_sys_color_dark_outline_variant = 2131100071;
+			public const int m3_sys_color_dark_secondary = 2131100071;
 			
 			// aapt resource value: 0x7F0601A8
-			public const int m3_sys_color_dark_primary = 2131100072;
+			public const int m3_sys_color_dark_secondary_container = 2131100072;
 			
 			// aapt resource value: 0x7F0601A9
-			public const int m3_sys_color_dark_primary_container = 2131100073;
+			public const int m3_sys_color_dark_surface = 2131100073;
 			
 			// aapt resource value: 0x7F0601AA
-			public const int m3_sys_color_dark_secondary = 2131100074;
+			public const int m3_sys_color_dark_surface_bright = 2131100074;
 			
 			// aapt resource value: 0x7F0601AB
-			public const int m3_sys_color_dark_secondary_container = 2131100075;
+			public const int m3_sys_color_dark_surface_container = 2131100075;
 			
 			// aapt resource value: 0x7F0601AC
-			public const int m3_sys_color_dark_surface = 2131100076;
+			public const int m3_sys_color_dark_surface_container_high = 2131100076;
 			
 			// aapt resource value: 0x7F0601AD
-			public const int m3_sys_color_dark_surface_bright = 2131100077;
+			public const int m3_sys_color_dark_surface_container_highest = 2131100077;
 			
 			// aapt resource value: 0x7F0601AE
-			public const int m3_sys_color_dark_surface_container = 2131100078;
+			public const int m3_sys_color_dark_surface_container_low = 2131100078;
 			
 			// aapt resource value: 0x7F0601AF
-			public const int m3_sys_color_dark_surface_container_high = 2131100079;
+			public const int m3_sys_color_dark_surface_container_lowest = 2131100079;
 			
 			// aapt resource value: 0x7F0601B0
-			public const int m3_sys_color_dark_surface_container_highest = 2131100080;
+			public const int m3_sys_color_dark_surface_dim = 2131100080;
 			
 			// aapt resource value: 0x7F0601B1
-			public const int m3_sys_color_dark_surface_container_low = 2131100081;
+			public const int m3_sys_color_dark_surface_variant = 2131100081;
 			
 			// aapt resource value: 0x7F0601B2
-			public const int m3_sys_color_dark_surface_container_lowest = 2131100082;
+			public const int m3_sys_color_dark_tertiary = 2131100082;
 			
 			// aapt resource value: 0x7F0601B3
-			public const int m3_sys_color_dark_surface_dim = 2131100083;
+			public const int m3_sys_color_dark_tertiary_container = 2131100083;
 			
 			// aapt resource value: 0x7F0601B4
-			public const int m3_sys_color_dark_surface_variant = 2131100084;
+			public const int m3_sys_color_dynamic_dark_background = 2131100084;
 			
 			// aapt resource value: 0x7F0601B5
-			public const int m3_sys_color_dark_tertiary = 2131100085;
+			public const int m3_sys_color_dynamic_dark_inverse_on_surface = 2131100085;
 			
 			// aapt resource value: 0x7F0601B6
-			public const int m3_sys_color_dark_tertiary_container = 2131100086;
+			public const int m3_sys_color_dynamic_dark_inverse_primary = 2131100086;
 			
 			// aapt resource value: 0x7F0601B7
-			public const int m3_sys_color_dynamic_dark_background = 2131100087;
+			public const int m3_sys_color_dynamic_dark_inverse_surface = 2131100087;
 			
 			// aapt resource value: 0x7F0601B8
-			public const int m3_sys_color_dynamic_dark_inverse_on_surface = 2131100088;
+			public const int m3_sys_color_dynamic_dark_on_background = 2131100088;
 			
 			// aapt resource value: 0x7F0601B9
-			public const int m3_sys_color_dynamic_dark_inverse_primary = 2131100089;
+			public const int m3_sys_color_dynamic_dark_on_primary = 2131100089;
 			
 			// aapt resource value: 0x7F0601BA
-			public const int m3_sys_color_dynamic_dark_inverse_surface = 2131100090;
+			public const int m3_sys_color_dynamic_dark_on_primary_container = 2131100090;
 			
 			// aapt resource value: 0x7F0601BB
-			public const int m3_sys_color_dynamic_dark_on_background = 2131100091;
+			public const int m3_sys_color_dynamic_dark_on_secondary = 2131100091;
 			
 			// aapt resource value: 0x7F0601BC
-			public const int m3_sys_color_dynamic_dark_on_primary = 2131100092;
+			public const int m3_sys_color_dynamic_dark_on_secondary_container = 2131100092;
 			
 			// aapt resource value: 0x7F0601BD
-			public const int m3_sys_color_dynamic_dark_on_primary_container = 2131100093;
+			public const int m3_sys_color_dynamic_dark_on_surface = 2131100093;
 			
 			// aapt resource value: 0x7F0601BE
-			public const int m3_sys_color_dynamic_dark_on_secondary = 2131100094;
+			public const int m3_sys_color_dynamic_dark_on_surface_variant = 2131100094;
 			
 			// aapt resource value: 0x7F0601BF
-			public const int m3_sys_color_dynamic_dark_on_secondary_container = 2131100095;
+			public const int m3_sys_color_dynamic_dark_on_tertiary = 2131100095;
 			
 			// aapt resource value: 0x7F0601C0
-			public const int m3_sys_color_dynamic_dark_on_surface = 2131100096;
+			public const int m3_sys_color_dynamic_dark_on_tertiary_container = 2131100096;
 			
 			// aapt resource value: 0x7F0601C1
-			public const int m3_sys_color_dynamic_dark_on_surface_variant = 2131100097;
+			public const int m3_sys_color_dynamic_dark_outline = 2131100097;
 			
 			// aapt resource value: 0x7F0601C2
-			public const int m3_sys_color_dynamic_dark_on_tertiary = 2131100098;
+			public const int m3_sys_color_dynamic_dark_outline_variant = 2131100098;
 			
 			// aapt resource value: 0x7F0601C3
-			public const int m3_sys_color_dynamic_dark_on_tertiary_container = 2131100099;
+			public const int m3_sys_color_dynamic_dark_primary = 2131100099;
 			
 			// aapt resource value: 0x7F0601C4
-			public const int m3_sys_color_dynamic_dark_outline = 2131100100;
+			public const int m3_sys_color_dynamic_dark_primary_container = 2131100100;
 			
 			// aapt resource value: 0x7F0601C5
-			public const int m3_sys_color_dynamic_dark_outline_variant = 2131100101;
+			public const int m3_sys_color_dynamic_dark_secondary = 2131100101;
 			
 			// aapt resource value: 0x7F0601C6
-			public const int m3_sys_color_dynamic_dark_primary = 2131100102;
+			public const int m3_sys_color_dynamic_dark_secondary_container = 2131100102;
 			
 			// aapt resource value: 0x7F0601C7
-			public const int m3_sys_color_dynamic_dark_primary_container = 2131100103;
+			public const int m3_sys_color_dynamic_dark_surface = 2131100103;
 			
 			// aapt resource value: 0x7F0601C8
-			public const int m3_sys_color_dynamic_dark_secondary = 2131100104;
+			public const int m3_sys_color_dynamic_dark_surface_bright = 2131100104;
 			
 			// aapt resource value: 0x7F0601C9
-			public const int m3_sys_color_dynamic_dark_secondary_container = 2131100105;
+			public const int m3_sys_color_dynamic_dark_surface_container = 2131100105;
 			
 			// aapt resource value: 0x7F0601CA
-			public const int m3_sys_color_dynamic_dark_surface = 2131100106;
+			public const int m3_sys_color_dynamic_dark_surface_container_high = 2131100106;
 			
 			// aapt resource value: 0x7F0601CB
-			public const int m3_sys_color_dynamic_dark_surface_bright = 2131100107;
+			public const int m3_sys_color_dynamic_dark_surface_container_highest = 2131100107;
 			
 			// aapt resource value: 0x7F0601CC
-			public const int m3_sys_color_dynamic_dark_surface_container = 2131100108;
+			public const int m3_sys_color_dynamic_dark_surface_container_low = 2131100108;
 			
 			// aapt resource value: 0x7F0601CD
-			public const int m3_sys_color_dynamic_dark_surface_container_high = 2131100109;
+			public const int m3_sys_color_dynamic_dark_surface_container_lowest = 2131100109;
 			
 			// aapt resource value: 0x7F0601CE
-			public const int m3_sys_color_dynamic_dark_surface_container_highest = 2131100110;
+			public const int m3_sys_color_dynamic_dark_surface_dim = 2131100110;
 			
 			// aapt resource value: 0x7F0601CF
-			public const int m3_sys_color_dynamic_dark_surface_container_low = 2131100111;
+			public const int m3_sys_color_dynamic_dark_surface_variant = 2131100111;
 			
 			// aapt resource value: 0x7F0601D0
-			public const int m3_sys_color_dynamic_dark_surface_container_lowest = 2131100112;
+			public const int m3_sys_color_dynamic_dark_tertiary = 2131100112;
 			
 			// aapt resource value: 0x7F0601D1
-			public const int m3_sys_color_dynamic_dark_surface_dim = 2131100113;
+			public const int m3_sys_color_dynamic_dark_tertiary_container = 2131100113;
 			
 			// aapt resource value: 0x7F0601D2
-			public const int m3_sys_color_dynamic_dark_surface_variant = 2131100114;
+			public const int m3_sys_color_dynamic_light_background = 2131100114;
 			
 			// aapt resource value: 0x7F0601D3
-			public const int m3_sys_color_dynamic_dark_tertiary = 2131100115;
+			public const int m3_sys_color_dynamic_light_inverse_on_surface = 2131100115;
 			
 			// aapt resource value: 0x7F0601D4
-			public const int m3_sys_color_dynamic_dark_tertiary_container = 2131100116;
+			public const int m3_sys_color_dynamic_light_inverse_primary = 2131100116;
 			
 			// aapt resource value: 0x7F0601D5
-			public const int m3_sys_color_dynamic_light_background = 2131100117;
+			public const int m3_sys_color_dynamic_light_inverse_surface = 2131100117;
 			
 			// aapt resource value: 0x7F0601D6
-			public const int m3_sys_color_dynamic_light_inverse_on_surface = 2131100118;
+			public const int m3_sys_color_dynamic_light_on_background = 2131100118;
 			
 			// aapt resource value: 0x7F0601D7
-			public const int m3_sys_color_dynamic_light_inverse_primary = 2131100119;
+			public const int m3_sys_color_dynamic_light_on_primary = 2131100119;
 			
 			// aapt resource value: 0x7F0601D8
-			public const int m3_sys_color_dynamic_light_inverse_surface = 2131100120;
+			public const int m3_sys_color_dynamic_light_on_primary_container = 2131100120;
 			
 			// aapt resource value: 0x7F0601D9
-			public const int m3_sys_color_dynamic_light_on_background = 2131100121;
+			public const int m3_sys_color_dynamic_light_on_secondary = 2131100121;
 			
 			// aapt resource value: 0x7F0601DA
-			public const int m3_sys_color_dynamic_light_on_primary = 2131100122;
+			public const int m3_sys_color_dynamic_light_on_secondary_container = 2131100122;
 			
 			// aapt resource value: 0x7F0601DB
-			public const int m3_sys_color_dynamic_light_on_primary_container = 2131100123;
+			public const int m3_sys_color_dynamic_light_on_surface = 2131100123;
 			
 			// aapt resource value: 0x7F0601DC
-			public const int m3_sys_color_dynamic_light_on_secondary = 2131100124;
+			public const int m3_sys_color_dynamic_light_on_surface_variant = 2131100124;
 			
 			// aapt resource value: 0x7F0601DD
-			public const int m3_sys_color_dynamic_light_on_secondary_container = 2131100125;
+			public const int m3_sys_color_dynamic_light_on_tertiary = 2131100125;
 			
 			// aapt resource value: 0x7F0601DE
-			public const int m3_sys_color_dynamic_light_on_surface = 2131100126;
+			public const int m3_sys_color_dynamic_light_on_tertiary_container = 2131100126;
 			
 			// aapt resource value: 0x7F0601DF
-			public const int m3_sys_color_dynamic_light_on_surface_variant = 2131100127;
+			public const int m3_sys_color_dynamic_light_outline = 2131100127;
 			
 			// aapt resource value: 0x7F0601E0
-			public const int m3_sys_color_dynamic_light_on_tertiary = 2131100128;
+			public const int m3_sys_color_dynamic_light_outline_variant = 2131100128;
 			
 			// aapt resource value: 0x7F0601E1
-			public const int m3_sys_color_dynamic_light_on_tertiary_container = 2131100129;
+			public const int m3_sys_color_dynamic_light_primary = 2131100129;
 			
 			// aapt resource value: 0x7F0601E2
-			public const int m3_sys_color_dynamic_light_outline = 2131100130;
+			public const int m3_sys_color_dynamic_light_primary_container = 2131100130;
 			
 			// aapt resource value: 0x7F0601E3
-			public const int m3_sys_color_dynamic_light_outline_variant = 2131100131;
+			public const int m3_sys_color_dynamic_light_secondary = 2131100131;
 			
 			// aapt resource value: 0x7F0601E4
-			public const int m3_sys_color_dynamic_light_primary = 2131100132;
+			public const int m3_sys_color_dynamic_light_secondary_container = 2131100132;
 			
 			// aapt resource value: 0x7F0601E5
-			public const int m3_sys_color_dynamic_light_primary_container = 2131100133;
+			public const int m3_sys_color_dynamic_light_surface = 2131100133;
 			
 			// aapt resource value: 0x7F0601E6
-			public const int m3_sys_color_dynamic_light_secondary = 2131100134;
+			public const int m3_sys_color_dynamic_light_surface_bright = 2131100134;
 			
 			// aapt resource value: 0x7F0601E7
-			public const int m3_sys_color_dynamic_light_secondary_container = 2131100135;
+			public const int m3_sys_color_dynamic_light_surface_container = 2131100135;
 			
 			// aapt resource value: 0x7F0601E8
-			public const int m3_sys_color_dynamic_light_surface = 2131100136;
+			public const int m3_sys_color_dynamic_light_surface_container_high = 2131100136;
 			
 			// aapt resource value: 0x7F0601E9
-			public const int m3_sys_color_dynamic_light_surface_bright = 2131100137;
+			public const int m3_sys_color_dynamic_light_surface_container_highest = 2131100137;
 			
 			// aapt resource value: 0x7F0601EA
-			public const int m3_sys_color_dynamic_light_surface_container = 2131100138;
+			public const int m3_sys_color_dynamic_light_surface_container_low = 2131100138;
 			
 			// aapt resource value: 0x7F0601EB
-			public const int m3_sys_color_dynamic_light_surface_container_high = 2131100139;
+			public const int m3_sys_color_dynamic_light_surface_container_lowest = 2131100139;
 			
 			// aapt resource value: 0x7F0601EC
-			public const int m3_sys_color_dynamic_light_surface_container_highest = 2131100140;
+			public const int m3_sys_color_dynamic_light_surface_dim = 2131100140;
 			
 			// aapt resource value: 0x7F0601ED
-			public const int m3_sys_color_dynamic_light_surface_container_low = 2131100141;
+			public const int m3_sys_color_dynamic_light_surface_variant = 2131100141;
 			
 			// aapt resource value: 0x7F0601EE
-			public const int m3_sys_color_dynamic_light_surface_container_lowest = 2131100142;
+			public const int m3_sys_color_dynamic_light_tertiary = 2131100142;
 			
 			// aapt resource value: 0x7F0601EF
-			public const int m3_sys_color_dynamic_light_surface_dim = 2131100143;
+			public const int m3_sys_color_dynamic_light_tertiary_container = 2131100143;
 			
 			// aapt resource value: 0x7F0601F0
-			public const int m3_sys_color_dynamic_light_surface_variant = 2131100144;
+			public const int m3_sys_color_dynamic_on_primary_fixed = 2131100144;
 			
 			// aapt resource value: 0x7F0601F1
-			public const int m3_sys_color_dynamic_light_tertiary = 2131100145;
+			public const int m3_sys_color_dynamic_on_primary_fixed_variant = 2131100145;
 			
 			// aapt resource value: 0x7F0601F2
-			public const int m3_sys_color_dynamic_light_tertiary_container = 2131100146;
+			public const int m3_sys_color_dynamic_on_secondary_fixed = 2131100146;
 			
 			// aapt resource value: 0x7F0601F3
-			public const int m3_sys_color_dynamic_on_primary_fixed = 2131100147;
+			public const int m3_sys_color_dynamic_on_secondary_fixed_variant = 2131100147;
 			
 			// aapt resource value: 0x7F0601F4
-			public const int m3_sys_color_dynamic_on_primary_fixed_variant = 2131100148;
+			public const int m3_sys_color_dynamic_on_tertiary_fixed = 2131100148;
 			
 			// aapt resource value: 0x7F0601F5
-			public const int m3_sys_color_dynamic_on_secondary_fixed = 2131100149;
+			public const int m3_sys_color_dynamic_on_tertiary_fixed_variant = 2131100149;
 			
 			// aapt resource value: 0x7F0601F6
-			public const int m3_sys_color_dynamic_on_secondary_fixed_variant = 2131100150;
+			public const int m3_sys_color_dynamic_primary_fixed = 2131100150;
 			
 			// aapt resource value: 0x7F0601F7
-			public const int m3_sys_color_dynamic_on_tertiary_fixed = 2131100151;
+			public const int m3_sys_color_dynamic_primary_fixed_dim = 2131100151;
 			
 			// aapt resource value: 0x7F0601F8
-			public const int m3_sys_color_dynamic_on_tertiary_fixed_variant = 2131100152;
+			public const int m3_sys_color_dynamic_secondary_fixed = 2131100152;
 			
 			// aapt resource value: 0x7F0601F9
-			public const int m3_sys_color_dynamic_primary_fixed = 2131100153;
+			public const int m3_sys_color_dynamic_secondary_fixed_dim = 2131100153;
 			
 			// aapt resource value: 0x7F0601FA
-			public const int m3_sys_color_dynamic_primary_fixed_dim = 2131100154;
+			public const int m3_sys_color_dynamic_tertiary_fixed = 2131100154;
 			
 			// aapt resource value: 0x7F0601FB
-			public const int m3_sys_color_dynamic_secondary_fixed = 2131100155;
+			public const int m3_sys_color_dynamic_tertiary_fixed_dim = 2131100155;
 			
 			// aapt resource value: 0x7F0601FC
-			public const int m3_sys_color_dynamic_secondary_fixed_dim = 2131100156;
+			public const int m3_sys_color_light_background = 2131100156;
 			
 			// aapt resource value: 0x7F0601FD
-			public const int m3_sys_color_dynamic_tertiary_fixed = 2131100157;
+			public const int m3_sys_color_light_error = 2131100157;
 			
 			// aapt resource value: 0x7F0601FE
-			public const int m3_sys_color_dynamic_tertiary_fixed_dim = 2131100158;
+			public const int m3_sys_color_light_error_container = 2131100158;
 			
 			// aapt resource value: 0x7F0601FF
-			public const int m3_sys_color_light_background = 2131100159;
+			public const int m3_sys_color_light_inverse_on_surface = 2131100159;
 			
 			// aapt resource value: 0x7F060200
-			public const int m3_sys_color_light_error = 2131100160;
+			public const int m3_sys_color_light_inverse_primary = 2131100160;
 			
 			// aapt resource value: 0x7F060201
-			public const int m3_sys_color_light_error_container = 2131100161;
+			public const int m3_sys_color_light_inverse_surface = 2131100161;
 			
 			// aapt resource value: 0x7F060202
-			public const int m3_sys_color_light_inverse_on_surface = 2131100162;
+			public const int m3_sys_color_light_on_background = 2131100162;
 			
 			// aapt resource value: 0x7F060203
-			public const int m3_sys_color_light_inverse_primary = 2131100163;
+			public const int m3_sys_color_light_on_error = 2131100163;
 			
 			// aapt resource value: 0x7F060204
-			public const int m3_sys_color_light_inverse_surface = 2131100164;
+			public const int m3_sys_color_light_on_error_container = 2131100164;
 			
 			// aapt resource value: 0x7F060205
-			public const int m3_sys_color_light_on_background = 2131100165;
+			public const int m3_sys_color_light_on_primary = 2131100165;
 			
 			// aapt resource value: 0x7F060206
-			public const int m3_sys_color_light_on_error = 2131100166;
+			public const int m3_sys_color_light_on_primary_container = 2131100166;
 			
 			// aapt resource value: 0x7F060207
-			public const int m3_sys_color_light_on_error_container = 2131100167;
+			public const int m3_sys_color_light_on_secondary = 2131100167;
 			
 			// aapt resource value: 0x7F060208
-			public const int m3_sys_color_light_on_primary = 2131100168;
+			public const int m3_sys_color_light_on_secondary_container = 2131100168;
 			
 			// aapt resource value: 0x7F060209
-			public const int m3_sys_color_light_on_primary_container = 2131100169;
+			public const int m3_sys_color_light_on_surface = 2131100169;
 			
 			// aapt resource value: 0x7F06020A
-			public const int m3_sys_color_light_on_secondary = 2131100170;
+			public const int m3_sys_color_light_on_surface_variant = 2131100170;
 			
 			// aapt resource value: 0x7F06020B
-			public const int m3_sys_color_light_on_secondary_container = 2131100171;
+			public const int m3_sys_color_light_on_tertiary = 2131100171;
 			
 			// aapt resource value: 0x7F06020C
-			public const int m3_sys_color_light_on_surface = 2131100172;
+			public const int m3_sys_color_light_on_tertiary_container = 2131100172;
 			
 			// aapt resource value: 0x7F06020D
-			public const int m3_sys_color_light_on_surface_variant = 2131100173;
+			public const int m3_sys_color_light_outline = 2131100173;
 			
 			// aapt resource value: 0x7F06020E
-			public const int m3_sys_color_light_on_tertiary = 2131100174;
+			public const int m3_sys_color_light_outline_variant = 2131100174;
 			
 			// aapt resource value: 0x7F06020F
-			public const int m3_sys_color_light_on_tertiary_container = 2131100175;
+			public const int m3_sys_color_light_primary = 2131100175;
 			
 			// aapt resource value: 0x7F060210
-			public const int m3_sys_color_light_outline = 2131100176;
+			public const int m3_sys_color_light_primary_container = 2131100176;
 			
 			// aapt resource value: 0x7F060211
-			public const int m3_sys_color_light_outline_variant = 2131100177;
+			public const int m3_sys_color_light_secondary = 2131100177;
 			
 			// aapt resource value: 0x7F060212
-			public const int m3_sys_color_light_primary = 2131100178;
+			public const int m3_sys_color_light_secondary_container = 2131100178;
 			
 			// aapt resource value: 0x7F060213
-			public const int m3_sys_color_light_primary_container = 2131100179;
+			public const int m3_sys_color_light_surface = 2131100179;
 			
 			// aapt resource value: 0x7F060214
-			public const int m3_sys_color_light_secondary = 2131100180;
+			public const int m3_sys_color_light_surface_bright = 2131100180;
 			
 			// aapt resource value: 0x7F060215
-			public const int m3_sys_color_light_secondary_container = 2131100181;
+			public const int m3_sys_color_light_surface_container = 2131100181;
 			
 			// aapt resource value: 0x7F060216
-			public const int m3_sys_color_light_surface = 2131100182;
+			public const int m3_sys_color_light_surface_container_high = 2131100182;
 			
 			// aapt resource value: 0x7F060217
-			public const int m3_sys_color_light_surface_bright = 2131100183;
+			public const int m3_sys_color_light_surface_container_highest = 2131100183;
 			
 			// aapt resource value: 0x7F060218
-			public const int m3_sys_color_light_surface_container = 2131100184;
+			public const int m3_sys_color_light_surface_container_low = 2131100184;
 			
 			// aapt resource value: 0x7F060219
-			public const int m3_sys_color_light_surface_container_high = 2131100185;
+			public const int m3_sys_color_light_surface_container_lowest = 2131100185;
 			
 			// aapt resource value: 0x7F06021A
-			public const int m3_sys_color_light_surface_container_highest = 2131100186;
+			public const int m3_sys_color_light_surface_dim = 2131100186;
 			
 			// aapt resource value: 0x7F06021B
-			public const int m3_sys_color_light_surface_container_low = 2131100187;
+			public const int m3_sys_color_light_surface_variant = 2131100187;
 			
 			// aapt resource value: 0x7F06021C
-			public const int m3_sys_color_light_surface_container_lowest = 2131100188;
+			public const int m3_sys_color_light_tertiary = 2131100188;
 			
 			// aapt resource value: 0x7F06021D
-			public const int m3_sys_color_light_surface_dim = 2131100189;
+			public const int m3_sys_color_light_tertiary_container = 2131100189;
 			
 			// aapt resource value: 0x7F06021E
-			public const int m3_sys_color_light_surface_variant = 2131100190;
+			public const int m3_sys_color_on_primary_fixed = 2131100190;
 			
 			// aapt resource value: 0x7F06021F
-			public const int m3_sys_color_light_tertiary = 2131100191;
+			public const int m3_sys_color_on_primary_fixed_variant = 2131100191;
 			
 			// aapt resource value: 0x7F060220
-			public const int m3_sys_color_light_tertiary_container = 2131100192;
+			public const int m3_sys_color_on_secondary_fixed = 2131100192;
 			
 			// aapt resource value: 0x7F060221
-			public const int m3_sys_color_on_primary_fixed = 2131100193;
+			public const int m3_sys_color_on_secondary_fixed_variant = 2131100193;
 			
 			// aapt resource value: 0x7F060222
-			public const int m3_sys_color_on_primary_fixed_variant = 2131100194;
+			public const int m3_sys_color_on_tertiary_fixed = 2131100194;
 			
 			// aapt resource value: 0x7F060223
-			public const int m3_sys_color_on_secondary_fixed = 2131100195;
+			public const int m3_sys_color_on_tertiary_fixed_variant = 2131100195;
 			
 			// aapt resource value: 0x7F060224
-			public const int m3_sys_color_on_secondary_fixed_variant = 2131100196;
+			public const int m3_sys_color_primary_fixed = 2131100196;
 			
 			// aapt resource value: 0x7F060225
-			public const int m3_sys_color_on_tertiary_fixed = 2131100197;
+			public const int m3_sys_color_primary_fixed_dim = 2131100197;
 			
 			// aapt resource value: 0x7F060226
-			public const int m3_sys_color_on_tertiary_fixed_variant = 2131100198;
+			public const int m3_sys_color_secondary_fixed = 2131100198;
 			
 			// aapt resource value: 0x7F060227
-			public const int m3_sys_color_primary_fixed = 2131100199;
+			public const int m3_sys_color_secondary_fixed_dim = 2131100199;
 			
 			// aapt resource value: 0x7F060228
-			public const int m3_sys_color_primary_fixed_dim = 2131100200;
+			public const int m3_sys_color_tertiary_fixed = 2131100200;
 			
 			// aapt resource value: 0x7F060229
-			public const int m3_sys_color_secondary_fixed = 2131100201;
+			public const int m3_sys_color_tertiary_fixed_dim = 2131100201;
 			
 			// aapt resource value: 0x7F06022A
-			public const int m3_sys_color_secondary_fixed_dim = 2131100202;
+			public const int m3_tabs_icon_color = 2131100202;
 			
 			// aapt resource value: 0x7F06022B
-			public const int m3_sys_color_tertiary_fixed = 2131100203;
+			public const int m3_tabs_icon_color_secondary = 2131100203;
 			
 			// aapt resource value: 0x7F06022C
-			public const int m3_sys_color_tertiary_fixed_dim = 2131100204;
+			public const int m3_tabs_ripple_color = 2131100204;
 			
 			// aapt resource value: 0x7F06022D
-			public const int m3_tabs_icon_color = 2131100205;
+			public const int m3_tabs_ripple_color_secondary = 2131100205;
 			
 			// aapt resource value: 0x7F06022E
-			public const int m3_tabs_icon_color_secondary = 2131100206;
+			public const int m3_tabs_text_color = 2131100206;
 			
 			// aapt resource value: 0x7F06022F
-			public const int m3_tabs_ripple_color = 2131100207;
-			
-			// aapt resource value: 0x7F060230
-			public const int m3_tabs_ripple_color_secondary = 2131100208;
-			
-			// aapt resource value: 0x7F060231
-			public const int m3_tabs_text_color = 2131100209;
-			
-			// aapt resource value: 0x7F060232
-			public const int m3_tabs_text_color_secondary = 2131100210;
-			
-			// aapt resource value: 0x7F060236
-			public const int m3_textfield_filled_background_color = 2131100214;
-			
-			// aapt resource value: 0x7F060237
-			public const int m3_textfield_indicator_text_color = 2131100215;
-			
-			// aapt resource value: 0x7F060238
-			public const int m3_textfield_input_text_color = 2131100216;
-			
-			// aapt resource value: 0x7F060239
-			public const int m3_textfield_label_color = 2131100217;
-			
-			// aapt resource value: 0x7F06023A
-			public const int m3_textfield_stroke_color = 2131100218;
+			public const int m3_tabs_text_color_secondary = 2131100207;
 			
 			// aapt resource value: 0x7F060233
-			public const int m3_text_button_background_color_selector = 2131100211;
+			public const int m3_textfield_filled_background_color = 2131100211;
 			
 			// aapt resource value: 0x7F060234
-			public const int m3_text_button_foreground_color_selector = 2131100212;
+			public const int m3_textfield_indicator_text_color = 2131100212;
 			
 			// aapt resource value: 0x7F060235
-			public const int m3_text_button_ripple_color_selector = 2131100213;
+			public const int m3_textfield_input_text_color = 2131100213;
+			
+			// aapt resource value: 0x7F060236
+			public const int m3_textfield_label_color = 2131100214;
+			
+			// aapt resource value: 0x7F060237
+			public const int m3_textfield_stroke_color = 2131100215;
+			
+			// aapt resource value: 0x7F060230
+			public const int m3_text_button_background_color_selector = 2131100208;
+			
+			// aapt resource value: 0x7F060231
+			public const int m3_text_button_foreground_color_selector = 2131100209;
+			
+			// aapt resource value: 0x7F060232
+			public const int m3_text_button_ripple_color_selector = 2131100210;
+			
+			// aapt resource value: 0x7F060238
+			public const int m3_timepicker_button_background_color = 2131100216;
+			
+			// aapt resource value: 0x7F060239
+			public const int m3_timepicker_button_ripple_color = 2131100217;
+			
+			// aapt resource value: 0x7F06023A
+			public const int m3_timepicker_button_text_color = 2131100218;
 			
 			// aapt resource value: 0x7F06023B
-			public const int m3_timepicker_button_background_color = 2131100219;
+			public const int m3_timepicker_clock_text_color = 2131100219;
 			
 			// aapt resource value: 0x7F06023C
-			public const int m3_timepicker_button_ripple_color = 2131100220;
+			public const int m3_timepicker_display_background_color = 2131100220;
 			
 			// aapt resource value: 0x7F06023D
-			public const int m3_timepicker_button_text_color = 2131100221;
+			public const int m3_timepicker_display_ripple_color = 2131100221;
 			
 			// aapt resource value: 0x7F06023E
-			public const int m3_timepicker_clock_text_color = 2131100222;
+			public const int m3_timepicker_display_text_color = 2131100222;
 			
 			// aapt resource value: 0x7F06023F
-			public const int m3_timepicker_display_background_color = 2131100223;
+			public const int m3_timepicker_secondary_text_button_ripple_color = 2131100223;
 			
 			// aapt resource value: 0x7F060240
-			public const int m3_timepicker_display_ripple_color = 2131100224;
+			public const int m3_timepicker_secondary_text_button_text_color = 2131100224;
 			
 			// aapt resource value: 0x7F060241
-			public const int m3_timepicker_display_text_color = 2131100225;
+			public const int m3_timepicker_time_input_stroke_color = 2131100225;
 			
 			// aapt resource value: 0x7F060242
-			public const int m3_timepicker_secondary_text_button_ripple_color = 2131100226;
+			public const int m3_tonal_button_ripple_color_selector = 2131100226;
 			
 			// aapt resource value: 0x7F060243
-			public const int m3_timepicker_secondary_text_button_text_color = 2131100227;
+			public const int material_blue_grey_800 = 2131100227;
 			
 			// aapt resource value: 0x7F060244
-			public const int m3_timepicker_time_input_stroke_color = 2131100228;
+			public const int material_blue_grey_900 = 2131100228;
 			
 			// aapt resource value: 0x7F060245
-			public const int m3_tonal_button_ripple_color_selector = 2131100229;
+			public const int material_blue_grey_950 = 2131100229;
 			
 			// aapt resource value: 0x7F060246
-			public const int material_blue_grey_800 = 2131100230;
+			public const int material_cursor_color = 2131100230;
 			
 			// aapt resource value: 0x7F060247
-			public const int material_blue_grey_900 = 2131100231;
+			public const int material_deep_teal_200 = 2131100231;
 			
 			// aapt resource value: 0x7F060248
-			public const int material_blue_grey_950 = 2131100232;
+			public const int material_deep_teal_500 = 2131100232;
 			
 			// aapt resource value: 0x7F060249
-			public const int material_cursor_color = 2131100233;
+			public const int material_divider_color = 2131100233;
 			
 			// aapt resource value: 0x7F06024A
-			public const int material_deep_teal_200 = 2131100234;
+			public const int material_dynamic_neutral0 = 2131100234;
 			
 			// aapt resource value: 0x7F06024B
-			public const int material_deep_teal_500 = 2131100235;
+			public const int material_dynamic_neutral10 = 2131100235;
 			
 			// aapt resource value: 0x7F06024C
-			public const int material_divider_color = 2131100236;
+			public const int material_dynamic_neutral100 = 2131100236;
 			
 			// aapt resource value: 0x7F06024D
-			public const int material_dynamic_neutral0 = 2131100237;
+			public const int material_dynamic_neutral20 = 2131100237;
 			
 			// aapt resource value: 0x7F06024E
-			public const int material_dynamic_neutral10 = 2131100238;
+			public const int material_dynamic_neutral30 = 2131100238;
 			
 			// aapt resource value: 0x7F06024F
-			public const int material_dynamic_neutral100 = 2131100239;
+			public const int material_dynamic_neutral40 = 2131100239;
 			
 			// aapt resource value: 0x7F060250
-			public const int material_dynamic_neutral20 = 2131100240;
+			public const int material_dynamic_neutral50 = 2131100240;
 			
 			// aapt resource value: 0x7F060251
-			public const int material_dynamic_neutral30 = 2131100241;
+			public const int material_dynamic_neutral60 = 2131100241;
 			
 			// aapt resource value: 0x7F060252
-			public const int material_dynamic_neutral40 = 2131100242;
+			public const int material_dynamic_neutral70 = 2131100242;
 			
 			// aapt resource value: 0x7F060253
-			public const int material_dynamic_neutral50 = 2131100243;
+			public const int material_dynamic_neutral80 = 2131100243;
 			
 			// aapt resource value: 0x7F060254
-			public const int material_dynamic_neutral60 = 2131100244;
+			public const int material_dynamic_neutral90 = 2131100244;
 			
 			// aapt resource value: 0x7F060255
-			public const int material_dynamic_neutral70 = 2131100245;
+			public const int material_dynamic_neutral95 = 2131100245;
 			
 			// aapt resource value: 0x7F060256
-			public const int material_dynamic_neutral80 = 2131100246;
+			public const int material_dynamic_neutral99 = 2131100246;
 			
 			// aapt resource value: 0x7F060257
-			public const int material_dynamic_neutral90 = 2131100247;
+			public const int material_dynamic_neutral_variant0 = 2131100247;
 			
 			// aapt resource value: 0x7F060258
-			public const int material_dynamic_neutral95 = 2131100248;
+			public const int material_dynamic_neutral_variant10 = 2131100248;
 			
 			// aapt resource value: 0x7F060259
-			public const int material_dynamic_neutral99 = 2131100249;
+			public const int material_dynamic_neutral_variant100 = 2131100249;
 			
 			// aapt resource value: 0x7F06025A
-			public const int material_dynamic_neutral_variant0 = 2131100250;
+			public const int material_dynamic_neutral_variant20 = 2131100250;
 			
 			// aapt resource value: 0x7F06025B
-			public const int material_dynamic_neutral_variant10 = 2131100251;
+			public const int material_dynamic_neutral_variant30 = 2131100251;
 			
 			// aapt resource value: 0x7F06025C
-			public const int material_dynamic_neutral_variant100 = 2131100252;
+			public const int material_dynamic_neutral_variant40 = 2131100252;
 			
 			// aapt resource value: 0x7F06025D
-			public const int material_dynamic_neutral_variant20 = 2131100253;
+			public const int material_dynamic_neutral_variant50 = 2131100253;
 			
 			// aapt resource value: 0x7F06025E
-			public const int material_dynamic_neutral_variant30 = 2131100254;
+			public const int material_dynamic_neutral_variant60 = 2131100254;
 			
 			// aapt resource value: 0x7F06025F
-			public const int material_dynamic_neutral_variant40 = 2131100255;
+			public const int material_dynamic_neutral_variant70 = 2131100255;
 			
 			// aapt resource value: 0x7F060260
-			public const int material_dynamic_neutral_variant50 = 2131100256;
+			public const int material_dynamic_neutral_variant80 = 2131100256;
 			
 			// aapt resource value: 0x7F060261
-			public const int material_dynamic_neutral_variant60 = 2131100257;
+			public const int material_dynamic_neutral_variant90 = 2131100257;
 			
 			// aapt resource value: 0x7F060262
-			public const int material_dynamic_neutral_variant70 = 2131100258;
+			public const int material_dynamic_neutral_variant95 = 2131100258;
 			
 			// aapt resource value: 0x7F060263
-			public const int material_dynamic_neutral_variant80 = 2131100259;
+			public const int material_dynamic_neutral_variant99 = 2131100259;
 			
 			// aapt resource value: 0x7F060264
-			public const int material_dynamic_neutral_variant90 = 2131100260;
+			public const int material_dynamic_primary0 = 2131100260;
 			
 			// aapt resource value: 0x7F060265
-			public const int material_dynamic_neutral_variant95 = 2131100261;
+			public const int material_dynamic_primary10 = 2131100261;
 			
 			// aapt resource value: 0x7F060266
-			public const int material_dynamic_neutral_variant99 = 2131100262;
+			public const int material_dynamic_primary100 = 2131100262;
 			
 			// aapt resource value: 0x7F060267
-			public const int material_dynamic_primary0 = 2131100263;
+			public const int material_dynamic_primary20 = 2131100263;
 			
 			// aapt resource value: 0x7F060268
-			public const int material_dynamic_primary10 = 2131100264;
+			public const int material_dynamic_primary30 = 2131100264;
 			
 			// aapt resource value: 0x7F060269
-			public const int material_dynamic_primary100 = 2131100265;
+			public const int material_dynamic_primary40 = 2131100265;
 			
 			// aapt resource value: 0x7F06026A
-			public const int material_dynamic_primary20 = 2131100266;
+			public const int material_dynamic_primary50 = 2131100266;
 			
 			// aapt resource value: 0x7F06026B
-			public const int material_dynamic_primary30 = 2131100267;
+			public const int material_dynamic_primary60 = 2131100267;
 			
 			// aapt resource value: 0x7F06026C
-			public const int material_dynamic_primary40 = 2131100268;
+			public const int material_dynamic_primary70 = 2131100268;
 			
 			// aapt resource value: 0x7F06026D
-			public const int material_dynamic_primary50 = 2131100269;
+			public const int material_dynamic_primary80 = 2131100269;
 			
 			// aapt resource value: 0x7F06026E
-			public const int material_dynamic_primary60 = 2131100270;
+			public const int material_dynamic_primary90 = 2131100270;
 			
 			// aapt resource value: 0x7F06026F
-			public const int material_dynamic_primary70 = 2131100271;
+			public const int material_dynamic_primary95 = 2131100271;
 			
 			// aapt resource value: 0x7F060270
-			public const int material_dynamic_primary80 = 2131100272;
+			public const int material_dynamic_primary99 = 2131100272;
 			
 			// aapt resource value: 0x7F060271
-			public const int material_dynamic_primary90 = 2131100273;
+			public const int material_dynamic_secondary0 = 2131100273;
 			
 			// aapt resource value: 0x7F060272
-			public const int material_dynamic_primary95 = 2131100274;
+			public const int material_dynamic_secondary10 = 2131100274;
 			
 			// aapt resource value: 0x7F060273
-			public const int material_dynamic_primary99 = 2131100275;
+			public const int material_dynamic_secondary100 = 2131100275;
 			
 			// aapt resource value: 0x7F060274
-			public const int material_dynamic_secondary0 = 2131100276;
+			public const int material_dynamic_secondary20 = 2131100276;
 			
 			// aapt resource value: 0x7F060275
-			public const int material_dynamic_secondary10 = 2131100277;
+			public const int material_dynamic_secondary30 = 2131100277;
 			
 			// aapt resource value: 0x7F060276
-			public const int material_dynamic_secondary100 = 2131100278;
+			public const int material_dynamic_secondary40 = 2131100278;
 			
 			// aapt resource value: 0x7F060277
-			public const int material_dynamic_secondary20 = 2131100279;
+			public const int material_dynamic_secondary50 = 2131100279;
 			
 			// aapt resource value: 0x7F060278
-			public const int material_dynamic_secondary30 = 2131100280;
+			public const int material_dynamic_secondary60 = 2131100280;
 			
 			// aapt resource value: 0x7F060279
-			public const int material_dynamic_secondary40 = 2131100281;
+			public const int material_dynamic_secondary70 = 2131100281;
 			
 			// aapt resource value: 0x7F06027A
-			public const int material_dynamic_secondary50 = 2131100282;
+			public const int material_dynamic_secondary80 = 2131100282;
 			
 			// aapt resource value: 0x7F06027B
-			public const int material_dynamic_secondary60 = 2131100283;
+			public const int material_dynamic_secondary90 = 2131100283;
 			
 			// aapt resource value: 0x7F06027C
-			public const int material_dynamic_secondary70 = 2131100284;
+			public const int material_dynamic_secondary95 = 2131100284;
 			
 			// aapt resource value: 0x7F06027D
-			public const int material_dynamic_secondary80 = 2131100285;
+			public const int material_dynamic_secondary99 = 2131100285;
 			
 			// aapt resource value: 0x7F06027E
-			public const int material_dynamic_secondary90 = 2131100286;
+			public const int material_dynamic_tertiary0 = 2131100286;
 			
 			// aapt resource value: 0x7F06027F
-			public const int material_dynamic_secondary95 = 2131100287;
+			public const int material_dynamic_tertiary10 = 2131100287;
 			
 			// aapt resource value: 0x7F060280
-			public const int material_dynamic_secondary99 = 2131100288;
+			public const int material_dynamic_tertiary100 = 2131100288;
 			
 			// aapt resource value: 0x7F060281
-			public const int material_dynamic_tertiary0 = 2131100289;
+			public const int material_dynamic_tertiary20 = 2131100289;
 			
 			// aapt resource value: 0x7F060282
-			public const int material_dynamic_tertiary10 = 2131100290;
+			public const int material_dynamic_tertiary30 = 2131100290;
 			
 			// aapt resource value: 0x7F060283
-			public const int material_dynamic_tertiary100 = 2131100291;
+			public const int material_dynamic_tertiary40 = 2131100291;
 			
 			// aapt resource value: 0x7F060284
-			public const int material_dynamic_tertiary20 = 2131100292;
+			public const int material_dynamic_tertiary50 = 2131100292;
 			
 			// aapt resource value: 0x7F060285
-			public const int material_dynamic_tertiary30 = 2131100293;
+			public const int material_dynamic_tertiary60 = 2131100293;
 			
 			// aapt resource value: 0x7F060286
-			public const int material_dynamic_tertiary40 = 2131100294;
+			public const int material_dynamic_tertiary70 = 2131100294;
 			
 			// aapt resource value: 0x7F060287
-			public const int material_dynamic_tertiary50 = 2131100295;
+			public const int material_dynamic_tertiary80 = 2131100295;
 			
 			// aapt resource value: 0x7F060288
-			public const int material_dynamic_tertiary60 = 2131100296;
+			public const int material_dynamic_tertiary90 = 2131100296;
 			
 			// aapt resource value: 0x7F060289
-			public const int material_dynamic_tertiary70 = 2131100297;
+			public const int material_dynamic_tertiary95 = 2131100297;
 			
 			// aapt resource value: 0x7F06028A
-			public const int material_dynamic_tertiary80 = 2131100298;
+			public const int material_dynamic_tertiary99 = 2131100298;
 			
 			// aapt resource value: 0x7F06028B
-			public const int material_dynamic_tertiary90 = 2131100299;
+			public const int material_grey_100 = 2131100299;
 			
 			// aapt resource value: 0x7F06028C
-			public const int material_dynamic_tertiary95 = 2131100300;
+			public const int material_grey_300 = 2131100300;
 			
 			// aapt resource value: 0x7F06028D
-			public const int material_dynamic_tertiary99 = 2131100301;
+			public const int material_grey_50 = 2131100301;
 			
 			// aapt resource value: 0x7F06028E
-			public const int material_grey_100 = 2131100302;
+			public const int material_grey_600 = 2131100302;
 			
 			// aapt resource value: 0x7F06028F
-			public const int material_grey_300 = 2131100303;
+			public const int material_grey_800 = 2131100303;
 			
 			// aapt resource value: 0x7F060290
-			public const int material_grey_50 = 2131100304;
+			public const int material_grey_850 = 2131100304;
 			
 			// aapt resource value: 0x7F060291
-			public const int material_grey_600 = 2131100305;
+			public const int material_grey_900 = 2131100305;
 			
 			// aapt resource value: 0x7F060292
-			public const int material_grey_800 = 2131100306;
+			public const int material_harmonized_color_error = 2131100306;
 			
 			// aapt resource value: 0x7F060293
-			public const int material_grey_850 = 2131100307;
+			public const int material_harmonized_color_error_container = 2131100307;
 			
 			// aapt resource value: 0x7F060294
-			public const int material_grey_900 = 2131100308;
+			public const int material_harmonized_color_on_error = 2131100308;
 			
 			// aapt resource value: 0x7F060295
-			public const int material_harmonized_color_error = 2131100309;
+			public const int material_harmonized_color_on_error_container = 2131100309;
 			
 			// aapt resource value: 0x7F060296
-			public const int material_harmonized_color_error_container = 2131100310;
+			public const int material_on_background_disabled = 2131100310;
 			
 			// aapt resource value: 0x7F060297
-			public const int material_harmonized_color_on_error = 2131100311;
+			public const int material_on_background_emphasis_high_type = 2131100311;
 			
 			// aapt resource value: 0x7F060298
-			public const int material_harmonized_color_on_error_container = 2131100312;
+			public const int material_on_background_emphasis_medium = 2131100312;
 			
 			// aapt resource value: 0x7F060299
-			public const int material_on_background_disabled = 2131100313;
+			public const int material_on_primary_disabled = 2131100313;
 			
 			// aapt resource value: 0x7F06029A
-			public const int material_on_background_emphasis_high_type = 2131100314;
+			public const int material_on_primary_emphasis_high_type = 2131100314;
 			
 			// aapt resource value: 0x7F06029B
-			public const int material_on_background_emphasis_medium = 2131100315;
+			public const int material_on_primary_emphasis_medium = 2131100315;
 			
 			// aapt resource value: 0x7F06029C
-			public const int material_on_primary_disabled = 2131100316;
+			public const int material_on_surface_disabled = 2131100316;
 			
 			// aapt resource value: 0x7F06029D
-			public const int material_on_primary_emphasis_high_type = 2131100317;
+			public const int material_on_surface_emphasis_high_type = 2131100317;
 			
 			// aapt resource value: 0x7F06029E
-			public const int material_on_primary_emphasis_medium = 2131100318;
+			public const int material_on_surface_emphasis_medium = 2131100318;
 			
 			// aapt resource value: 0x7F06029F
-			public const int material_on_surface_disabled = 2131100319;
-			
-			// aapt resource value: 0x7F0602A0
-			public const int material_on_surface_emphasis_high_type = 2131100320;
-			
-			// aapt resource value: 0x7F0602A1
-			public const int material_on_surface_emphasis_medium = 2131100321;
+			public const int material_on_surface_stroke = 2131100319;
 			
 			// aapt resource value: 0x7F0602A2
-			public const int material_on_surface_stroke = 2131100322;
-			
-			// aapt resource value: 0x7F0602A5
-			public const int material_personalized_color_background = 2131100325;
-			
-			// aapt resource value: 0x7F0602A6
-			public const int material_personalized_color_control_activated = 2131100326;
-			
-			// aapt resource value: 0x7F0602A7
-			public const int material_personalized_color_control_highlight = 2131100327;
-			
-			// aapt resource value: 0x7F0602A8
-			public const int material_personalized_color_control_normal = 2131100328;
-			
-			// aapt resource value: 0x7F0602A9
-			public const int material_personalized_color_error = 2131100329;
-			
-			// aapt resource value: 0x7F0602AA
-			public const int material_personalized_color_error_container = 2131100330;
-			
-			// aapt resource value: 0x7F0602AB
-			public const int material_personalized_color_on_background = 2131100331;
-			
-			// aapt resource value: 0x7F0602AC
-			public const int material_personalized_color_on_error = 2131100332;
-			
-			// aapt resource value: 0x7F0602AD
-			public const int material_personalized_color_on_error_container = 2131100333;
-			
-			// aapt resource value: 0x7F0602AE
-			public const int material_personalized_color_on_primary = 2131100334;
-			
-			// aapt resource value: 0x7F0602AF
-			public const int material_personalized_color_on_primary_container = 2131100335;
-			
-			// aapt resource value: 0x7F0602B0
-			public const int material_personalized_color_on_secondary = 2131100336;
-			
-			// aapt resource value: 0x7F0602B1
-			public const int material_personalized_color_on_secondary_container = 2131100337;
-			
-			// aapt resource value: 0x7F0602B2
-			public const int material_personalized_color_on_surface = 2131100338;
-			
-			// aapt resource value: 0x7F0602B3
-			public const int material_personalized_color_on_surface_inverse = 2131100339;
-			
-			// aapt resource value: 0x7F0602B4
-			public const int material_personalized_color_on_surface_variant = 2131100340;
-			
-			// aapt resource value: 0x7F0602B5
-			public const int material_personalized_color_on_tertiary = 2131100341;
-			
-			// aapt resource value: 0x7F0602B6
-			public const int material_personalized_color_on_tertiary_container = 2131100342;
-			
-			// aapt resource value: 0x7F0602B7
-			public const int material_personalized_color_outline = 2131100343;
-			
-			// aapt resource value: 0x7F0602B8
-			public const int material_personalized_color_outline_variant = 2131100344;
-			
-			// aapt resource value: 0x7F0602B9
-			public const int material_personalized_color_primary = 2131100345;
-			
-			// aapt resource value: 0x7F0602BA
-			public const int material_personalized_color_primary_container = 2131100346;
-			
-			// aapt resource value: 0x7F0602BB
-			public const int material_personalized_color_primary_inverse = 2131100347;
-			
-			// aapt resource value: 0x7F0602BC
-			public const int material_personalized_color_primary_text = 2131100348;
-			
-			// aapt resource value: 0x7F0602BD
-			public const int material_personalized_color_primary_text_inverse = 2131100349;
-			
-			// aapt resource value: 0x7F0602BE
-			public const int material_personalized_color_secondary = 2131100350;
-			
-			// aapt resource value: 0x7F0602BF
-			public const int material_personalized_color_secondary_container = 2131100351;
-			
-			// aapt resource value: 0x7F0602C0
-			public const int material_personalized_color_secondary_text = 2131100352;
-			
-			// aapt resource value: 0x7F0602C1
-			public const int material_personalized_color_secondary_text_inverse = 2131100353;
-			
-			// aapt resource value: 0x7F0602C2
-			public const int material_personalized_color_surface = 2131100354;
-			
-			// aapt resource value: 0x7F0602C3
-			public const int material_personalized_color_surface_bright = 2131100355;
-			
-			// aapt resource value: 0x7F0602C4
-			public const int material_personalized_color_surface_container = 2131100356;
-			
-			// aapt resource value: 0x7F0602C5
-			public const int material_personalized_color_surface_container_high = 2131100357;
-			
-			// aapt resource value: 0x7F0602C6
-			public const int material_personalized_color_surface_container_highest = 2131100358;
-			
-			// aapt resource value: 0x7F0602C7
-			public const int material_personalized_color_surface_container_low = 2131100359;
-			
-			// aapt resource value: 0x7F0602C8
-			public const int material_personalized_color_surface_container_lowest = 2131100360;
-			
-			// aapt resource value: 0x7F0602C9
-			public const int material_personalized_color_surface_dim = 2131100361;
-			
-			// aapt resource value: 0x7F0602CA
-			public const int material_personalized_color_surface_inverse = 2131100362;
-			
-			// aapt resource value: 0x7F0602CB
-			public const int material_personalized_color_surface_variant = 2131100363;
-			
-			// aapt resource value: 0x7F0602CC
-			public const int material_personalized_color_tertiary = 2131100364;
-			
-			// aapt resource value: 0x7F0602CD
-			public const int material_personalized_color_tertiary_container = 2131100365;
-			
-			// aapt resource value: 0x7F0602CE
-			public const int material_personalized_color_text_hint_foreground_inverse = 2131100366;
-			
-			// aapt resource value: 0x7F0602CF
-			public const int material_personalized_color_text_primary_inverse = 2131100367;
-			
-			// aapt resource value: 0x7F0602D0
-			public const int material_personalized_color_text_primary_inverse_disable_only = 2131100368;
-			
-			// aapt resource value: 0x7F0602D1
-			public const int material_personalized_color_text_secondary_and_tertiary_inverse = 2131100369;
-			
-			// aapt resource value: 0x7F0602D2
-			public const int material_personalized_color_text_secondary_and_tertiary_inverse_disabled = 2131100370;
-			
-			// aapt resource value: 0x7F0602D3
-			public const int material_personalized_hint_foreground = 2131100371;
-			
-			// aapt resource value: 0x7F0602D4
-			public const int material_personalized_hint_foreground_inverse = 2131100372;
-			
-			// aapt resource value: 0x7F0602D5
-			public const int material_personalized_primary_inverse_text_disable_only = 2131100373;
-			
-			// aapt resource value: 0x7F0602D6
-			public const int material_personalized_primary_text_disable_only = 2131100374;
+			public const int material_personalized_color_background = 2131100322;
 			
 			// aapt resource value: 0x7F0602A3
-			public const int material_personalized__highlighted_text = 2131100323;
+			public const int material_personalized_color_control_activated = 2131100323;
 			
 			// aapt resource value: 0x7F0602A4
-			public const int material_personalized__highlighted_text_inverse = 2131100324;
+			public const int material_personalized_color_control_highlight = 2131100324;
+			
+			// aapt resource value: 0x7F0602A5
+			public const int material_personalized_color_control_normal = 2131100325;
+			
+			// aapt resource value: 0x7F0602A6
+			public const int material_personalized_color_error = 2131100326;
+			
+			// aapt resource value: 0x7F0602A7
+			public const int material_personalized_color_error_container = 2131100327;
+			
+			// aapt resource value: 0x7F0602A8
+			public const int material_personalized_color_on_background = 2131100328;
+			
+			// aapt resource value: 0x7F0602A9
+			public const int material_personalized_color_on_error = 2131100329;
+			
+			// aapt resource value: 0x7F0602AA
+			public const int material_personalized_color_on_error_container = 2131100330;
+			
+			// aapt resource value: 0x7F0602AB
+			public const int material_personalized_color_on_primary = 2131100331;
+			
+			// aapt resource value: 0x7F0602AC
+			public const int material_personalized_color_on_primary_container = 2131100332;
+			
+			// aapt resource value: 0x7F0602AD
+			public const int material_personalized_color_on_secondary = 2131100333;
+			
+			// aapt resource value: 0x7F0602AE
+			public const int material_personalized_color_on_secondary_container = 2131100334;
+			
+			// aapt resource value: 0x7F0602AF
+			public const int material_personalized_color_on_surface = 2131100335;
+			
+			// aapt resource value: 0x7F0602B0
+			public const int material_personalized_color_on_surface_inverse = 2131100336;
+			
+			// aapt resource value: 0x7F0602B1
+			public const int material_personalized_color_on_surface_variant = 2131100337;
+			
+			// aapt resource value: 0x7F0602B2
+			public const int material_personalized_color_on_tertiary = 2131100338;
+			
+			// aapt resource value: 0x7F0602B3
+			public const int material_personalized_color_on_tertiary_container = 2131100339;
+			
+			// aapt resource value: 0x7F0602B4
+			public const int material_personalized_color_outline = 2131100340;
+			
+			// aapt resource value: 0x7F0602B5
+			public const int material_personalized_color_outline_variant = 2131100341;
+			
+			// aapt resource value: 0x7F0602B6
+			public const int material_personalized_color_primary = 2131100342;
+			
+			// aapt resource value: 0x7F0602B7
+			public const int material_personalized_color_primary_container = 2131100343;
+			
+			// aapt resource value: 0x7F0602B8
+			public const int material_personalized_color_primary_inverse = 2131100344;
+			
+			// aapt resource value: 0x7F0602B9
+			public const int material_personalized_color_primary_text = 2131100345;
+			
+			// aapt resource value: 0x7F0602BA
+			public const int material_personalized_color_primary_text_inverse = 2131100346;
+			
+			// aapt resource value: 0x7F0602BB
+			public const int material_personalized_color_secondary = 2131100347;
+			
+			// aapt resource value: 0x7F0602BC
+			public const int material_personalized_color_secondary_container = 2131100348;
+			
+			// aapt resource value: 0x7F0602BD
+			public const int material_personalized_color_secondary_text = 2131100349;
+			
+			// aapt resource value: 0x7F0602BE
+			public const int material_personalized_color_secondary_text_inverse = 2131100350;
+			
+			// aapt resource value: 0x7F0602BF
+			public const int material_personalized_color_surface = 2131100351;
+			
+			// aapt resource value: 0x7F0602C0
+			public const int material_personalized_color_surface_bright = 2131100352;
+			
+			// aapt resource value: 0x7F0602C1
+			public const int material_personalized_color_surface_container = 2131100353;
+			
+			// aapt resource value: 0x7F0602C2
+			public const int material_personalized_color_surface_container_high = 2131100354;
+			
+			// aapt resource value: 0x7F0602C3
+			public const int material_personalized_color_surface_container_highest = 2131100355;
+			
+			// aapt resource value: 0x7F0602C4
+			public const int material_personalized_color_surface_container_low = 2131100356;
+			
+			// aapt resource value: 0x7F0602C5
+			public const int material_personalized_color_surface_container_lowest = 2131100357;
+			
+			// aapt resource value: 0x7F0602C6
+			public const int material_personalized_color_surface_dim = 2131100358;
+			
+			// aapt resource value: 0x7F0602C7
+			public const int material_personalized_color_surface_inverse = 2131100359;
+			
+			// aapt resource value: 0x7F0602C8
+			public const int material_personalized_color_surface_variant = 2131100360;
+			
+			// aapt resource value: 0x7F0602C9
+			public const int material_personalized_color_tertiary = 2131100361;
+			
+			// aapt resource value: 0x7F0602CA
+			public const int material_personalized_color_tertiary_container = 2131100362;
+			
+			// aapt resource value: 0x7F0602CB
+			public const int material_personalized_color_text_hint_foreground_inverse = 2131100363;
+			
+			// aapt resource value: 0x7F0602CC
+			public const int material_personalized_color_text_primary_inverse = 2131100364;
+			
+			// aapt resource value: 0x7F0602CD
+			public const int material_personalized_color_text_primary_inverse_disable_only = 2131100365;
+			
+			// aapt resource value: 0x7F0602CE
+			public const int material_personalized_color_text_secondary_and_tertiary_inverse = 2131100366;
+			
+			// aapt resource value: 0x7F0602CF
+			public const int material_personalized_color_text_secondary_and_tertiary_inverse_disabled = 2131100367;
+			
+			// aapt resource value: 0x7F0602D0
+			public const int material_personalized_hint_foreground = 2131100368;
+			
+			// aapt resource value: 0x7F0602D1
+			public const int material_personalized_hint_foreground_inverse = 2131100369;
+			
+			// aapt resource value: 0x7F0602D2
+			public const int material_personalized_primary_inverse_text_disable_only = 2131100370;
+			
+			// aapt resource value: 0x7F0602D3
+			public const int material_personalized_primary_text_disable_only = 2131100371;
+			
+			// aapt resource value: 0x7F0602A0
+			public const int material_personalized__highlighted_text = 2131100320;
+			
+			// aapt resource value: 0x7F0602A1
+			public const int material_personalized__highlighted_text_inverse = 2131100321;
+			
+			// aapt resource value: 0x7F0602D4
+			public const int material_red_500 = 2131100372;
+			
+			// aapt resource value: 0x7F0602D5
+			public const int material_slider_active_tick_marks_color = 2131100373;
+			
+			// aapt resource value: 0x7F0602D6
+			public const int material_slider_active_track_color = 2131100374;
 			
 			// aapt resource value: 0x7F0602D7
-			public const int material_red_500 = 2131100375;
+			public const int material_slider_halo_color = 2131100375;
 			
 			// aapt resource value: 0x7F0602D8
-			public const int material_slider_active_tick_marks_color = 2131100376;
+			public const int material_slider_inactive_tick_marks_color = 2131100376;
 			
 			// aapt resource value: 0x7F0602D9
-			public const int material_slider_active_track_color = 2131100377;
+			public const int material_slider_inactive_track_color = 2131100377;
 			
 			// aapt resource value: 0x7F0602DA
-			public const int material_slider_halo_color = 2131100378;
+			public const int material_slider_thumb_color = 2131100378;
 			
 			// aapt resource value: 0x7F0602DB
-			public const int material_slider_inactive_tick_marks_color = 2131100379;
+			public const int material_timepicker_button_background = 2131100379;
 			
 			// aapt resource value: 0x7F0602DC
-			public const int material_slider_inactive_track_color = 2131100380;
-			
-			// aapt resource value: 0x7F0602DD
-			public const int material_slider_thumb_color = 2131100381;
+			public const int material_timepicker_button_stroke = 2131100380;
 			
 			// aapt resource value: 0x7F0602DE
-			public const int material_timepicker_button_background = 2131100382;
+			public const int material_timepicker_clockface = 2131100382;
+			
+			// aapt resource value: 0x7F0602DD
+			public const int material_timepicker_clock_text_color = 2131100381;
 			
 			// aapt resource value: 0x7F0602DF
-			public const int material_timepicker_button_stroke = 2131100383;
-			
-			// aapt resource value: 0x7F0602E1
-			public const int material_timepicker_clockface = 2131100385;
+			public const int material_timepicker_modebutton_tint = 2131100383;
 			
 			// aapt resource value: 0x7F0602E0
-			public const int material_timepicker_clock_text_color = 2131100384;
+			public const int mobile_common_text_edit_enable_selector = 2131100384;
+			
+			// aapt resource value: 0x7F0602E1
+			public const int mobile_common_text_name_enable_selector = 2131100385;
 			
 			// aapt resource value: 0x7F0602E2
-			public const int material_timepicker_modebutton_tint = 2131100386;
+			public const int mobile_common_title_text_color_selector = 2131100386;
 			
 			// aapt resource value: 0x7F0602E3
-			public const int mobile_common_text_edit_enable_selector = 2131100387;
+			public const int mobile_common_transparent = 2131100387;
 			
 			// aapt resource value: 0x7F0602E4
-			public const int mobile_common_text_name_enable_selector = 2131100388;
+			public const int mtrl_btn_bg_color_selector = 2131100388;
 			
 			// aapt resource value: 0x7F0602E5
-			public const int mobile_common_title_text_color_selector = 2131100389;
+			public const int mtrl_btn_ripple_color = 2131100389;
 			
 			// aapt resource value: 0x7F0602E6
-			public const int mobile_common_transparent = 2131100390;
+			public const int mtrl_btn_stroke_color_selector = 2131100390;
 			
 			// aapt resource value: 0x7F0602E7
-			public const int mtrl_btn_bg_color_selector = 2131100391;
+			public const int mtrl_btn_text_btn_bg_color_selector = 2131100391;
 			
 			// aapt resource value: 0x7F0602E8
-			public const int mtrl_btn_ripple_color = 2131100392;
+			public const int mtrl_btn_text_btn_ripple_color = 2131100392;
 			
 			// aapt resource value: 0x7F0602E9
-			public const int mtrl_btn_stroke_color_selector = 2131100393;
+			public const int mtrl_btn_text_color_disabled = 2131100393;
 			
 			// aapt resource value: 0x7F0602EA
-			public const int mtrl_btn_text_btn_bg_color_selector = 2131100394;
+			public const int mtrl_btn_text_color_selector = 2131100394;
 			
 			// aapt resource value: 0x7F0602EB
-			public const int mtrl_btn_text_btn_ripple_color = 2131100395;
+			public const int mtrl_btn_transparent_bg_color = 2131100395;
 			
 			// aapt resource value: 0x7F0602EC
-			public const int mtrl_btn_text_color_disabled = 2131100396;
+			public const int mtrl_calendar_item_stroke_color = 2131100396;
 			
 			// aapt resource value: 0x7F0602ED
-			public const int mtrl_btn_text_color_selector = 2131100397;
+			public const int mtrl_calendar_selected_range = 2131100397;
 			
 			// aapt resource value: 0x7F0602EE
-			public const int mtrl_btn_transparent_bg_color = 2131100398;
+			public const int mtrl_card_view_foreground = 2131100398;
 			
 			// aapt resource value: 0x7F0602EF
-			public const int mtrl_calendar_item_stroke_color = 2131100399;
+			public const int mtrl_card_view_ripple = 2131100399;
 			
 			// aapt resource value: 0x7F0602F0
-			public const int mtrl_calendar_selected_range = 2131100400;
+			public const int mtrl_chip_background_color = 2131100400;
 			
 			// aapt resource value: 0x7F0602F1
-			public const int mtrl_card_view_foreground = 2131100401;
+			public const int mtrl_chip_close_icon_tint = 2131100401;
 			
 			// aapt resource value: 0x7F0602F2
-			public const int mtrl_card_view_ripple = 2131100402;
+			public const int mtrl_chip_surface_color = 2131100402;
 			
 			// aapt resource value: 0x7F0602F3
-			public const int mtrl_chip_background_color = 2131100403;
+			public const int mtrl_chip_text_color = 2131100403;
 			
 			// aapt resource value: 0x7F0602F4
-			public const int mtrl_chip_close_icon_tint = 2131100404;
+			public const int mtrl_choice_chip_background_color = 2131100404;
 			
 			// aapt resource value: 0x7F0602F5
-			public const int mtrl_chip_surface_color = 2131100405;
+			public const int mtrl_choice_chip_ripple_color = 2131100405;
 			
 			// aapt resource value: 0x7F0602F6
-			public const int mtrl_chip_text_color = 2131100406;
+			public const int mtrl_choice_chip_text_color = 2131100406;
 			
 			// aapt resource value: 0x7F0602F7
-			public const int mtrl_choice_chip_background_color = 2131100407;
+			public const int mtrl_error = 2131100407;
 			
 			// aapt resource value: 0x7F0602F8
-			public const int mtrl_choice_chip_ripple_color = 2131100408;
+			public const int mtrl_fab_bg_color_selector = 2131100408;
 			
 			// aapt resource value: 0x7F0602F9
-			public const int mtrl_choice_chip_text_color = 2131100409;
+			public const int mtrl_fab_icon_text_color_selector = 2131100409;
 			
 			// aapt resource value: 0x7F0602FA
-			public const int mtrl_error = 2131100410;
+			public const int mtrl_fab_ripple_color = 2131100410;
 			
 			// aapt resource value: 0x7F0602FB
-			public const int mtrl_fab_bg_color_selector = 2131100411;
+			public const int mtrl_filled_background_color = 2131100411;
 			
 			// aapt resource value: 0x7F0602FC
-			public const int mtrl_fab_icon_text_color_selector = 2131100412;
+			public const int mtrl_filled_icon_tint = 2131100412;
 			
 			// aapt resource value: 0x7F0602FD
-			public const int mtrl_fab_ripple_color = 2131100413;
+			public const int mtrl_filled_stroke_color = 2131100413;
 			
 			// aapt resource value: 0x7F0602FE
-			public const int mtrl_filled_background_color = 2131100414;
+			public const int mtrl_indicator_text_color = 2131100414;
 			
 			// aapt resource value: 0x7F0602FF
-			public const int mtrl_filled_icon_tint = 2131100415;
+			public const int mtrl_navigation_bar_colored_item_tint = 2131100415;
 			
 			// aapt resource value: 0x7F060300
-			public const int mtrl_filled_stroke_color = 2131100416;
+			public const int mtrl_navigation_bar_colored_ripple_color = 2131100416;
 			
 			// aapt resource value: 0x7F060301
-			public const int mtrl_indicator_text_color = 2131100417;
+			public const int mtrl_navigation_bar_item_tint = 2131100417;
 			
 			// aapt resource value: 0x7F060302
-			public const int mtrl_navigation_bar_colored_item_tint = 2131100418;
+			public const int mtrl_navigation_bar_ripple_color = 2131100418;
 			
 			// aapt resource value: 0x7F060303
-			public const int mtrl_navigation_bar_colored_ripple_color = 2131100419;
+			public const int mtrl_navigation_item_background_color = 2131100419;
 			
 			// aapt resource value: 0x7F060304
-			public const int mtrl_navigation_bar_item_tint = 2131100420;
+			public const int mtrl_navigation_item_icon_tint = 2131100420;
 			
 			// aapt resource value: 0x7F060305
-			public const int mtrl_navigation_bar_ripple_color = 2131100421;
+			public const int mtrl_navigation_item_text_color = 2131100421;
 			
 			// aapt resource value: 0x7F060306
-			public const int mtrl_navigation_item_background_color = 2131100422;
+			public const int mtrl_on_primary_text_btn_text_color_selector = 2131100422;
 			
 			// aapt resource value: 0x7F060307
-			public const int mtrl_navigation_item_icon_tint = 2131100423;
+			public const int mtrl_on_surface_ripple_color = 2131100423;
 			
 			// aapt resource value: 0x7F060308
-			public const int mtrl_navigation_item_text_color = 2131100424;
+			public const int mtrl_outlined_icon_tint = 2131100424;
 			
 			// aapt resource value: 0x7F060309
-			public const int mtrl_on_primary_text_btn_text_color_selector = 2131100425;
+			public const int mtrl_outlined_stroke_color = 2131100425;
 			
 			// aapt resource value: 0x7F06030A
-			public const int mtrl_on_surface_ripple_color = 2131100426;
+			public const int mtrl_popupmenu_overlay_color = 2131100426;
 			
 			// aapt resource value: 0x7F06030B
-			public const int mtrl_outlined_icon_tint = 2131100427;
+			public const int mtrl_scrim_color = 2131100427;
 			
 			// aapt resource value: 0x7F06030C
-			public const int mtrl_outlined_stroke_color = 2131100428;
+			public const int mtrl_switch_thumb_icon_tint = 2131100428;
 			
 			// aapt resource value: 0x7F06030D
-			public const int mtrl_popupmenu_overlay_color = 2131100429;
+			public const int mtrl_switch_thumb_tint = 2131100429;
 			
 			// aapt resource value: 0x7F06030E
-			public const int mtrl_scrim_color = 2131100430;
+			public const int mtrl_switch_track_decoration_tint = 2131100430;
 			
 			// aapt resource value: 0x7F06030F
-			public const int mtrl_switch_thumb_icon_tint = 2131100431;
+			public const int mtrl_switch_track_tint = 2131100431;
 			
 			// aapt resource value: 0x7F060310
-			public const int mtrl_switch_thumb_tint = 2131100432;
+			public const int mtrl_tabs_colored_ripple_color = 2131100432;
 			
 			// aapt resource value: 0x7F060311
-			public const int mtrl_switch_track_decoration_tint = 2131100433;
+			public const int mtrl_tabs_icon_color_selector = 2131100433;
 			
 			// aapt resource value: 0x7F060312
-			public const int mtrl_switch_track_tint = 2131100434;
+			public const int mtrl_tabs_icon_color_selector_colored = 2131100434;
 			
 			// aapt resource value: 0x7F060313
-			public const int mtrl_tabs_colored_ripple_color = 2131100435;
+			public const int mtrl_tabs_legacy_text_color_selector = 2131100435;
 			
 			// aapt resource value: 0x7F060314
-			public const int mtrl_tabs_icon_color_selector = 2131100436;
-			
-			// aapt resource value: 0x7F060315
-			public const int mtrl_tabs_icon_color_selector_colored = 2131100437;
+			public const int mtrl_tabs_ripple_color = 2131100436;
 			
 			// aapt resource value: 0x7F060316
-			public const int mtrl_tabs_legacy_text_color_selector = 2131100438;
+			public const int mtrl_textinput_default_box_stroke_color = 2131100438;
 			
 			// aapt resource value: 0x7F060317
-			public const int mtrl_tabs_ripple_color = 2131100439;
-			
-			// aapt resource value: 0x7F060319
-			public const int mtrl_textinput_default_box_stroke_color = 2131100441;
-			
-			// aapt resource value: 0x7F06031A
-			public const int mtrl_textinput_disabled_color = 2131100442;
-			
-			// aapt resource value: 0x7F06031B
-			public const int mtrl_textinput_filled_box_default_background_color = 2131100443;
-			
-			// aapt resource value: 0x7F06031C
-			public const int mtrl_textinput_focused_box_stroke_color = 2131100444;
-			
-			// aapt resource value: 0x7F06031D
-			public const int mtrl_textinput_hovered_box_stroke_color = 2131100445;
+			public const int mtrl_textinput_disabled_color = 2131100439;
 			
 			// aapt resource value: 0x7F060318
-			public const int mtrl_text_btn_text_color_selector = 2131100440;
+			public const int mtrl_textinput_filled_box_default_background_color = 2131100440;
+			
+			// aapt resource value: 0x7F060319
+			public const int mtrl_textinput_focused_box_stroke_color = 2131100441;
+			
+			// aapt resource value: 0x7F06031A
+			public const int mtrl_textinput_hovered_box_stroke_color = 2131100442;
+			
+			// aapt resource value: 0x7F060315
+			public const int mtrl_text_btn_text_color_selector = 2131100437;
+			
+			// aapt resource value: 0x7F06031B
+			public const int notification_action_color_filter = 2131100443;
+			
+			// aapt resource value: 0x7F06031C
+			public const int notification_icon_bg_color = 2131100444;
+			
+			// aapt resource value: 0x7F06031D
+			public const int notification_material_background_media_default_color = 2131100445;
 			
 			// aapt resource value: 0x7F06031E
-			public const int notification_action_color_filter = 2131100446;
+			public const int pickerview_bgColor_default = 2131100446;
 			
 			// aapt resource value: 0x7F06031F
-			public const int notification_icon_bg_color = 2131100447;
+			public const int pickerview_bgColor_overlay = 2131100447;
 			
 			// aapt resource value: 0x7F060320
-			public const int notification_material_background_media_default_color = 2131100448;
+			public const int pickerview_bg_topbar = 2131100448;
 			
 			// aapt resource value: 0x7F060321
-			public const int pickerview_bgColor_default = 2131100449;
+			public const int pickerview_timebtn_nor = 2131100449;
 			
 			// aapt resource value: 0x7F060322
-			public const int pickerview_bgColor_overlay = 2131100450;
+			public const int pickerview_timebtn_pre = 2131100450;
 			
 			// aapt resource value: 0x7F060323
-			public const int pickerview_bg_topbar = 2131100451;
+			public const int pickerview_topbar_title = 2131100451;
 			
 			// aapt resource value: 0x7F060324
-			public const int pickerview_timebtn_nor = 2131100452;
+			public const int pickerview_wheelview_textcolor_center = 2131100452;
 			
 			// aapt resource value: 0x7F060325
-			public const int pickerview_timebtn_pre = 2131100453;
+			public const int pickerview_wheelview_textcolor_divider = 2131100453;
 			
 			// aapt resource value: 0x7F060326
-			public const int pickerview_topbar_title = 2131100454;
+			public const int pickerview_wheelview_textcolor_out = 2131100454;
 			
 			// aapt resource value: 0x7F060327
-			public const int pickerview_wheelview_textcolor_center = 2131100455;
+			public const int primary_dark_material_dark = 2131100455;
 			
 			// aapt resource value: 0x7F060328
-			public const int pickerview_wheelview_textcolor_divider = 2131100456;
+			public const int primary_dark_material_light = 2131100456;
 			
 			// aapt resource value: 0x7F060329
-			public const int pickerview_wheelview_textcolor_out = 2131100457;
+			public const int primary_material_dark = 2131100457;
 			
 			// aapt resource value: 0x7F06032A
-			public const int primary_dark_material_dark = 2131100458;
+			public const int primary_material_light = 2131100458;
 			
 			// aapt resource value: 0x7F06032B
-			public const int primary_dark_material_light = 2131100459;
+			public const int primary_text_default_material_dark = 2131100459;
 			
 			// aapt resource value: 0x7F06032C
-			public const int primary_material_dark = 2131100460;
+			public const int primary_text_default_material_light = 2131100460;
 			
 			// aapt resource value: 0x7F06032D
-			public const int primary_material_light = 2131100461;
+			public const int primary_text_disabled_material_dark = 2131100461;
 			
 			// aapt resource value: 0x7F06032E
-			public const int primary_text_default_material_dark = 2131100462;
+			public const int primary_text_disabled_material_light = 2131100462;
 			
 			// aapt resource value: 0x7F06032F
-			public const int primary_text_default_material_light = 2131100463;
+			public const int ripple_material_dark = 2131100463;
 			
 			// aapt resource value: 0x7F060330
-			public const int primary_text_disabled_material_dark = 2131100464;
+			public const int ripple_material_light = 2131100464;
 			
 			// aapt resource value: 0x7F060331
-			public const int primary_text_disabled_material_light = 2131100465;
+			public const int secondary_text_default_material_dark = 2131100465;
 			
 			// aapt resource value: 0x7F060332
-			public const int ripple_material_dark = 2131100466;
+			public const int secondary_text_default_material_light = 2131100466;
 			
 			// aapt resource value: 0x7F060333
-			public const int ripple_material_light = 2131100467;
+			public const int secondary_text_disabled_material_dark = 2131100467;
 			
 			// aapt resource value: 0x7F060334
-			public const int secondary_text_default_material_dark = 2131100468;
+			public const int secondary_text_disabled_material_light = 2131100468;
 			
 			// aapt resource value: 0x7F060335
-			public const int secondary_text_default_material_light = 2131100469;
+			public const int switch_thumb_disabled_material_dark = 2131100469;
 			
 			// aapt resource value: 0x7F060336
-			public const int secondary_text_disabled_material_dark = 2131100470;
+			public const int switch_thumb_disabled_material_light = 2131100470;
 			
 			// aapt resource value: 0x7F060337
-			public const int secondary_text_disabled_material_light = 2131100471;
+			public const int switch_thumb_material_dark = 2131100471;
 			
 			// aapt resource value: 0x7F060338
-			public const int switch_thumb_disabled_material_dark = 2131100472;
+			public const int switch_thumb_material_light = 2131100472;
 			
 			// aapt resource value: 0x7F060339
-			public const int switch_thumb_disabled_material_light = 2131100473;
+			public const int switch_thumb_normal_material_dark = 2131100473;
 			
 			// aapt resource value: 0x7F06033A
-			public const int switch_thumb_material_dark = 2131100474;
+			public const int switch_thumb_normal_material_light = 2131100474;
 			
 			// aapt resource value: 0x7F06033B
-			public const int switch_thumb_material_light = 2131100475;
+			public const int tooltip_background_dark = 2131100475;
 			
 			// aapt resource value: 0x7F06033C
-			public const int switch_thumb_normal_material_dark = 2131100476;
+			public const int tooltip_background_light = 2131100476;
 			
 			// aapt resource value: 0x7F06033D
-			public const int switch_thumb_normal_material_light = 2131100477;
+			public const int transparent = 2131100477;
 			
 			// aapt resource value: 0x7F06033E
-			public const int tooltip_background_dark = 2131100478;
+			public const int white = 2131100478;
 			
 			// aapt resource value: 0x7F06033F
-			public const int tooltip_background_light = 2131100479;
+			public const int zxing_custom_possible_result_points = 2131100479;
 			
 			// aapt resource value: 0x7F060340
-			public const int transparent = 2131100480;
+			public const int zxing_custom_result_view = 2131100480;
 			
 			// aapt resource value: 0x7F060341
-			public const int white = 2131100481;
+			public const int zxing_custom_viewfinder_laser = 2131100481;
 			
 			// aapt resource value: 0x7F060342
-			public const int zxing_custom_possible_result_points = 2131100482;
+			public const int zxing_custom_viewfinder_mask = 2131100482;
 			
 			// aapt resource value: 0x7F060343
-			public const int zxing_custom_result_view = 2131100483;
+			public const int zxing_possible_result_points = 2131100483;
 			
 			// aapt resource value: 0x7F060344
-			public const int zxing_custom_viewfinder_laser = 2131100484;
+			public const int zxing_result_view = 2131100484;
 			
 			// aapt resource value: 0x7F060345
-			public const int zxing_custom_viewfinder_mask = 2131100485;
+			public const int zxing_status_text = 2131100485;
 			
 			// aapt resource value: 0x7F060346
-			public const int zxing_possible_result_points = 2131100486;
+			public const int zxing_transparent = 2131100486;
 			
 			// aapt resource value: 0x7F060347
-			public const int zxing_result_view = 2131100487;
+			public const int zxing_viewfinder_laser = 2131100487;
 			
 			// aapt resource value: 0x7F060348
-			public const int zxing_status_text = 2131100488;
-			
-			// aapt resource value: 0x7F060349
-			public const int zxing_transparent = 2131100489;
-			
-			// aapt resource value: 0x7F06034A
-			public const int zxing_viewfinder_laser = 2131100490;
-			
-			// aapt resource value: 0x7F06034B
-			public const int zxing_viewfinder_mask = 2131100491;
+			public const int zxing_viewfinder_mask = 2131100488;
 			
 			static Color()
 			{
@@ -14414,538 +14214,508 @@
 			public const int indicator_bg_top = 2131231059;
 			
 			// aapt resource value: 0x7F080154
-			public const int jpush_btn_bg_green_playable = 2131231060;
+			public const int launchImage = 2131231060;
 			
 			// aapt resource value: 0x7F080155
-			public const int jpush_ic_action_cancle = 2131231061;
+			public const int lc_demo_bg_selector = 2131231061;
 			
 			// aapt resource value: 0x7F080156
-			public const int jpush_ic_action_close = 2131231062;
+			public const int lc_demo_border_100r_shape = 2131231062;
 			
 			// aapt resource value: 0x7F080157
-			public const int jpush_ic_action_close2 = 2131231063;
+			public const int lc_demo_border_gray_4r_shape = 2131231063;
 			
 			// aapt resource value: 0x7F080158
-			public const int jpush_ic_richpush_actionbar_back = 2131231064;
+			public const int lc_demo_border_org_4r_shape = 2131231064;
 			
 			// aapt resource value: 0x7F080159
-			public const int jpush_ic_richpush_actionbar_divider = 2131231065;
+			public const int lc_demo_cursor_drawable = 2131231065;
 			
 			// aapt resource value: 0x7F08015A
-			public const int jpush_richpush_btn_selector = 2131231066;
+			public const int lc_demo_org_progress_style = 2131231066;
 			
 			// aapt resource value: 0x7F08015B
-			public const int jpush_richpush_progressbar = 2131231067;
+			public const int lc_demo_pg_background = 2131231067;
 			
 			// aapt resource value: 0x7F08015C
-			public const int launchImage = 2131231068;
+			public const int lc_demo_photo_capture_selector = 2131231068;
 			
 			// aapt resource value: 0x7F08015D
-			public const int lc_demo_bg_selector = 2131231069;
+			public const int lc_demo_pic_color_cloud_video_selector = 2131231069;
 			
 			// aapt resource value: 0x7F08015E
-			public const int lc_demo_border_100r_shape = 2131231070;
+			public const int lc_demo_pic_color_local_video_selector = 2131231070;
 			
 			// aapt resource value: 0x7F08015F
-			public const int lc_demo_border_gray_4r_shape = 2131231071;
+			public const int lc_demo_point = 2131231071;
 			
 			// aapt resource value: 0x7F080160
-			public const int lc_demo_border_org_4r_shape = 2131231072;
+			public const int lc_demo_progress_style = 2131231072;
 			
 			// aapt resource value: 0x7F080161
-			public const int lc_demo_cursor_drawable = 2131231073;
+			public const int lc_demo_soild_100r_org_shape = 2131231073;
 			
 			// aapt resource value: 0x7F080162
-			public const int lc_demo_org_progress_style = 2131231074;
+			public const int lc_demo_soild_100r_tra_shape = 2131231074;
 			
 			// aapt resource value: 0x7F080163
-			public const int lc_demo_pg_background = 2131231075;
+			public const int lc_demo_soild_10r_org_shape = 2131231075;
 			
 			// aapt resource value: 0x7F080164
-			public const int lc_demo_photo_capture_selector = 2131231076;
+			public const int lc_demo_soild_10r_white_shape = 2131231076;
 			
 			// aapt resource value: 0x7F080165
-			public const int lc_demo_pic_color_cloud_video_selector = 2131231077;
+			public const int lc_demo_txt_color_selector = 2131231077;
 			
 			// aapt resource value: 0x7F080166
-			public const int lc_demo_pic_color_local_video_selector = 2131231078;
+			public const int lc_demo_txt_color_video_selector = 2131231078;
 			
 			// aapt resource value: 0x7F080167
-			public const int lc_demo_point = 2131231079;
+			public const int lc_demo_txt_pixel_shape = 2131231079;
 			
 			// aapt resource value: 0x7F080168
-			public const int lc_demo_progress_style = 2131231080;
+			public const int lc_operation_step = 2131231080;
 			
 			// aapt resource value: 0x7F080169
-			public const int lc_demo_soild_100r_org_shape = 2131231081;
+			public const int lc_standard_big_btn_disabled_bg = 2131231081;
 			
 			// aapt resource value: 0x7F08016A
-			public const int lc_demo_soild_100r_tra_shape = 2131231082;
+			public const int lc_standard_big_btn_normal_bg = 2131231082;
 			
 			// aapt resource value: 0x7F08016B
-			public const int lc_demo_soild_10r_org_shape = 2131231083;
+			public const int lc_standard_big_btn_pressed_bg = 2131231083;
 			
 			// aapt resource value: 0x7F08016C
-			public const int lc_demo_soild_10r_white_shape = 2131231084;
+			public const int lc_standard_big_btn_selector = 2131231084;
 			
 			// aapt resource value: 0x7F08016D
-			public const int lc_demo_txt_color_selector = 2131231085;
+			public const int lc_standard_next_btn_disable_bg = 2131231085;
 			
 			// aapt resource value: 0x7F08016E
-			public const int lc_demo_txt_color_video_selector = 2131231086;
+			public const int lc_standard_next_btn_normal_bg = 2131231086;
 			
 			// aapt resource value: 0x7F08016F
-			public const int lc_demo_txt_pixel_shape = 2131231087;
+			public const int lc_standard_next_btn_pressed_bg = 2131231087;
 			
 			// aapt resource value: 0x7F080170
-			public const int lc_operation_step = 2131231088;
+			public const int leba_bg_single_unselected = 2131231088;
 			
 			// aapt resource value: 0x7F080171
-			public const int lc_standard_big_btn_disabled_bg = 2131231089;
+			public const int Loading = 2131231089;
 			
 			// aapt resource value: 0x7F080172
-			public const int lc_standard_big_btn_normal_bg = 2131231090;
+			public const int lp_calltime_shape = 2131231090;
 			
 			// aapt resource value: 0x7F080173
-			public const int lc_standard_big_btn_pressed_bg = 2131231091;
+			public const int lp_calltime_shape_gray = 2131231091;
 			
 			// aapt resource value: 0x7F080174
-			public const int lc_standard_big_btn_selector = 2131231092;
+			public const int lp_dialog_background = 2131231092;
 			
 			// aapt resource value: 0x7F080175
-			public const int lc_standard_next_btn_disable_bg = 2131231093;
+			public const int lp_dialog_cancel_background = 2131231093;
 			
 			// aapt resource value: 0x7F080176
-			public const int lc_standard_next_btn_normal_bg = 2131231094;
+			public const int lp_dialog_confirm_background = 2131231094;
 			
 			// aapt resource value: 0x7F080177
-			public const int lc_standard_next_btn_pressed_bg = 2131231095;
+			public const int lp_line_shape = 2131231095;
 			
 			// aapt resource value: 0x7F080178
-			public const int leba_bg_single_unselected = 2131231096;
+			public const int m3_appbar_background = 2131231096;
 			
 			// aapt resource value: 0x7F080179
-			public const int Loading = 2131231097;
+			public const int m3_avd_hide_password = 2131231097;
 			
 			// aapt resource value: 0x7F08017A
-			public const int lp_calltime_shape = 2131231098;
+			public const int m3_avd_show_password = 2131231098;
 			
 			// aapt resource value: 0x7F08017B
-			public const int lp_calltime_shape_gray = 2131231099;
+			public const int m3_bottom_sheet_drag_handle = 2131231099;
 			
 			// aapt resource value: 0x7F08017C
-			public const int lp_dialog_background = 2131231100;
+			public const int m3_password_eye = 2131231100;
 			
 			// aapt resource value: 0x7F08017D
-			public const int lp_dialog_cancel_background = 2131231101;
+			public const int m3_popupmenu_background_overlay = 2131231101;
 			
 			// aapt resource value: 0x7F08017E
-			public const int lp_dialog_confirm_background = 2131231102;
+			public const int m3_radiobutton_ripple = 2131231102;
 			
 			// aapt resource value: 0x7F08017F
-			public const int lp_line_shape = 2131231103;
+			public const int m3_selection_control_ripple = 2131231103;
 			
 			// aapt resource value: 0x7F080180
-			public const int m3_appbar_background = 2131231104;
+			public const int m3_tabs_background = 2131231104;
 			
 			// aapt resource value: 0x7F080181
-			public const int m3_avd_hide_password = 2131231105;
+			public const int m3_tabs_line_indicator = 2131231105;
 			
 			// aapt resource value: 0x7F080182
-			public const int m3_avd_show_password = 2131231106;
+			public const int m3_tabs_rounded_line_indicator = 2131231106;
 			
 			// aapt resource value: 0x7F080183
-			public const int m3_bottom_sheet_drag_handle = 2131231107;
+			public const int m3_tabs_transparent_background = 2131231107;
 			
 			// aapt resource value: 0x7F080184
-			public const int m3_password_eye = 2131231108;
+			public const int material_cursor_drawable = 2131231108;
 			
 			// aapt resource value: 0x7F080185
-			public const int m3_popupmenu_background_overlay = 2131231109;
+			public const int material_ic_calendar_black_24dp = 2131231109;
 			
 			// aapt resource value: 0x7F080186
-			public const int m3_radiobutton_ripple = 2131231110;
+			public const int material_ic_clear_black_24dp = 2131231110;
 			
 			// aapt resource value: 0x7F080187
-			public const int m3_selection_control_ripple = 2131231111;
+			public const int material_ic_edit_black_24dp = 2131231111;
 			
 			// aapt resource value: 0x7F080188
-			public const int m3_tabs_background = 2131231112;
+			public const int material_ic_keyboard_arrow_left_black_24dp = 2131231112;
 			
 			// aapt resource value: 0x7F080189
-			public const int m3_tabs_line_indicator = 2131231113;
+			public const int material_ic_keyboard_arrow_next_black_24dp = 2131231113;
 			
 			// aapt resource value: 0x7F08018A
-			public const int m3_tabs_rounded_line_indicator = 2131231114;
+			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131231114;
 			
 			// aapt resource value: 0x7F08018B
-			public const int m3_tabs_transparent_background = 2131231115;
+			public const int material_ic_keyboard_arrow_right_black_24dp = 2131231115;
 			
 			// aapt resource value: 0x7F08018C
-			public const int material_cursor_drawable = 2131231116;
+			public const int material_ic_menu_arrow_down_black_24dp = 2131231116;
 			
 			// aapt resource value: 0x7F08018D
-			public const int material_ic_calendar_black_24dp = 2131231117;
+			public const int material_ic_menu_arrow_up_black_24dp = 2131231117;
 			
 			// aapt resource value: 0x7F08018E
-			public const int material_ic_clear_black_24dp = 2131231118;
+			public const int message_system_list_item_divider = 2131231118;
 			
 			// aapt resource value: 0x7F08018F
-			public const int material_ic_edit_black_24dp = 2131231119;
+			public const int mic = 2131231119;
 			
 			// aapt resource value: 0x7F080190
-			public const int material_ic_keyboard_arrow_left_black_24dp = 2131231120;
-			
-			// aapt resource value: 0x7F080191
-			public const int material_ic_keyboard_arrow_next_black_24dp = 2131231121;
+			public const int mobile_common_bg_btn_border_shape = 2131231120;
 			
 			// aapt resource value: 0x7F080192
-			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131231122;
+			public const int mobile_common_checkbox_small_checked = 2131231122;
 			
 			// aapt resource value: 0x7F080193
-			public const int material_ic_keyboard_arrow_right_black_24dp = 2131231123;
+			public const int mobile_common_checkbox_small_default = 2131231123;
+			
+			// aapt resource value: 0x7F080191
+			public const int mobile_common_check_box_selector = 2131231121;
 			
 			// aapt resource value: 0x7F080194
-			public const int material_ic_menu_arrow_down_black_24dp = 2131231124;
+			public const int mobile_common_common_pic_nointernet = 2131231124;
 			
 			// aapt resource value: 0x7F080195
-			public const int material_ic_menu_arrow_up_black_24dp = 2131231125;
+			public const int mobile_common_dialog_bg = 2131231125;
 			
 			// aapt resource value: 0x7F080196
-			public const int message_system_list_item_divider = 2131231126;
+			public const int mobile_common_dialog_tips_bg = 2131231126;
 			
 			// aapt resource value: 0x7F080197
-			public const int mic = 2131231127;
+			public const int mobile_common_icon_deleteinput = 2131231127;
 			
 			// aapt resource value: 0x7F080198
-			public const int mobile_common_bg_btn_border_shape = 2131231128;
-			
-			// aapt resource value: 0x7F08019A
-			public const int mobile_common_checkbox_small_checked = 2131231130;
-			
-			// aapt resource value: 0x7F08019B
-			public const int mobile_common_checkbox_small_default = 2131231131;
+			public const int mobile_common_icon_nextarrow = 2131231128;
 			
 			// aapt resource value: 0x7F080199
-			public const int mobile_common_check_box_selector = 2131231129;
+			public const int mobile_common_leba_bg_single_selected = 2131231129;
+			
+			// aapt resource value: 0x7F08019A
+			public const int mobile_common_leba_bg_single_unselected = 2131231130;
+			
+			// aapt resource value: 0x7F08019B
+			public const int mobile_common_my_menu_selector_bg = 2131231131;
 			
 			// aapt resource value: 0x7F08019C
-			public const int mobile_common_common_pic_nointernet = 2131231132;
+			public const int mobile_common_next_btn_selector = 2131231132;
 			
 			// aapt resource value: 0x7F08019D
-			public const int mobile_common_dialog_bg = 2131231133;
+			public const int mobile_common_progress_loading_img = 2131231133;
 			
 			// aapt resource value: 0x7F08019E
-			public const int mobile_common_dialog_tips_bg = 2131231134;
+			public const int mobile_common_progress_style = 2131231134;
 			
 			// aapt resource value: 0x7F08019F
-			public const int mobile_common_icon_deleteinput = 2131231135;
+			public const int mobile_common_radius_5dp_white_bg = 2131231135;
 			
 			// aapt resource value: 0x7F0801A0
-			public const int mobile_common_icon_nextarrow = 2131231136;
+			public const int mobile_common_shape_round_bg = 2131231136;
 			
 			// aapt resource value: 0x7F0801A1
-			public const int mobile_common_leba_bg_single_selected = 2131231137;
+			public const int mobile_common_share_selector = 2131231137;
 			
 			// aapt resource value: 0x7F0801A2
-			public const int mobile_common_leba_bg_single_unselected = 2131231138;
+			public const int mobile_common_title_back = 2131231138;
 			
 			// aapt resource value: 0x7F0801A3
-			public const int mobile_common_my_menu_selector_bg = 2131231139;
+			public const int mtrl_bottomsheet_drag_handle = 2131231139;
 			
 			// aapt resource value: 0x7F0801A4
-			public const int mobile_common_next_btn_selector = 2131231140;
+			public const int mtrl_checkbox_button = 2131231140;
 			
 			// aapt resource value: 0x7F0801A5
-			public const int mobile_common_progress_loading_img = 2131231141;
+			public const int mtrl_checkbox_button_checked_unchecked = 2131231141;
 			
 			// aapt resource value: 0x7F0801A6
-			public const int mobile_common_progress_style = 2131231142;
+			public const int mtrl_checkbox_button_icon = 2131231142;
 			
 			// aapt resource value: 0x7F0801A7
-			public const int mobile_common_radius_5dp_white_bg = 2131231143;
+			public const int mtrl_checkbox_button_icon_checked_indeterminate = 2131231143;
 			
 			// aapt resource value: 0x7F0801A8
-			public const int mobile_common_shape_round_bg = 2131231144;
+			public const int mtrl_checkbox_button_icon_checked_unchecked = 2131231144;
 			
 			// aapt resource value: 0x7F0801A9
-			public const int mobile_common_share_selector = 2131231145;
+			public const int mtrl_checkbox_button_icon_indeterminate_checked = 2131231145;
 			
 			// aapt resource value: 0x7F0801AA
-			public const int mobile_common_title_back = 2131231146;
+			public const int mtrl_checkbox_button_icon_indeterminate_unchecked = 2131231146;
 			
 			// aapt resource value: 0x7F0801AB
-			public const int mtrl_bottomsheet_drag_handle = 2131231147;
+			public const int mtrl_checkbox_button_icon_unchecked_checked = 2131231147;
 			
 			// aapt resource value: 0x7F0801AC
-			public const int mtrl_checkbox_button = 2131231148;
+			public const int mtrl_checkbox_button_icon_unchecked_indeterminate = 2131231148;
 			
 			// aapt resource value: 0x7F0801AD
-			public const int mtrl_checkbox_button_checked_unchecked = 2131231149;
+			public const int mtrl_checkbox_button_unchecked_checked = 2131231149;
 			
 			// aapt resource value: 0x7F0801AE
-			public const int mtrl_checkbox_button_icon = 2131231150;
+			public const int mtrl_dialog_background = 2131231150;
 			
 			// aapt resource value: 0x7F0801AF
-			public const int mtrl_checkbox_button_icon_checked_indeterminate = 2131231151;
+			public const int mtrl_dropdown_arrow = 2131231151;
 			
 			// aapt resource value: 0x7F0801B0
-			public const int mtrl_checkbox_button_icon_checked_unchecked = 2131231152;
+			public const int mtrl_ic_arrow_drop_down = 2131231152;
 			
 			// aapt resource value: 0x7F0801B1
-			public const int mtrl_checkbox_button_icon_indeterminate_checked = 2131231153;
+			public const int mtrl_ic_arrow_drop_up = 2131231153;
 			
 			// aapt resource value: 0x7F0801B2
-			public const int mtrl_checkbox_button_icon_indeterminate_unchecked = 2131231154;
-			
-			// aapt resource value: 0x7F0801B3
-			public const int mtrl_checkbox_button_icon_unchecked_checked = 2131231155;
+			public const int mtrl_ic_cancel = 2131231154;
 			
 			// aapt resource value: 0x7F0801B4
-			public const int mtrl_checkbox_button_icon_unchecked_indeterminate = 2131231156;
+			public const int mtrl_ic_checkbox_checked = 2131231156;
 			
 			// aapt resource value: 0x7F0801B5
-			public const int mtrl_checkbox_button_unchecked_checked = 2131231157;
+			public const int mtrl_ic_checkbox_unchecked = 2131231157;
+			
+			// aapt resource value: 0x7F0801B3
+			public const int mtrl_ic_check_mark = 2131231155;
 			
 			// aapt resource value: 0x7F0801B6
-			public const int mtrl_dialog_background = 2131231158;
+			public const int mtrl_ic_error = 2131231158;
 			
 			// aapt resource value: 0x7F0801B7
-			public const int mtrl_dropdown_arrow = 2131231159;
+			public const int mtrl_ic_indeterminate = 2131231159;
 			
 			// aapt resource value: 0x7F0801B8
-			public const int mtrl_ic_arrow_drop_down = 2131231160;
+			public const int mtrl_navigation_bar_item_background = 2131231160;
 			
 			// aapt resource value: 0x7F0801B9
-			public const int mtrl_ic_arrow_drop_up = 2131231161;
+			public const int mtrl_popupmenu_background = 2131231161;
 			
 			// aapt resource value: 0x7F0801BA
-			public const int mtrl_ic_cancel = 2131231162;
-			
-			// aapt resource value: 0x7F0801BC
-			public const int mtrl_ic_checkbox_checked = 2131231164;
-			
-			// aapt resource value: 0x7F0801BD
-			public const int mtrl_ic_checkbox_unchecked = 2131231165;
+			public const int mtrl_popupmenu_background_overlay = 2131231162;
 			
 			// aapt resource value: 0x7F0801BB
-			public const int mtrl_ic_check_mark = 2131231163;
+			public const int mtrl_switch_thumb = 2131231163;
+			
+			// aapt resource value: 0x7F0801BC
+			public const int mtrl_switch_thumb_checked = 2131231164;
+			
+			// aapt resource value: 0x7F0801BD
+			public const int mtrl_switch_thumb_checked_pressed = 2131231165;
 			
 			// aapt resource value: 0x7F0801BE
-			public const int mtrl_ic_error = 2131231166;
+			public const int mtrl_switch_thumb_checked_unchecked = 2131231166;
 			
 			// aapt resource value: 0x7F0801BF
-			public const int mtrl_ic_indeterminate = 2131231167;
+			public const int mtrl_switch_thumb_pressed = 2131231167;
 			
 			// aapt resource value: 0x7F0801C0
-			public const int mtrl_navigation_bar_item_background = 2131231168;
+			public const int mtrl_switch_thumb_pressed_checked = 2131231168;
 			
 			// aapt resource value: 0x7F0801C1
-			public const int mtrl_popupmenu_background = 2131231169;
+			public const int mtrl_switch_thumb_pressed_unchecked = 2131231169;
 			
 			// aapt resource value: 0x7F0801C2
-			public const int mtrl_popupmenu_background_overlay = 2131231170;
+			public const int mtrl_switch_thumb_unchecked = 2131231170;
 			
 			// aapt resource value: 0x7F0801C3
-			public const int mtrl_switch_thumb = 2131231171;
+			public const int mtrl_switch_thumb_unchecked_checked = 2131231171;
 			
 			// aapt resource value: 0x7F0801C4
-			public const int mtrl_switch_thumb_checked = 2131231172;
+			public const int mtrl_switch_thumb_unchecked_pressed = 2131231172;
 			
 			// aapt resource value: 0x7F0801C5
-			public const int mtrl_switch_thumb_checked_pressed = 2131231173;
+			public const int mtrl_switch_track = 2131231173;
 			
 			// aapt resource value: 0x7F0801C6
-			public const int mtrl_switch_thumb_checked_unchecked = 2131231174;
+			public const int mtrl_switch_track_decoration = 2131231174;
 			
 			// aapt resource value: 0x7F0801C7
-			public const int mtrl_switch_thumb_pressed = 2131231175;
-			
-			// aapt resource value: 0x7F0801C8
-			public const int mtrl_switch_thumb_pressed_checked = 2131231176;
+			public const int mtrl_tabs_default_indicator = 2131231175;
 			
 			// aapt resource value: 0x7F0801C9
-			public const int mtrl_switch_thumb_pressed_unchecked = 2131231177;
+			public const int navigation_empty_icon = 2131231177;
+			
+			// aapt resource value: 0x7F0801C8
+			public const int nav_back = 2131231176;
 			
 			// aapt resource value: 0x7F0801CA
-			public const int mtrl_switch_thumb_unchecked = 2131231178;
+			public const int notification_action_background = 2131231178;
 			
 			// aapt resource value: 0x7F0801CB
-			public const int mtrl_switch_thumb_unchecked_checked = 2131231179;
+			public const int notification_bg = 2131231179;
 			
 			// aapt resource value: 0x7F0801CC
-			public const int mtrl_switch_thumb_unchecked_pressed = 2131231180;
+			public const int notification_bg_low = 2131231180;
 			
 			// aapt resource value: 0x7F0801CD
-			public const int mtrl_switch_track = 2131231181;
+			public const int notification_bg_low_normal = 2131231181;
 			
 			// aapt resource value: 0x7F0801CE
-			public const int mtrl_switch_track_decoration = 2131231182;
+			public const int notification_bg_low_pressed = 2131231182;
 			
 			// aapt resource value: 0x7F0801CF
-			public const int mtrl_tabs_default_indicator = 2131231183;
-			
-			// aapt resource value: 0x7F0801D1
-			public const int navigation_empty_icon = 2131231185;
+			public const int notification_bg_normal = 2131231183;
 			
 			// aapt resource value: 0x7F0801D0
-			public const int nav_back = 2131231184;
+			public const int notification_bg_normal_pressed = 2131231184;
+			
+			// aapt resource value: 0x7F0801D1
+			public const int notification_icon_background = 2131231185;
 			
 			// aapt resource value: 0x7F0801D2
-			public const int notification_action_background = 2131231186;
+			public const int notification_oversize_large_icon_bg = 2131231186;
 			
 			// aapt resource value: 0x7F0801D3
-			public const int notification_bg = 2131231187;
+			public const int notification_template_icon_bg = 2131231187;
 			
 			// aapt resource value: 0x7F0801D4
-			public const int notification_bg_low = 2131231188;
+			public const int notification_template_icon_low_bg = 2131231188;
 			
 			// aapt resource value: 0x7F0801D5
-			public const int notification_bg_low_normal = 2131231189;
+			public const int notification_tile_bg = 2131231189;
 			
 			// aapt resource value: 0x7F0801D6
-			public const int notification_bg_low_pressed = 2131231190;
+			public const int notify_panel_notification_icon_bg = 2131231190;
 			
 			// aapt resource value: 0x7F0801D7
-			public const int notification_bg_normal = 2131231191;
+			public const int oval_color_white_18 = 2131231191;
 			
 			// aapt resource value: 0x7F0801D8
-			public const int notification_bg_normal_pressed = 2131231192;
+			public const int play_module_video_cloudstage_direction_limit_down = 2131231192;
 			
 			// aapt resource value: 0x7F0801D9
-			public const int notification_icon_background = 2131231193;
+			public const int play_module_video_cloudstage_direction_limit_left = 2131231193;
 			
 			// aapt resource value: 0x7F0801DA
-			public const int notification_oversize_large_icon_bg = 2131231194;
+			public const int play_module_video_cloudstage_direction_limit_right = 2131231194;
 			
 			// aapt resource value: 0x7F0801DB
-			public const int notification_template_icon_bg = 2131231195;
+			public const int play_module_video_cloudstage_direction_limit_up = 2131231195;
 			
 			// aapt resource value: 0x7F0801DC
-			public const int notification_template_icon_low_bg = 2131231196;
+			public const int progress_style = 2131231196;
 			
 			// aapt resource value: 0x7F0801DD
-			public const int notification_tile_bg = 2131231197;
+			public const int scan_capture = 2131231197;
 			
 			// aapt resource value: 0x7F0801DE
-			public const int notify_panel_notification_icon_bg = 2131231198;
+			public const int scan_line = 2131231198;
 			
 			// aapt resource value: 0x7F0801DF
-			public const int oval_color_white_18 = 2131231199;
+			public const int screenshot = 2131231199;
 			
 			// aapt resource value: 0x7F0801E0
-			public const int play_module_video_cloudstage_direction_limit_down = 2131231200;
+			public const int screenshot_def = 2131231200;
 			
 			// aapt resource value: 0x7F0801E1
-			public const int play_module_video_cloudstage_direction_limit_left = 2131231201;
+			public const int screenshot_sel = 2131231201;
 			
 			// aapt resource value: 0x7F0801E2
-			public const int play_module_video_cloudstage_direction_limit_right = 2131231202;
+			public const int selector_orange_textview = 2131231202;
 			
 			// aapt resource value: 0x7F0801E3
-			public const int play_module_video_cloudstage_direction_limit_up = 2131231203;
+			public const int selector_pickerview_btn = 2131231203;
 			
 			// aapt resource value: 0x7F0801E4
-			public const int progress_style = 2131231204;
+			public const int setting_icon_check = 2131231204;
 			
 			// aapt resource value: 0x7F0801E5
-			public const int push_pure_close = 2131231205;
+			public const int shape_corners_edittext_1dp_normal = 2131231205;
 			
 			// aapt resource value: 0x7F0801E6
-			public const int scan_capture = 2131231206;
+			public const int small_icon = 2131231206;
 			
 			// aapt resource value: 0x7F0801E7
-			public const int scan_line = 2131231207;
+			public const int sure_background_def = 2131231207;
 			
 			// aapt resource value: 0x7F0801E8
-			public const int screenshot = 2131231208;
+			public const int sure_background_sel = 2131231208;
 			
 			// aapt resource value: 0x7F0801E9
-			public const int screenshot_def = 2131231209;
+			public const int switch_off = 2131231209;
 			
 			// aapt resource value: 0x7F0801EA
-			public const int screenshot_sel = 2131231210;
+			public const int switch_off_disable = 2131231210;
 			
 			// aapt resource value: 0x7F0801EB
-			public const int selector_orange_textview = 2131231211;
+			public const int switch_on = 2131231211;
 			
 			// aapt resource value: 0x7F0801EC
-			public const int selector_pickerview_btn = 2131231212;
+			public const int switch_on_disable = 2131231212;
 			
 			// aapt resource value: 0x7F0801ED
-			public const int setting_icon_check = 2131231213;
+			public const int test_level_drawable = 2131231213;
 			
 			// aapt resource value: 0x7F0801EE
-			public const int shape_corners_edittext_1dp_normal = 2131231214;
+			public const int text_cursor_drawable = 2131231214;
 			
 			// aapt resource value: 0x7F0801EF
-			public const int small_icon = 2131231215;
+			public const int tip_background = 2131231215;
 			
 			// aapt resource value: 0x7F0801F0
-			public const int stat_sys_third_app_notify = 2131231216;
+			public const int tooltip_frame_dark = 2131231216;
 			
 			// aapt resource value: 0x7F0801F1
-			public const int sure_background_def = 2131231217;
+			public const int tooltip_frame_light = 2131231217;
 			
 			// aapt resource value: 0x7F0801F2
-			public const int sure_background_sel = 2131231218;
+			public const int transparent_divider = 2131231218;
 			
 			// aapt resource value: 0x7F0801F3
-			public const int switch_off = 2131231219;
+			public const int unlock = 2131231219;
 			
 			// aapt resource value: 0x7F0801F4
-			public const int switch_off_disable = 2131231220;
+			public const int unlock_def = 2131231220;
 			
 			// aapt resource value: 0x7F0801F5
-			public const int switch_on = 2131231221;
+			public const int unlock_sel = 2131231221;
 			
 			// aapt resource value: 0x7F0801F6
-			public const int switch_on_disable = 2131231222;
+			public const int user_module_bg_commit_button = 2131231222;
 			
 			// aapt resource value: 0x7F0801F7
-			public const int test_level_drawable = 2131231223;
+			public const int user_module_bg_commit_button_press = 2131231223;
 			
 			// aapt resource value: 0x7F0801F8
-			public const int text_cursor_drawable = 2131231224;
+			public const int user_module_bg_commit_button_selector = 2131231224;
 			
 			// aapt resource value: 0x7F0801F9
-			public const int tip_background = 2131231225;
+			public const int user_module_icon_login_account = 2131231225;
 			
 			// aapt resource value: 0x7F0801FA
-			public const int tooltip_frame_dark = 2131231226;
+			public const int video_background = 2131231226;
 			
 			// aapt resource value: 0x7F0801FB
-			public const int tooltip_frame_light = 2131231227;
-			
-			// aapt resource value: 0x7F0801FC
-			public const int transparent_divider = 2131231228;
-			
-			// aapt resource value: 0x7F0801FD
-			public const int unlock = 2131231229;
-			
-			// aapt resource value: 0x7F0801FE
-			public const int unlock_def = 2131231230;
-			
-			// aapt resource value: 0x7F0801FF
-			public const int unlock_sel = 2131231231;
-			
-			// aapt resource value: 0x7F080200
-			public const int user_module_bg_commit_button = 2131231232;
-			
-			// aapt resource value: 0x7F080201
-			public const int user_module_bg_commit_button_press = 2131231233;
-			
-			// aapt resource value: 0x7F080202
-			public const int user_module_bg_commit_button_selector = 2131231234;
-			
-			// aapt resource value: 0x7F080203
-			public const int user_module_icon_login_account = 2131231235;
-			
-			// aapt resource value: 0x7F080204
-			public const int video_background = 2131231236;
-			
-			// aapt resource value: 0x7F080205
-			public const int wifi_connecting = 2131231237;
+			public const int wifi_connecting = 2131231227;
 			
 			static Drawable()
 			{
@@ -15071,17 +14841,14 @@
 			// aapt resource value: 0x7F09003A
 			public const int action0 = 2131296314;
 			
-			// aapt resource value: 0x7F090050
-			public const int actionbarLayoutId = 2131296336;
-			
 			// aapt resource value: 0x7F09003B
 			public const int actionDown = 2131296315;
 			
 			// aapt resource value: 0x7F09003C
 			public const int actionDownUp = 2131296316;
 			
-			// aapt resource value: 0x7F090051
-			public const int actions = 2131296337;
+			// aapt resource value: 0x7F090050
+			public const int actions = 2131296336;
 			
 			// aapt resource value: 0x7F09003D
 			public const int actionUp = 2131296317;
@@ -15140,767 +14907,740 @@
 			// aapt resource value: 0x7F09004F
 			public const int action_text = 2131296335;
 			
+			// aapt resource value: 0x7F090051
+			public const int activity_chooser_view_content = 2131296337;
+			
 			// aapt resource value: 0x7F090052
-			public const int activity_chooser_view_content = 2131296338;
+			public const int add = 2131296338;
 			
 			// aapt resource value: 0x7F090053
-			public const int add = 2131296339;
+			public const int adjacent = 2131296339;
 			
 			// aapt resource value: 0x7F090054
-			public const int adjacent = 2131296340;
+			public const int agree_btn = 2131296340;
 			
 			// aapt resource value: 0x7F090055
-			public const int agree_btn = 2131296341;
+			public const int alertTitle = 2131296341;
 			
 			// aapt resource value: 0x7F090056
-			public const int alertTitle = 2131296342;
+			public const int aligned = 2131296342;
 			
 			// aapt resource value: 0x7F090057
-			public const int aligned = 2131296343;
+			public const int all = 2131296343;
 			
 			// aapt resource value: 0x7F090058
-			public const int all = 2131296344;
-			
-			// aapt resource value: 0x7F090059
-			public const int allStates = 2131296345;
+			public const int allStates = 2131296344;
 			
 			// aapt resource value: 0x7F090000
 			public const int ALT = 2131296256;
 			
+			// aapt resource value: 0x7F090059
+			public const int always = 2131296345;
+			
 			// aapt resource value: 0x7F09005A
-			public const int always = 2131296346;
+			public const int alwaysAllow = 2131296346;
 			
 			// aapt resource value: 0x7F09005B
-			public const int alwaysAllow = 2131296347;
+			public const int alwaysDisallow = 2131296347;
 			
 			// aapt resource value: 0x7F09005C
-			public const int alwaysDisallow = 2131296348;
+			public const int anchored = 2131296348;
 			
 			// aapt resource value: 0x7F09005D
-			public const int anchored = 2131296349;
+			public const int androidx_window_activity_scope = 2131296349;
 			
 			// aapt resource value: 0x7F09005E
-			public const int androidx_window_activity_scope = 2131296350;
+			public const int animateToEnd = 2131296350;
 			
 			// aapt resource value: 0x7F09005F
-			public const int animateToEnd = 2131296351;
-			
-			// aapt resource value: 0x7F090060
-			public const int animateToStart = 2131296352;
-			
-			// aapt resource value: 0x7F090062
-			public const int anticipate = 2131296354;
+			public const int animateToStart = 2131296351;
 			
 			// aapt resource value: 0x7F090061
-			public const int antiClockwise = 2131296353;
+			public const int anticipate = 2131296353;
+			
+			// aapt resource value: 0x7F090060
+			public const int antiClockwise = 2131296352;
+			
+			// aapt resource value: 0x7F090062
+			public const int ap_name_input = 2131296354;
 			
 			// aapt resource value: 0x7F090063
-			public const int ap_name_input = 2131296355;
+			public const int arc = 2131296355;
 			
 			// aapt resource value: 0x7F090064
-			public const int arc = 2131296356;
+			public const int asConfigured = 2131296356;
 			
 			// aapt resource value: 0x7F090065
-			public const int asConfigured = 2131296357;
+			public const int async = 2131296357;
 			
 			// aapt resource value: 0x7F090066
-			public const int async = 2131296358;
+			public const int auto = 2131296358;
 			
 			// aapt resource value: 0x7F090067
-			public const int auto = 2131296359;
+			public const int autoAccept = 2131296359;
 			
 			// aapt resource value: 0x7F090068
-			public const int autoAccept = 2131296360;
+			public const int autoComplete = 2131296360;
 			
 			// aapt resource value: 0x7F090069
-			public const int autoComplete = 2131296361;
+			public const int autoCompleteToEnd = 2131296361;
 			
 			// aapt resource value: 0x7F09006A
-			public const int autoCompleteToEnd = 2131296362;
+			public const int autoCompleteToStart = 2131296362;
 			
 			// aapt resource value: 0x7F09006B
-			public const int autoCompleteToStart = 2131296363;
+			public const int autoTest = 2131296363;
 			
 			// aapt resource value: 0x7F09006C
-			public const int autoTest = 2131296364;
+			public const int av_anim = 2131296364;
 			
 			// aapt resource value: 0x7F09006D
-			public const int av_anim = 2131296365;
+			public const int barrier = 2131296365;
 			
 			// aapt resource value: 0x7F09006E
-			public const int banner_body = 2131296366;
-			
-			// aapt resource value: 0x7F09006F
-			public const int banner_content_root = 2131296367;
+			public const int baseline = 2131296366;
 			
 			// aapt resource value: 0x7F090070
-			public const int banner_image = 2131296368;
+			public const int beginning = 2131296368;
+			
+			// aapt resource value: 0x7F09006F
+			public const int beginOnFirstDraw = 2131296367;
 			
 			// aapt resource value: 0x7F090071
-			public const int banner_image_only = 2131296369;
+			public const int bestChoice = 2131296369;
 			
 			// aapt resource value: 0x7F090072
-			public const int banner_root = 2131296370;
+			public const int bg = 2131296370;
 			
 			// aapt resource value: 0x7F090073
-			public const int banner_text_container = 2131296371;
+			public const int bind_success_rl = 2131296371;
 			
 			// aapt resource value: 0x7F090074
-			public const int banner_title = 2131296372;
+			public const int bind_success_sv = 2131296372;
 			
 			// aapt resource value: 0x7F090075
-			public const int barrier = 2131296373;
+			public const int blocking = 2131296373;
 			
 			// aapt resource value: 0x7F090076
-			public const int baseline = 2131296374;
-			
-			// aapt resource value: 0x7F090078
-			public const int beginning = 2131296376;
+			public const int both = 2131296374;
 			
 			// aapt resource value: 0x7F090077
-			public const int beginOnFirstDraw = 2131296375;
+			public const int bottom = 2131296375;
+			
+			// aapt resource value: 0x7F090078
+			public const int bottomToTop = 2131296376;
 			
 			// aapt resource value: 0x7F090079
-			public const int bestChoice = 2131296377;
-			
-			// aapt resource value: 0x7F09007A
-			public const int bg = 2131296378;
-			
-			// aapt resource value: 0x7F09007B
-			public const int bind_success_rl = 2131296379;
-			
-			// aapt resource value: 0x7F09007C
-			public const int bind_success_sv = 2131296380;
-			
-			// aapt resource value: 0x7F09007D
-			public const int blocking = 2131296381;
-			
-			// aapt resource value: 0x7F09007E
-			public const int both = 2131296382;
-			
-			// aapt resource value: 0x7F09007F
-			public const int bottom = 2131296383;
-			
-			// aapt resource value: 0x7F090080
-			public const int bottomToTop = 2131296384;
-			
-			// aapt resource value: 0x7F090081
-			public const int bottom_divider = 2131296385;
+			public const int bottom_divider = 2131296377;
 			
 			// aapt resource value: 0x7F090001
 			public const int BOTTOM_END = 2131296257;
 			
-			// aapt resource value: 0x7F090082
-			public const int bottom_line = 2131296386;
+			// aapt resource value: 0x7F09007A
+			public const int bottom_line = 2131296378;
 			
 			// aapt resource value: 0x7F090002
 			public const int BOTTOM_START = 2131296258;
 			
+			// aapt resource value: 0x7F09007B
+			public const int bottom_tip_title = 2131296379;
+			
+			// aapt resource value: 0x7F09007C
+			public const int bounce = 2131296380;
+			
+			// aapt resource value: 0x7F09007D
+			public const int bounceBoth = 2131296381;
+			
+			// aapt resource value: 0x7F09007E
+			public const int bounceEnd = 2131296382;
+			
+			// aapt resource value: 0x7F09007F
+			public const int bounceStart = 2131296383;
+			
+			// aapt resource value: 0x7F090080
+			public const int browser_actions_header_text = 2131296384;
+			
 			// aapt resource value: 0x7F090083
-			public const int bottom_tip_title = 2131296387;
+			public const int browser_actions_menu_items = 2131296387;
+			
+			// aapt resource value: 0x7F090081
+			public const int browser_actions_menu_item_icon = 2131296385;
+			
+			// aapt resource value: 0x7F090082
+			public const int browser_actions_menu_item_text = 2131296386;
 			
 			// aapt resource value: 0x7F090084
-			public const int bounce = 2131296388;
+			public const int browser_actions_menu_view = 2131296388;
 			
 			// aapt resource value: 0x7F090085
-			public const int bounceBoth = 2131296389;
+			public const int btnCancel = 2131296389;
 			
 			// aapt resource value: 0x7F090086
-			public const int bounceEnd = 2131296390;
+			public const int btnSubmit = 2131296390;
 			
 			// aapt resource value: 0x7F090087
-			public const int bounceStart = 2131296391;
+			public const int btn_cancel = 2131296391;
 			
 			// aapt resource value: 0x7F090088
-			public const int browser_actions_header_text = 2131296392;
-			
-			// aapt resource value: 0x7F09008B
-			public const int browser_actions_menu_items = 2131296395;
+			public const int btn_ok = 2131296392;
 			
 			// aapt resource value: 0x7F090089
-			public const int browser_actions_menu_item_icon = 2131296393;
+			public const int buttonPanel = 2131296393;
 			
 			// aapt resource value: 0x7F09008A
-			public const int browser_actions_menu_item_text = 2131296394;
+			public const int cache_measures = 2131296394;
+			
+			// aapt resource value: 0x7F09008B
+			public const int callAnswerImg = 2131296395;
 			
 			// aapt resource value: 0x7F09008C
-			public const int browser_actions_menu_view = 2131296396;
+			public const int callAnswerLayout = 2131296396;
 			
 			// aapt resource value: 0x7F09008D
-			public const int btnCancel = 2131296397;
+			public const int callHangupImg = 2131296397;
 			
 			// aapt resource value: 0x7F09008E
-			public const int btnSubmit = 2131296398;
+			public const int callHangupText = 2131296398;
 			
 			// aapt resource value: 0x7F09008F
-			public const int btn_cancel = 2131296399;
+			public const int callMeasure = 2131296399;
 			
 			// aapt resource value: 0x7F090090
-			public const int btn_ok = 2131296400;
+			public const int callScreenshotImg = 2131296400;
 			
 			// aapt resource value: 0x7F090091
-			public const int buttonPanel = 2131296401;
+			public const int callTipText = 2131296401;
 			
 			// aapt resource value: 0x7F090092
-			public const int cache_measures = 2131296402;
+			public const int callUnlockImg = 2131296402;
 			
 			// aapt resource value: 0x7F090093
-			public const int callAnswerImg = 2131296403;
+			public const int call_accept = 2131296403;
 			
 			// aapt resource value: 0x7F090094
-			public const int callAnswerLayout = 2131296404;
+			public const int camera0 = 2131296404;
 			
 			// aapt resource value: 0x7F090095
-			public const int callHangupImg = 2131296405;
+			public const int camera1 = 2131296405;
 			
 			// aapt resource value: 0x7F090096
-			public const int callHangupText = 2131296406;
+			public const int cancel_action = 2131296406;
 			
 			// aapt resource value: 0x7F090097
-			public const int callMeasure = 2131296407;
+			public const int cancel_btn = 2131296407;
 			
 			// aapt resource value: 0x7F090098
-			public const int callScreenshotImg = 2131296408;
+			public const int cancel_button = 2131296408;
 			
 			// aapt resource value: 0x7F090099
-			public const int callTipText = 2131296409;
+			public const int capture_container = 2131296409;
 			
 			// aapt resource value: 0x7F09009A
-			public const int callUnlockImg = 2131296410;
+			public const int capture_crop_view = 2131296410;
 			
 			// aapt resource value: 0x7F09009B
-			public const int call_accept = 2131296411;
+			public const int capture_mask_bottom = 2131296411;
 			
 			// aapt resource value: 0x7F09009C
-			public const int camera0 = 2131296412;
+			public const int capture_mask_top = 2131296412;
 			
 			// aapt resource value: 0x7F09009D
-			public const int camera1 = 2131296413;
+			public const int capture_preview = 2131296413;
 			
 			// aapt resource value: 0x7F09009E
-			public const int cancel_action = 2131296414;
+			public const int capture_scan_line = 2131296414;
 			
 			// aapt resource value: 0x7F09009F
-			public const int cancel_btn = 2131296415;
+			public const int carryVelocity = 2131296415;
 			
 			// aapt resource value: 0x7F0900A0
-			public const int cancel_button = 2131296416;
+			public const int cb_confirm = 2131296416;
 			
 			// aapt resource value: 0x7F0900A1
-			public const int capture_container = 2131296417;
+			public const int cc_btn_back = 2131296417;
 			
 			// aapt resource value: 0x7F0900A2
-			public const int capture_crop_view = 2131296418;
+			public const int cc_line_long = 2131296418;
 			
 			// aapt resource value: 0x7F0900A3
-			public const int capture_mask_bottom = 2131296419;
+			public const int cc_listview = 2131296419;
 			
 			// aapt resource value: 0x7F0900A4
-			public const int capture_mask_top = 2131296420;
+			public const int cc_nameView = 2131296420;
 			
 			// aapt resource value: 0x7F0900A5
-			public const int capture_preview = 2131296421;
+			public const int cc_rl_topview = 2131296421;
 			
 			// aapt resource value: 0x7F0900A6
-			public const int capture_scan_line = 2131296422;
+			public const int cc_searchBarContainer = 2131296422;
 			
 			// aapt resource value: 0x7F0900A7
-			public const int carryVelocity = 2131296423;
+			public const int cc_sectionTextView = 2131296423;
 			
 			// aapt resource value: 0x7F0900A8
-			public const int cb_confirm = 2131296424;
+			public const int cc_tv_activity_title = 2131296424;
 			
 			// aapt resource value: 0x7F0900A9
-			public const int cc_btn_back = 2131296425;
+			public const int center = 2131296425;
 			
 			// aapt resource value: 0x7F0900AA
-			public const int cc_line_long = 2131296426;
+			public const int centerCrop = 2131296426;
 			
 			// aapt resource value: 0x7F0900AB
-			public const int cc_listview = 2131296427;
+			public const int centerInside = 2131296427;
 			
 			// aapt resource value: 0x7F0900AC
-			public const int cc_nameView = 2131296428;
+			public const int center_horizontal = 2131296428;
 			
 			// aapt resource value: 0x7F0900AD
-			public const int cc_rl_topview = 2131296429;
+			public const int center_title = 2131296429;
 			
 			// aapt resource value: 0x7F0900AE
-			public const int cc_searchBarContainer = 2131296430;
+			public const int center_vertical = 2131296430;
 			
 			// aapt resource value: 0x7F0900AF
-			public const int cc_sectionTextView = 2131296431;
+			public const int chain = 2131296431;
 			
 			// aapt resource value: 0x7F0900B0
-			public const int cc_tv_activity_title = 2131296432;
+			public const int chain2 = 2131296432;
 			
 			// aapt resource value: 0x7F0900B1
-			public const int center = 2131296433;
+			public const int chains = 2131296433;
 			
 			// aapt resource value: 0x7F0900B2
-			public const int centerCrop = 2131296434;
+			public const int checkbox = 2131296434;
 			
 			// aapt resource value: 0x7F0900B3
-			public const int centerInside = 2131296435;
+			public const int @checked = 2131296435;
 			
 			// aapt resource value: 0x7F0900B4
-			public const int center_horizontal = 2131296436;
+			public const int child_content = 2131296436;
 			
 			// aapt resource value: 0x7F0900B5
-			public const int center_title = 2131296437;
+			public const int chronometer = 2131296437;
 			
 			// aapt resource value: 0x7F0900B6
-			public const int center_vertical = 2131296438;
+			public const int circle_center = 2131296438;
 			
 			// aapt resource value: 0x7F0900B7
-			public const int chain = 2131296439;
+			public const int clear_text = 2131296439;
 			
 			// aapt resource value: 0x7F0900B8
-			public const int chain2 = 2131296440;
+			public const int clip_horizontal = 2131296440;
 			
 			// aapt resource value: 0x7F0900B9
-			public const int chains = 2131296441;
+			public const int clip_vertical = 2131296441;
 			
 			// aapt resource value: 0x7F0900BA
-			public const int checkbox = 2131296442;
+			public const int clockwise = 2131296442;
 			
 			// aapt resource value: 0x7F0900BB
-			public const int @checked = 2131296443;
+			public const int close = 2131296443;
 			
 			// aapt resource value: 0x7F0900BC
-			public const int child_content = 2131296444;
+			public const int closest = 2131296444;
 			
 			// aapt resource value: 0x7F0900BD
-			public const int chronometer = 2131296445;
+			public const int cloud_image1 = 2131296445;
 			
 			// aapt resource value: 0x7F0900BE
-			public const int circle_center = 2131296446;
+			public const int cloud_image2 = 2131296446;
 			
 			// aapt resource value: 0x7F0900BF
-			public const int clear_text = 2131296447;
+			public const int cloud_progrees_img = 2131296447;
 			
 			// aapt resource value: 0x7F0900C0
-			public const int clip_horizontal = 2131296448;
+			public const int collapseActionView = 2131296448;
 			
 			// aapt resource value: 0x7F0900C1
-			public const int clip_vertical = 2131296449;
+			public const int collapsed = 2131296449;
 			
 			// aapt resource value: 0x7F0900C2
-			public const int clockwise = 2131296450;
+			public const int comment = 2131296450;
 			
 			// aapt resource value: 0x7F0900C3
-			public const int close = 2131296451;
+			public const int common_search_cancel = 2131296451;
 			
 			// aapt resource value: 0x7F0900C4
-			public const int closest = 2131296452;
+			public const int common_search_input = 2131296452;
 			
 			// aapt resource value: 0x7F0900C5
-			public const int cloud_image1 = 2131296453;
+			public const int compress = 2131296453;
 			
 			// aapt resource value: 0x7F0900C6
-			public const int cloud_image2 = 2131296454;
+			public const int configAVMsg = 2131296454;
 			
 			// aapt resource value: 0x7F0900C7
-			public const int cloud_progrees_img = 2131296455;
+			public const int confirm_btn = 2131296455;
 			
 			// aapt resource value: 0x7F0900C8
-			public const int collapseActionView = 2131296456;
+			public const int confirm_button = 2131296456;
 			
 			// aapt resource value: 0x7F0900C9
-			public const int collapsed = 2131296457;
+			public const int constraint = 2131296457;
 			
 			// aapt resource value: 0x7F0900CA
-			public const int comment = 2131296458;
+			public const int container = 2131296458;
 			
 			// aapt resource value: 0x7F0900CB
-			public const int common_search_cancel = 2131296459;
+			public const int content = 2131296459;
 			
 			// aapt resource value: 0x7F0900CC
-			public const int common_search_input = 2131296460;
+			public const int contentFrame = 2131296460;
 			
 			// aapt resource value: 0x7F0900CD
-			public const int compress = 2131296461;
+			public const int contentPanel = 2131296461;
 			
 			// aapt resource value: 0x7F0900CE
-			public const int configAVMsg = 2131296462;
+			public const int content_container = 2131296462;
 			
 			// aapt resource value: 0x7F0900CF
-			public const int confirm_btn = 2131296463;
+			public const int contiguous = 2131296463;
 			
 			// aapt resource value: 0x7F0900D0
-			public const int confirm_button = 2131296464;
+			public const int continuousVelocity = 2131296464;
 			
 			// aapt resource value: 0x7F0900D1
-			public const int constraint = 2131296465;
+			public const int coordinator = 2131296465;
 			
 			// aapt resource value: 0x7F0900D2
-			public const int container = 2131296466;
+			public const int cos = 2131296466;
 			
 			// aapt resource value: 0x7F0900D3
-			public const int content = 2131296467;
+			public const int countdown_view = 2131296467;
 			
 			// aapt resource value: 0x7F0900D4
-			public const int contentFrame = 2131296468;
+			public const int counterclockwise = 2131296468;
 			
 			// aapt resource value: 0x7F0900D5
-			public const int contentPanel = 2131296469;
-			
-			// aapt resource value: 0x7F0900D6
-			public const int content_container = 2131296470;
-			
-			// aapt resource value: 0x7F0900D7
-			public const int contiguous = 2131296471;
-			
-			// aapt resource value: 0x7F0900D8
-			public const int continuousVelocity = 2131296472;
-			
-			// aapt resource value: 0x7F0900D9
-			public const int coordinator = 2131296473;
-			
-			// aapt resource value: 0x7F0900DA
-			public const int cos = 2131296474;
-			
-			// aapt resource value: 0x7F0900DB
-			public const int countdown_view = 2131296475;
-			
-			// aapt resource value: 0x7F0900DC
-			public const int counterclockwise = 2131296476;
-			
-			// aapt resource value: 0x7F0900DD
-			public const int cradle = 2131296477;
+			public const int cradle = 2131296469;
 			
 			// aapt resource value: 0x7F090003
 			public const int CTRL = 2131296259;
 			
+			// aapt resource value: 0x7F0900D6
+			public const int cubein = 2131296470;
+			
+			// aapt resource value: 0x7F0900D7
+			public const int cubeout = 2131296471;
+			
+			// aapt resource value: 0x7F0900D8
+			public const int currentState = 2131296472;
+			
+			// aapt resource value: 0x7F0900D9
+			public const int custom = 2131296473;
+			
+			// aapt resource value: 0x7F0900DA
+			public const int customPanel = 2131296474;
+			
+			// aapt resource value: 0x7F0900DB
+			public const int cut = 2131296475;
+			
+			// aapt resource value: 0x7F0900DC
+			public const int date_picker_actions = 2131296476;
+			
+			// aapt resource value: 0x7F0900DD
+			public const int day = 2131296477;
+			
 			// aapt resource value: 0x7F0900DE
-			public const int cubein = 2131296478;
+			public const int decelerate = 2131296478;
 			
 			// aapt resource value: 0x7F0900DF
-			public const int cubeout = 2131296479;
+			public const int decelerateAndComplete = 2131296479;
 			
 			// aapt resource value: 0x7F0900E0
-			public const int currentState = 2131296480;
+			public const int decode = 2131296480;
 			
 			// aapt resource value: 0x7F0900E1
-			public const int custom = 2131296481;
+			public const int decode_failed = 2131296481;
 			
 			// aapt resource value: 0x7F0900E2
-			public const int customPanel = 2131296482;
+			public const int decode_succeeded = 2131296482;
 			
 			// aapt resource value: 0x7F0900E3
-			public const int cut = 2131296483;
+			public const int decor_content_parent = 2131296483;
 			
 			// aapt resource value: 0x7F0900E4
-			public const int date_picker_actions = 2131296484;
+			public const int default_activity_button = 2131296484;
 			
 			// aapt resource value: 0x7F0900E5
-			public const int day = 2131296485;
+			public const int deltaRelative = 2131296485;
 			
 			// aapt resource value: 0x7F0900E6
-			public const int decelerate = 2131296486;
+			public const int dependency_ordering = 2131296486;
 			
 			// aapt resource value: 0x7F0900E7
-			public const int decelerateAndComplete = 2131296487;
+			public const int description = 2131296487;
 			
 			// aapt resource value: 0x7F0900E8
-			public const int decode = 2131296488;
+			public const int design_bottom_sheet = 2131296488;
 			
 			// aapt resource value: 0x7F0900E9
-			public const int decode_failed = 2131296489;
+			public const int design_menu_item_action_area = 2131296489;
 			
 			// aapt resource value: 0x7F0900EA
-			public const int decode_succeeded = 2131296490;
+			public const int design_menu_item_action_area_stub = 2131296490;
 			
 			// aapt resource value: 0x7F0900EB
-			public const int decor_content_parent = 2131296491;
+			public const int design_menu_item_text = 2131296491;
 			
 			// aapt resource value: 0x7F0900EC
-			public const int default_activity_button = 2131296492;
-			
-			// aapt resource value: 0x7F0900ED
-			public const int deltaRelative = 2131296493;
-			
-			// aapt resource value: 0x7F0900EE
-			public const int dependency_ordering = 2131296494;
+			public const int design_navigation_view = 2131296492;
 			
 			// aapt resource value: 0x7F0900EF
-			public const int description = 2131296495;
+			public const int device_hidden_title = 2131296495;
 			
 			// aapt resource value: 0x7F0900F0
-			public const int design_bottom_sheet = 2131296496;
+			public const int device_list = 2131296496;
 			
 			// aapt resource value: 0x7F0900F1
-			public const int design_menu_item_action_area = 2131296497;
+			public const int device_name = 2131296497;
 			
 			// aapt resource value: 0x7F0900F2
-			public const int design_menu_item_action_area_stub = 2131296498;
+			public const int device_name_input = 2131296498;
 			
 			// aapt resource value: 0x7F0900F3
-			public const int design_menu_item_text = 2131296499;
+			public const int device_wifi_list = 2131296499;
 			
 			// aapt resource value: 0x7F0900F4
-			public const int design_navigation_view = 2131296500;
-			
-			// aapt resource value: 0x7F0900F7
-			public const int device_hidden_title = 2131296503;
-			
-			// aapt resource value: 0x7F0900F8
-			public const int device_list = 2131296504;
-			
-			// aapt resource value: 0x7F0900F9
-			public const int device_name = 2131296505;
-			
-			// aapt resource value: 0x7F0900FA
-			public const int device_name_input = 2131296506;
-			
-			// aapt resource value: 0x7F0900FB
-			public const int device_wifi_list = 2131296507;
-			
-			// aapt resource value: 0x7F0900FC
-			public const int device_wifi_list_connected = 2131296508;
-			
-			// aapt resource value: 0x7F0900FD
-			public const int device_wifi_list_connected_info = 2131296509;
-			
-			// aapt resource value: 0x7F0900FE
-			public const int device_wifi_list_empty_view = 2131296510;
-			
-			// aapt resource value: 0x7F0900FF
-			public const int device_wifi_list_layout = 2131296511;
-			
-			// aapt resource value: 0x7F090100
-			public const int device_wifi_list_text = 2131296512;
-			
-			// aapt resource value: 0x7F090101
-			public const int device_wifi_list_title = 2131296513;
-			
-			// aapt resource value: 0x7F090102
-			public const int device_wifi_no_5g = 2131296514;
-			
-			// aapt resource value: 0x7F090103
-			public const int device_wifi_password = 2131296515;
-			
-			// aapt resource value: 0x7F090104
-			public const int device_wifi_password_done_btn = 2131296516;
-			
-			// aapt resource value: 0x7F090105
-			public const int device_wifi_password_title = 2131296517;
-			
-			// aapt resource value: 0x7F090106
-			public const int device_wifi_ssid = 2131296518;
+			public const int device_wifi_list_connected = 2131296500;
 			
 			// aapt resource value: 0x7F0900F5
-			public const int dev_img = 2131296501;
+			public const int device_wifi_list_connected_info = 2131296501;
 			
 			// aapt resource value: 0x7F0900F6
-			public const int dev_wifi_name = 2131296502;
+			public const int device_wifi_list_empty_view = 2131296502;
 			
-			// aapt resource value: 0x7F090107
-			public const int dh_scannerstyle_view = 2131296519;
+			// aapt resource value: 0x7F0900F7
+			public const int device_wifi_list_layout = 2131296503;
 			
-			// aapt resource value: 0x7F090108
-			public const int dh_scanview = 2131296520;
+			// aapt resource value: 0x7F0900F8
+			public const int device_wifi_list_text = 2131296504;
 			
-			// aapt resource value: 0x7F090109
-			public const int dialog_button = 2131296521;
+			// aapt resource value: 0x7F0900F9
+			public const int device_wifi_list_title = 2131296505;
 			
-			// aapt resource value: 0x7F09010A
-			public const int dialog_cancel_btn = 2131296522;
+			// aapt resource value: 0x7F0900FA
+			public const int device_wifi_no_5g = 2131296506;
+			
+			// aapt resource value: 0x7F0900FB
+			public const int device_wifi_password = 2131296507;
+			
+			// aapt resource value: 0x7F0900FC
+			public const int device_wifi_password_done_btn = 2131296508;
+			
+			// aapt resource value: 0x7F0900FD
+			public const int device_wifi_password_title = 2131296509;
+			
+			// aapt resource value: 0x7F0900FE
+			public const int device_wifi_ssid = 2131296510;
+			
+			// aapt resource value: 0x7F0900ED
+			public const int dev_img = 2131296493;
+			
+			// aapt resource value: 0x7F0900EE
+			public const int dev_wifi_name = 2131296494;
+			
+			// aapt resource value: 0x7F0900FF
+			public const int dh_scannerstyle_view = 2131296511;
+			
+			// aapt resource value: 0x7F090100
+			public const int dh_scanview = 2131296512;
+			
+			// aapt resource value: 0x7F090101
+			public const int dialog_button = 2131296513;
+			
+			// aapt resource value: 0x7F090102
+			public const int dialog_cancel_btn = 2131296514;
+			
+			// aapt resource value: 0x7F090103
+			public const int dialog_ok_btn = 2131296515;
+			
+			// aapt resource value: 0x7F090104
+			public const int dimensions = 2131296516;
+			
+			// aapt resource value: 0x7F090105
+			public const int direct = 2131296517;
 			
 			// aapt resource value: 0x7F09010B
-			public const int dialog_ok_btn = 2131296523;
+			public const int disabled = 2131296523;
+			
+			// aapt resource value: 0x7F090106
+			public const int disableHome = 2131296518;
+			
+			// aapt resource value: 0x7F090107
+			public const int disableIntraAutoTransition = 2131296519;
+			
+			// aapt resource value: 0x7F090108
+			public const int disablePostScroll = 2131296520;
+			
+			// aapt resource value: 0x7F090109
+			public const int disableReportBytes = 2131296521;
+			
+			// aapt resource value: 0x7F09010A
+			public const int disableScroll = 2131296522;
 			
 			// aapt resource value: 0x7F09010C
-			public const int dimensions = 2131296524;
+			public const int disagree_btn = 2131296524;
 			
 			// aapt resource value: 0x7F09010D
-			public const int direct = 2131296525;
-			
-			// aapt resource value: 0x7F090113
-			public const int disabled = 2131296531;
+			public const int disjoint = 2131296525;
 			
 			// aapt resource value: 0x7F09010E
-			public const int disableHome = 2131296526;
+			public const int dragAnticlockwise = 2131296526;
 			
 			// aapt resource value: 0x7F09010F
-			public const int disableIntraAutoTransition = 2131296527;
+			public const int dragClockwise = 2131296527;
 			
 			// aapt resource value: 0x7F090110
-			public const int disablePostScroll = 2131296528;
+			public const int dragDown = 2131296528;
 			
 			// aapt resource value: 0x7F090111
-			public const int disableReportBytes = 2131296529;
+			public const int dragEnd = 2131296529;
 			
 			// aapt resource value: 0x7F090112
-			public const int disableScroll = 2131296530;
+			public const int dragLeft = 2131296530;
+			
+			// aapt resource value: 0x7F090113
+			public const int dragRight = 2131296531;
 			
 			// aapt resource value: 0x7F090114
-			public const int disagree_btn = 2131296532;
+			public const int dragStart = 2131296532;
 			
 			// aapt resource value: 0x7F090115
-			public const int disjoint = 2131296533;
+			public const int dragUp = 2131296533;
 			
 			// aapt resource value: 0x7F090116
-			public const int download_success_size = 2131296534;
+			public const int dropdown_menu = 2131296534;
 			
 			// aapt resource value: 0x7F090117
-			public const int dragAnticlockwise = 2131296535;
+			public const int easeIn = 2131296535;
 			
 			// aapt resource value: 0x7F090118
-			public const int dragClockwise = 2131296536;
+			public const int easeInOut = 2131296536;
 			
 			// aapt resource value: 0x7F090119
-			public const int dragDown = 2131296537;
+			public const int easeOut = 2131296537;
 			
 			// aapt resource value: 0x7F09011A
-			public const int dragEnd = 2131296538;
+			public const int east = 2131296538;
 			
 			// aapt resource value: 0x7F09011B
-			public const int dragLeft = 2131296539;
+			public const int edge = 2131296539;
 			
 			// aapt resource value: 0x7F09011C
-			public const int dragRight = 2131296540;
+			public const int edit_query = 2131296540;
 			
 			// aapt resource value: 0x7F09011D
-			public const int dragStart = 2131296541;
+			public const int edit_text_id = 2131296541;
 			
 			// aapt resource value: 0x7F09011E
-			public const int dragUp = 2131296542;
+			public const int elastic = 2131296542;
 			
 			// aapt resource value: 0x7F09011F
-			public const int dropdown_menu = 2131296543;
+			public const int embed = 2131296543;
 			
 			// aapt resource value: 0x7F090120
-			public const int easeIn = 2131296544;
+			public const int empty_tip = 2131296544;
 			
 			// aapt resource value: 0x7F090121
-			public const int easeInOut = 2131296545;
+			public const int enableReportBytes = 2131296545;
 			
 			// aapt resource value: 0x7F090122
-			public const int easeOut = 2131296546;
+			public const int encrypt_key = 2131296546;
 			
 			// aapt resource value: 0x7F090123
-			public const int east = 2131296547;
+			public const int end = 2131296547;
 			
 			// aapt resource value: 0x7F090124
-			public const int edge = 2131296548;
+			public const int endToStart = 2131296548;
 			
 			// aapt resource value: 0x7F090125
-			public const int edit_query = 2131296549;
+			public const int end_padder = 2131296549;
 			
 			// aapt resource value: 0x7F090126
-			public const int edit_text_id = 2131296550;
+			public const int enterAlways = 2131296550;
 			
 			// aapt resource value: 0x7F090127
-			public const int elastic = 2131296551;
+			public const int enterAlwaysCollapsed = 2131296551;
 			
 			// aapt resource value: 0x7F090128
-			public const int embed = 2131296552;
+			public const int error_tip = 2131296552;
 			
 			// aapt resource value: 0x7F090129
-			public const int empty_tip = 2131296553;
+			public const int error_tip_title = 2131296553;
 			
 			// aapt resource value: 0x7F09012A
-			public const int enableReportBytes = 2131296554;
+			public const int et_device_pwd = 2131296554;
 			
 			// aapt resource value: 0x7F09012B
-			public const int enable_service_text = 2131296555;
+			public const int et_input_sc = 2131296555;
 			
 			// aapt resource value: 0x7F09012C
-			public const int encrypt_key = 2131296556;
+			public const int et_new_name = 2131296556;
 			
 			// aapt resource value: 0x7F09012D
-			public const int end = 2131296557;
+			public const int et_pwd_new = 2131296557;
 			
 			// aapt resource value: 0x7F09012E
-			public const int endToStart = 2131296558;
+			public const int et_sms_valid = 2131296558;
 			
 			// aapt resource value: 0x7F09012F
-			public const int end_padder = 2131296559;
+			public const int et_user_input = 2131296559;
 			
 			// aapt resource value: 0x7F090130
-			public const int enterAlways = 2131296560;
-			
-			// aapt resource value: 0x7F090131
-			public const int enterAlwaysCollapsed = 2131296561;
+			public const int exitUntilCollapsed = 2131296560;
 			
 			// aapt resource value: 0x7F090132
-			public const int error_tip = 2131296562;
+			public const int expanded = 2131296562;
 			
 			// aapt resource value: 0x7F090133
-			public const int error_tip_title = 2131296563;
+			public const int expanded_menu = 2131296563;
+			
+			// aapt resource value: 0x7F090131
+			public const int expand_activities_button = 2131296561;
 			
 			// aapt resource value: 0x7F090134
-			public const int et_device_pwd = 2131296564;
-			
-			// aapt resource value: 0x7F090135
-			public const int et_input_sc = 2131296565;
-			
-			// aapt resource value: 0x7F090136
-			public const int et_new_name = 2131296566;
-			
-			// aapt resource value: 0x7F090137
-			public const int et_pwd_new = 2131296567;
-			
-			// aapt resource value: 0x7F090138
-			public const int et_sms_valid = 2131296568;
-			
-			// aapt resource value: 0x7F090139
-			public const int et_user_input = 2131296569;
-			
-			// aapt resource value: 0x7F09013A
-			public const int exitUntilCollapsed = 2131296570;
-			
-			// aapt resource value: 0x7F09013C
-			public const int expanded = 2131296572;
-			
-			// aapt resource value: 0x7F09013D
-			public const int expanded_menu = 2131296573;
-			
-			// aapt resource value: 0x7F09013B
-			public const int expand_activities_button = 2131296571;
-			
-			// aapt resource value: 0x7F09013E
-			public const int fade = 2131296574;
+			public const int fade = 2131296564;
 			
 			// aapt resource value: 0x7F090004
 			public const int FILL = 2131296260;
 			
-			// aapt resource value: 0x7F09013F
-			public const int fill = 2131296575;
+			// aapt resource value: 0x7F090135
+			public const int fill = 2131296565;
 			
-			// aapt resource value: 0x7F090142
-			public const int filled = 2131296578;
+			// aapt resource value: 0x7F090138
+			public const int filled = 2131296568;
 			
-			// aapt resource value: 0x7F090140
-			public const int fill_horizontal = 2131296576;
+			// aapt resource value: 0x7F090136
+			public const int fill_horizontal = 2131296566;
 			
 			// aapt resource value: 0x7F090005
 			public const int FILL_STROKE = 2131296261;
 			
-			// aapt resource value: 0x7F090141
-			public const int fill_vertical = 2131296577;
+			// aapt resource value: 0x7F090137
+			public const int fill_vertical = 2131296567;
 			
-			// aapt resource value: 0x7F090143
-			public const int fingerprint_icon = 2131296579;
+			// aapt resource value: 0x7F090139
+			public const int fingerprint_icon = 2131296569;
 			
-			// aapt resource value: 0x7F090144
-			public const int fitCenter = 2131296580;
+			// aapt resource value: 0x7F09013A
+			public const int fitCenter = 2131296570;
 			
-			// aapt resource value: 0x7F090145
-			public const int fitEnd = 2131296581;
+			// aapt resource value: 0x7F09013B
+			public const int fitEnd = 2131296571;
 			
-			// aapt resource value: 0x7F090146
-			public const int fitStart = 2131296582;
+			// aapt resource value: 0x7F09013C
+			public const int fitStart = 2131296572;
 			
-			// aapt resource value: 0x7F090147
-			public const int fitToContents = 2131296583;
+			// aapt resource value: 0x7F09013D
+			public const int fitToContents = 2131296573;
 			
-			// aapt resource value: 0x7F090148
-			public const int fitXY = 2131296584;
+			// aapt resource value: 0x7F09013E
+			public const int fitXY = 2131296574;
 			
-			// aapt resource value: 0x7F090149
-			public const int @fixed = 2131296585;
+			// aapt resource value: 0x7F09013F
+			public const int @fixed = 2131296575;
 			
 			// aapt resource value: 0x7F090007
 			public const int FixedBehind = 2131296263;
@@ -15908,1505 +15648,1322 @@
 			// aapt resource value: 0x7F090008
 			public const int FixedFront = 2131296264;
 			
+			// aapt resource value: 0x7F090141
+			public const int flip = 2131296577;
+			
+			// aapt resource value: 0x7F090142
+			public const int fliphorizontal = 2131296578;
+			
+			// aapt resource value: 0x7F090143
+			public const int flipvertical = 2131296579;
+			
+			// aapt resource value: 0x7F090144
+			public const int floating = 2131296580;
+			
+			// aapt resource value: 0x7F090140
+			public const int fl_inner = 2131296576;
+			
+			// aapt resource value: 0x7F090145
+			public const int forever = 2131296581;
+			
 			// aapt resource value: 0x7F09014B
-			public const int flip = 2131296587;
+			public const int fragment_container_view_tag = 2131296587;
 			
 			// aapt resource value: 0x7F09014C
-			public const int fliphorizontal = 2131296588;
+			public const int frost = 2131296588;
 			
-			// aapt resource value: 0x7F09014D
-			public const int flipvertical = 2131296589;
+			// aapt resource value: 0x7F090146
+			public const int fr_content = 2131296582;
 			
-			// aapt resource value: 0x7F09014E
-			public const int floating = 2131296590;
+			// aapt resource value: 0x7F090147
+			public const int fr_detail = 2131296583;
+			
+			// aapt resource value: 0x7F090148
+			public const int fr_live_window = 2131296584;
+			
+			// aapt resource value: 0x7F090149
+			public const int fr_live_window_content = 2131296585;
 			
 			// aapt resource value: 0x7F09014A
-			public const int fl_inner = 2131296586;
+			public const int fr_record = 2131296586;
 			
-			// aapt resource value: 0x7F09014F
-			public const int forever = 2131296591;
-			
-			// aapt resource value: 0x7F090155
-			public const int fragment_container_view_tag = 2131296597;
-			
-			// aapt resource value: 0x7F090156
-			public const int frost = 2131296598;
-			
-			// aapt resource value: 0x7F090150
-			public const int fr_content = 2131296592;
-			
-			// aapt resource value: 0x7F090151
-			public const int fr_detail = 2131296593;
-			
-			// aapt resource value: 0x7F090152
-			public const int fr_live_window = 2131296594;
-			
-			// aapt resource value: 0x7F090153
-			public const int fr_live_window_content = 2131296595;
-			
-			// aapt resource value: 0x7F090154
-			public const int fr_record = 2131296596;
-			
-			// aapt resource value: 0x7F090157
-			public const int fullscreen_header = 2131296599;
+			// aapt resource value: 0x7F09014D
+			public const int fullscreen_header = 2131296589;
 			
 			// aapt resource value: 0x7F090006
 			public const int FUNCTION = 2131296262;
 			
+			// aapt resource value: 0x7F09014E
+			public const int gatway_list = 2131296590;
+			
+			// aapt resource value: 0x7F09014F
+			public const int gd_btn_back = 2131296591;
+			
+			// aapt resource value: 0x7F090150
+			public const int gd_btn_myLocation = 2131296592;
+			
+			// aapt resource value: 0x7F090151
+			public const int gd_btn_save = 2131296593;
+			
+			// aapt resource value: 0x7F090152
+			public const int gd_img_search_delete = 2131296594;
+			
+			// aapt resource value: 0x7F090153
+			public const int gd_ll_myhome = 2131296595;
+			
+			// aapt resource value: 0x7F090154
+			public const int gd_ll_search = 2131296596;
+			
+			// aapt resource value: 0x7F090155
+			public const int gd_mapView = 2131296597;
+			
+			// aapt resource value: 0x7F090156
+			public const int gd_rl_topview = 2131296598;
+			
+			// aapt resource value: 0x7F090157
+			public const int gd_tv_activity_title = 2131296599;
+			
 			// aapt resource value: 0x7F090158
-			public const int gatway_list = 2131296600;
+			public const int gd_tv_radius = 2131296600;
 			
 			// aapt resource value: 0x7F090159
-			public const int gd_btn_back = 2131296601;
+			public const int gd_tv_search_title = 2131296601;
 			
 			// aapt resource value: 0x7F09015A
-			public const int gd_btn_myLocation = 2131296602;
+			public const int ghost_view = 2131296602;
 			
 			// aapt resource value: 0x7F09015B
-			public const int gd_btn_save = 2131296603;
+			public const int ghost_view_holder = 2131296603;
 			
 			// aapt resource value: 0x7F09015C
-			public const int gd_img_search_delete = 2131296604;
+			public const int gone = 2131296604;
 			
 			// aapt resource value: 0x7F09015D
-			public const int gd_ll_myhome = 2131296605;
+			public const int graph = 2131296605;
 			
 			// aapt resource value: 0x7F09015E
-			public const int gd_ll_search = 2131296606;
+			public const int graph_wrap = 2131296606;
 			
 			// aapt resource value: 0x7F09015F
-			public const int gd_mapView = 2131296607;
-			
-			// aapt resource value: 0x7F090160
-			public const int gd_rl_topview = 2131296608;
+			public const int gridview = 2131296607;
 			
 			// aapt resource value: 0x7F090161
-			public const int gd_tv_activity_title = 2131296609;
+			public const int grouping = 2131296609;
 			
 			// aapt resource value: 0x7F090162
-			public const int gd_tv_radius = 2131296610;
+			public const int groups = 2131296610;
+			
+			// aapt resource value: 0x7F090160
+			public const int group_divider = 2131296608;
 			
 			// aapt resource value: 0x7F090163
-			public const int gd_tv_search_title = 2131296611;
+			public const int hangup = 2131296611;
 			
 			// aapt resource value: 0x7F090164
-			public const int ghost_view = 2131296612;
+			public const int hangupMonitorIn = 2131296612;
 			
 			// aapt resource value: 0x7F090165
-			public const int ghost_view_holder = 2131296613;
+			public const int hdl_gallery_rootView = 2131296613;
 			
 			// aapt resource value: 0x7F090166
-			public const int gone = 2131296614;
+			public const int hdl_gallery_viewPager = 2131296614;
 			
 			// aapt resource value: 0x7F090167
-			public const int graph = 2131296615;
+			public const int hdl_options1 = 2131296615;
 			
 			// aapt resource value: 0x7F090168
-			public const int graph_wrap = 2131296616;
+			public const int hdl_options2 = 2131296616;
 			
 			// aapt resource value: 0x7F090169
-			public const int gridview = 2131296617;
-			
-			// aapt resource value: 0x7F09016B
-			public const int grouping = 2131296619;
-			
-			// aapt resource value: 0x7F09016C
-			public const int groups = 2131296620;
+			public const int hdl_options3 = 2131296617;
 			
 			// aapt resource value: 0x7F09016A
-			public const int group_divider = 2131296618;
+			public const int hdl_pickerview_ll = 2131296618;
+			
+			// aapt resource value: 0x7F09016B
+			public const int header_title = 2131296619;
+			
+			// aapt resource value: 0x7F09016C
+			public const int help_link = 2131296620;
 			
 			// aapt resource value: 0x7F09016D
-			public const int hangup = 2131296621;
+			public const int help_tip = 2131296621;
 			
 			// aapt resource value: 0x7F09016E
-			public const int hangupMonitorIn = 2131296622;
+			public const int hidden = 2131296622;
 			
 			// aapt resource value: 0x7F09016F
-			public const int hdl_gallery_rootView = 2131296623;
-			
-			// aapt resource value: 0x7F090170
-			public const int hdl_gallery_viewPager = 2131296624;
+			public const int hide = 2131296623;
 			
 			// aapt resource value: 0x7F090171
-			public const int hdl_options1 = 2131296625;
+			public const int hideable = 2131296625;
+			
+			// aapt resource value: 0x7F090170
+			public const int hide_ime_id = 2131296624;
 			
 			// aapt resource value: 0x7F090172
-			public const int hdl_options2 = 2131296626;
+			public const int home = 2131296626;
 			
 			// aapt resource value: 0x7F090173
-			public const int hdl_options3 = 2131296627;
+			public const int homeAsUp = 2131296627;
 			
 			// aapt resource value: 0x7F090174
-			public const int hdl_pickerview_ll = 2131296628;
+			public const int honorRequest = 2131296628;
 			
 			// aapt resource value: 0x7F090175
-			public const int header_title = 2131296629;
+			public const int horizontal_only = 2131296629;
 			
 			// aapt resource value: 0x7F090176
-			public const int help_link = 2131296630;
+			public const int hour = 2131296630;
 			
 			// aapt resource value: 0x7F090177
-			public const int help_tip = 2131296631;
+			public const int hour_24 = 2131296631;
 			
 			// aapt resource value: 0x7F090178
-			public const int hidden = 2131296632;
+			public const int hour_48 = 2131296632;
 			
 			// aapt resource value: 0x7F090179
-			public const int hide = 2131296633;
-			
-			// aapt resource value: 0x7F09017B
-			public const int hideable = 2131296635;
+			public const int icon = 2131296633;
 			
 			// aapt resource value: 0x7F09017A
-			public const int hide_ime_id = 2131296634;
+			public const int icon_group = 2131296634;
+			
+			// aapt resource value: 0x7F09017B
+			public const int icon_sceenshotImg = 2131296635;
 			
 			// aapt resource value: 0x7F09017C
-			public const int home = 2131296636;
+			public const int icon_sceenshotLayout = 2131296636;
 			
 			// aapt resource value: 0x7F09017D
-			public const int homeAsUp = 2131296637;
+			public const int icon_sceenshotText = 2131296637;
 			
 			// aapt resource value: 0x7F09017E
-			public const int honorRequest = 2131296638;
+			public const int icon_unlockImg = 2131296638;
 			
 			// aapt resource value: 0x7F09017F
-			public const int horizontal_only = 2131296639;
+			public const int icon_unlockLayout = 2131296639;
 			
 			// aapt resource value: 0x7F090180
-			public const int hour = 2131296640;
+			public const int icon_unlockText = 2131296640;
 			
 			// aapt resource value: 0x7F090181
-			public const int hour_24 = 2131296641;
+			public const int id_top = 2131296641;
 			
 			// aapt resource value: 0x7F090182
-			public const int hour_48 = 2131296642;
+			public const int ifRoom = 2131296642;
 			
 			// aapt resource value: 0x7F090183
-			public const int icon = 2131296643;
+			public const int ignore = 2131296643;
 			
 			// aapt resource value: 0x7F090184
-			public const int icon_group = 2131296644;
+			public const int ignoreRequest = 2131296644;
 			
 			// aapt resource value: 0x7F090185
-			public const int icon_sceenshotImg = 2131296645;
+			public const int image = 2131296645;
 			
 			// aapt resource value: 0x7F090186
-			public const int icon_sceenshotLayout = 2131296646;
+			public const int img_iv = 2131296646;
 			
 			// aapt resource value: 0x7F090187
-			public const int icon_sceenshotText = 2131296647;
+			public const int immediateStop = 2131296647;
 			
 			// aapt resource value: 0x7F090188
-			public const int icon_unlockImg = 2131296648;
+			public const int included = 2131296648;
 			
 			// aapt resource value: 0x7F090189
-			public const int icon_unlockLayout = 2131296649;
+			public const int indeterminate = 2131296649;
 			
 			// aapt resource value: 0x7F09018A
-			public const int icon_unlockText = 2131296650;
+			public const int info = 2131296650;
 			
 			// aapt resource value: 0x7F09018B
-			public const int id_top = 2131296651;
+			public const int input_search_query = 2131296651;
 			
 			// aapt resource value: 0x7F09018C
-			public const int ifRoom = 2131296652;
+			public const int invisible = 2131296652;
 			
 			// aapt resource value: 0x7F09018D
-			public const int ignore = 2131296653;
+			public const int inward = 2131296653;
 			
 			// aapt resource value: 0x7F09018E
-			public const int ignoreRequest = 2131296654;
+			public const int is_pooling_container_tag = 2131296654;
 			
 			// aapt resource value: 0x7F09018F
-			public const int image = 2131296655;
+			public const int italic = 2131296655;
 			
 			// aapt resource value: 0x7F090190
-			public const int imgRichpushBtnBack = 2131296656;
+			public const int item_touch_helper_previous_elevation = 2131296656;
 			
 			// aapt resource value: 0x7F090191
-			public const int imgView = 2131296657;
+			public const int iv_ap_img = 2131296657;
 			
 			// aapt resource value: 0x7F090192
-			public const int img_iv = 2131296658;
+			public const int iv_back = 2131296658;
 			
 			// aapt resource value: 0x7F090193
-			public const int immediateStop = 2131296659;
+			public const int iv_bg = 2131296659;
 			
 			// aapt resource value: 0x7F090194
-			public const int included = 2131296660;
+			public const int iv_change_screen = 2131296660;
 			
 			// aapt resource value: 0x7F090195
-			public const int indeterminate = 2131296661;
+			public const int iv_check = 2131296661;
 			
 			// aapt resource value: 0x7F090196
-			public const int info = 2131296662;
+			public const int iv_choose_other = 2131296662;
 			
 			// aapt resource value: 0x7F090197
-			public const int input_search_query = 2131296663;
+			public const int iv_cloudStage = 2131296663;
 			
 			// aapt resource value: 0x7F090198
-			public const int invisible = 2131296664;
+			public const int iv_cloudStage1 = 2131296664;
 			
 			// aapt resource value: 0x7F090199
-			public const int inward = 2131296665;
+			public const int iv_copy = 2131296665;
 			
 			// aapt resource value: 0x7F09019A
-			public const int is_pooling_container_tag = 2131296666;
+			public const int iv_day_next = 2131296666;
 			
 			// aapt resource value: 0x7F09019B
-			public const int italic = 2131296667;
+			public const int iv_day_pre = 2131296667;
 			
 			// aapt resource value: 0x7F09019C
-			public const int item_touch_helper_previous_elevation = 2131296668;
+			public const int iv_detail = 2131296668;
 			
 			// aapt resource value: 0x7F09019D
-			public const int iv_ap_img = 2131296669;
+			public const int iv_device_pic = 2131296669;
 			
 			// aapt resource value: 0x7F09019E
-			public const int iv_back = 2131296670;
+			public const int iv_direction_limit_down = 2131296670;
 			
 			// aapt resource value: 0x7F09019F
-			public const int iv_bg = 2131296671;
+			public const int iv_direction_limit_left = 2131296671;
 			
 			// aapt resource value: 0x7F0901A0
-			public const int iv_change_screen = 2131296672;
+			public const int iv_direction_limit_right = 2131296672;
 			
 			// aapt resource value: 0x7F0901A1
-			public const int iv_check = 2131296673;
+			public const int iv_direction_limit_up = 2131296673;
 			
 			// aapt resource value: 0x7F0901A2
-			public const int iv_choose_other = 2131296674;
+			public const int iv_icon = 2131296674;
 			
 			// aapt resource value: 0x7F0901A3
-			public const int iv_cloudStage = 2131296675;
+			public const int iv_img = 2131296675;
 			
 			// aapt resource value: 0x7F0901A4
-			public const int iv_cloudStage1 = 2131296676;
+			public const int iv_lp_answer = 2131296676;
 			
 			// aapt resource value: 0x7F0901A5
-			public const int iv_copy = 2131296677;
+			public const int iv_lp_hangUp = 2131296677;
 			
 			// aapt resource value: 0x7F0901A6
-			public const int iv_day_next = 2131296678;
+			public const int iv_lp_screenshot = 2131296678;
 			
 			// aapt resource value: 0x7F0901A7
-			public const int iv_day_pre = 2131296679;
+			public const int iv_lp_unlock = 2131296679;
 			
 			// aapt resource value: 0x7F0901A8
-			public const int iv_detail = 2131296680;
+			public const int iv_move_check = 2131296680;
 			
 			// aapt resource value: 0x7F0901A9
-			public const int iv_device_pic = 2131296681;
+			public const int iv_name_next = 2131296681;
 			
 			// aapt resource value: 0x7F0901AA
-			public const int iv_direction_limit_down = 2131296682;
+			public const int iv_no_device = 2131296682;
 			
 			// aapt resource value: 0x7F0901AB
-			public const int iv_direction_limit_left = 2131296683;
+			public const int iv_paly_pause = 2131296683;
 			
 			// aapt resource value: 0x7F0901AC
-			public const int iv_direction_limit_right = 2131296684;
+			public const int iv_play = 2131296684;
 			
 			// aapt resource value: 0x7F0901AD
-			public const int iv_direction_limit_up = 2131296685;
+			public const int iv_play_style = 2131296685;
 			
 			// aapt resource value: 0x7F0901AE
-			public const int iv_icon = 2131296686;
+			public const int iv_screen_shot = 2131296686;
 			
 			// aapt resource value: 0x7F0901AF
-			public const int iv_img = 2131296687;
+			public const int iv_screen_shot1 = 2131296687;
 			
 			// aapt resource value: 0x7F0901B0
-			public const int iv_lp_answer = 2131296688;
+			public const int iv_self_input = 2131296688;
 			
 			// aapt resource value: 0x7F0901B1
-			public const int iv_lp_hangUp = 2131296689;
+			public const int iv_sound = 2131296689;
 			
 			// aapt resource value: 0x7F0901B2
-			public const int iv_lp_screenshot = 2131296690;
+			public const int iv_speak = 2131296690;
 			
 			// aapt resource value: 0x7F0901B3
-			public const int iv_lp_unlock = 2131296691;
+			public const int iv_speak1 = 2131296691;
 			
 			// aapt resource value: 0x7F0901B4
-			public const int iv_move_check = 2131296692;
+			public const int iv_video = 2131296692;
 			
 			// aapt resource value: 0x7F0901B5
-			public const int iv_name_next = 2131296693;
+			public const int iv_video1 = 2131296693;
 			
 			// aapt resource value: 0x7F0901B6
-			public const int iv_no_device = 2131296694;
+			public const int iv_wifi = 2131296694;
 			
 			// aapt resource value: 0x7F0901B7
-			public const int iv_paly_pause = 2131296695;
+			public const int jumpToEnd = 2131296695;
 			
 			// aapt resource value: 0x7F0901B8
-			public const int iv_play = 2131296696;
+			public const int jumpToStart = 2131296696;
 			
 			// aapt resource value: 0x7F0901B9
-			public const int iv_play_style = 2131296697;
-			
-			// aapt resource value: 0x7F0901BA
-			public const int iv_screen_shot = 2131296698;
+			public const int labeled = 2131296697;
 			
 			// aapt resource value: 0x7F0901BB
-			public const int iv_screen_shot1 = 2131296699;
+			public const int layout = 2131296699;
 			
 			// aapt resource value: 0x7F0901BC
-			public const int iv_self_input = 2131296700;
+			public const int layout_password = 2131296700;
 			
 			// aapt resource value: 0x7F0901BD
-			public const int iv_sound = 2131296701;
+			public const int layout_wifi_pwd = 2131296701;
+			
+			// aapt resource value: 0x7F0901BA
+			public const int lay_down = 2131296698;
 			
 			// aapt resource value: 0x7F0901BE
-			public const int iv_speak = 2131296702;
+			public const int left = 2131296702;
 			
 			// aapt resource value: 0x7F0901BF
-			public const int iv_speak1 = 2131296703;
+			public const int leftToRight = 2131296703;
 			
 			// aapt resource value: 0x7F0901C0
-			public const int iv_video = 2131296704;
+			public const int legacy = 2131296704;
 			
 			// aapt resource value: 0x7F0901C1
-			public const int iv_video1 = 2131296705;
+			public const int line1 = 2131296705;
 			
 			// aapt resource value: 0x7F0901C2
-			public const int iv_wifi = 2131296706;
+			public const int line3 = 2131296706;
 			
 			// aapt resource value: 0x7F0901C3
-			public const int jad_action = 2131296707;
+			public const int linear = 2131296707;
 			
 			// aapt resource value: 0x7F0901C4
-			public const int jad_desc = 2131296708;
+			public const int listMode = 2131296708;
 			
 			// aapt resource value: 0x7F0901C5
-			public const int jad_download_size = 2131296709;
+			public const int list_item = 2131296709;
 			
 			// aapt resource value: 0x7F0901C6
-			public const int jad_download_status = 2131296710;
+			public const int live_window = 2131296710;
 			
 			// aapt resource value: 0x7F0901C7
-			public const int jad_download_success = 2131296711;
+			public const int ll_add = 2131296711;
 			
 			// aapt resource value: 0x7F0901C8
-			public const int jad_download_success_status = 2131296712;
+			public const int ll_alarm_p_bg_name = 2131296712;
 			
 			// aapt resource value: 0x7F0901C9
-			public const int jad_download_text = 2131296713;
+			public const int ll_all = 2131296713;
 			
 			// aapt resource value: 0x7F0901CA
-			public const int jad_icon = 2131296714;
+			public const int ll_back = 2131296714;
 			
 			// aapt resource value: 0x7F0901CB
-			public const int jad_root_view = 2131296715;
+			public const int ll_choose_other = 2131296715;
 			
 			// aapt resource value: 0x7F0901CC
-			public const int jumpToEnd = 2131296716;
+			public const int ll_cloudstage = 2131296716;
 			
 			// aapt resource value: 0x7F0901CD
-			public const int jumpToStart = 2131296717;
+			public const int ll_cloudstage1 = 2131296717;
 			
 			// aapt resource value: 0x7F0901CE
-			public const int labeled = 2131296718;
-			
-			// aapt resource value: 0x7F0901D0
-			public const int layout = 2131296720;
-			
-			// aapt resource value: 0x7F0901D1
-			public const int layout_password = 2131296721;
-			
-			// aapt resource value: 0x7F0901D2
-			public const int layout_version_2 = 2131296722;
-			
-			// aapt resource value: 0x7F0901D3
-			public const int layout_wifi_pwd = 2131296723;
+			public const int ll_controller = 2131296718;
 			
 			// aapt resource value: 0x7F0901CF
-			public const int lay_down = 2131296719;
+			public const int ll_delete = 2131296719;
+			
+			// aapt resource value: 0x7F0901D0
+			public const int ll_detail = 2131296720;
+			
+			// aapt resource value: 0x7F0901D1
+			public const int ll_edit = 2131296721;
+			
+			// aapt resource value: 0x7F0901D2
+			public const int ll_fullscreen = 2131296722;
+			
+			// aapt resource value: 0x7F0901D3
+			public const int ll_help = 2131296723;
 			
 			// aapt resource value: 0x7F0901D4
-			public const int left = 2131296724;
+			public const int ll_input = 2131296724;
 			
 			// aapt resource value: 0x7F0901D5
-			public const int leftToRight = 2131296725;
+			public const int ll_lp_btn_back = 2131296725;
 			
 			// aapt resource value: 0x7F0901D6
-			public const int legacy = 2131296726;
+			public const int ll_new_version = 2131296726;
 			
 			// aapt resource value: 0x7F0901D7
-			public const int line1 = 2131296727;
+			public const int ll_operate = 2131296727;
 			
 			// aapt resource value: 0x7F0901D8
-			public const int line3 = 2131296728;
+			public const int ll_paly_pause = 2131296728;
 			
 			// aapt resource value: 0x7F0901D9
-			public const int linear = 2131296729;
+			public const int ll_play_style = 2131296729;
 			
 			// aapt resource value: 0x7F0901DA
-			public const int listMode = 2131296730;
+			public const int ll_screenshot = 2131296730;
 			
 			// aapt resource value: 0x7F0901DB
-			public const int list_item = 2131296731;
+			public const int ll_screenshot1 = 2131296731;
 			
 			// aapt resource value: 0x7F0901DC
-			public const int live_window = 2131296732;
+			public const int ll_self_input = 2131296732;
 			
 			// aapt resource value: 0x7F0901DD
-			public const int ll_add = 2131296733;
+			public const int ll_sound = 2131296733;
 			
 			// aapt resource value: 0x7F0901DE
-			public const int ll_alarm_p_bg_name = 2131296734;
+			public const int ll_speak = 2131296734;
 			
 			// aapt resource value: 0x7F0901DF
-			public const int ll_all = 2131296735;
+			public const int ll_speak1 = 2131296735;
 			
 			// aapt resource value: 0x7F0901E0
-			public const int ll_back = 2131296736;
+			public const int ll_switch_btn = 2131296736;
 			
 			// aapt resource value: 0x7F0901E1
-			public const int ll_choose_other = 2131296737;
+			public const int ll_title_center = 2131296737;
 			
 			// aapt resource value: 0x7F0901E2
-			public const int ll_cloudstage = 2131296738;
+			public const int ll_title_left = 2131296738;
 			
 			// aapt resource value: 0x7F0901E3
-			public const int ll_cloudstage1 = 2131296739;
+			public const int ll_title_left2 = 2131296739;
 			
 			// aapt resource value: 0x7F0901E4
-			public const int ll_controller = 2131296740;
+			public const int ll_title_right = 2131296740;
 			
 			// aapt resource value: 0x7F0901E5
-			public const int ll_delete = 2131296741;
+			public const int ll_title_right2 = 2131296741;
 			
 			// aapt resource value: 0x7F0901E6
-			public const int ll_detail = 2131296742;
+			public const int ll_video = 2131296742;
 			
 			// aapt resource value: 0x7F0901E7
-			public const int ll_edit = 2131296743;
+			public const int ll_video1 = 2131296743;
 			
 			// aapt resource value: 0x7F0901E8
-			public const int ll_fullscreen = 2131296744;
+			public const int ll_video_content = 2131296744;
 			
 			// aapt resource value: 0x7F0901E9
-			public const int ll_help = 2131296745;
+			public const int ll_video_lp_rendering = 2131296745;
 			
 			// aapt resource value: 0x7F0901EA
-			public const int ll_input = 2131296746;
-			
-			// aapt resource value: 0x7F0901EB
-			public const int ll_lp_btn_back = 2131296747;
+			public const int loading_pb = 2131296746;
 			
 			// aapt resource value: 0x7F0901EC
-			public const int ll_new_version = 2131296748;
-			
-			// aapt resource value: 0x7F0901ED
-			public const int ll_operate = 2131296749;
+			public const int localDoorUnlock = 2131296748;
 			
 			// aapt resource value: 0x7F0901EE
-			public const int ll_paly_pause = 2131296750;
+			public const int locale = 2131296750;
+			
+			// aapt resource value: 0x7F0901ED
+			public const int localVideo = 2131296749;
+			
+			// aapt resource value: 0x7F0901EB
+			public const int locaVideo = 2131296747;
 			
 			// aapt resource value: 0x7F0901EF
-			public const int ll_play_style = 2131296751;
+			public const int login_login = 2131296751;
 			
 			// aapt resource value: 0x7F0901F0
-			public const int ll_screenshot = 2131296752;
+			public const int login_regesiter = 2131296752;
 			
 			// aapt resource value: 0x7F0901F1
-			public const int ll_screenshot1 = 2131296753;
-			
-			// aapt resource value: 0x7F0901F2
-			public const int ll_self_input = 2131296754;
-			
-			// aapt resource value: 0x7F0901F3
-			public const int ll_sound = 2131296755;
-			
-			// aapt resource value: 0x7F0901F4
-			public const int ll_speak = 2131296756;
-			
-			// aapt resource value: 0x7F0901F5
-			public const int ll_speak1 = 2131296757;
+			public const int login_username = 2131296753;
 			
 			// aapt resource value: 0x7F0901F6
-			public const int ll_switch_btn = 2131296758;
+			public const int lpsdk_dialog_cancel_tv = 2131296758;
 			
 			// aapt resource value: 0x7F0901F7
-			public const int ll_title_center = 2131296759;
+			public const int lpsdk_dialog_confirm_tv = 2131296759;
 			
 			// aapt resource value: 0x7F0901F8
-			public const int ll_title_left = 2131296760;
+			public const int lpsdk_dialog_content_tv = 2131296760;
 			
 			// aapt resource value: 0x7F0901F9
-			public const int ll_title_left2 = 2131296761;
+			public const int lpsdk_dialog_title_tv = 2131296761;
+			
+			// aapt resource value: 0x7F0901F2
+			public const int lp_dialog_cancel_tv = 2131296754;
+			
+			// aapt resource value: 0x7F0901F3
+			public const int lp_dialog_confirm_tv = 2131296755;
+			
+			// aapt resource value: 0x7F0901F4
+			public const int lp_dialog_data_picker = 2131296756;
+			
+			// aapt resource value: 0x7F0901F5
+			public const int lp_dialog_time_picker = 2131296757;
 			
 			// aapt resource value: 0x7F0901FA
-			public const int ll_title_right = 2131296762;
+			public const int ltr = 2131296762;
 			
 			// aapt resource value: 0x7F0901FB
-			public const int ll_title_right2 = 2131296763;
+			public const int m3_side_sheet = 2131296763;
 			
 			// aapt resource value: 0x7F0901FC
-			public const int ll_video = 2131296764;
+			public const int manualOnly = 2131296764;
 			
 			// aapt resource value: 0x7F0901FD
-			public const int ll_video1 = 2131296765;
+			public const int marquee = 2131296765;
 			
 			// aapt resource value: 0x7F0901FE
-			public const int ll_video_content = 2131296766;
-			
-			// aapt resource value: 0x7F0901FF
-			public const int ll_video_lp_rendering = 2131296767;
-			
-			// aapt resource value: 0x7F090200
-			public const int loading_pb = 2131296768;
-			
-			// aapt resource value: 0x7F090202
-			public const int localDoorUnlock = 2131296770;
-			
-			// aapt resource value: 0x7F090204
-			public const int locale = 2131296772;
-			
-			// aapt resource value: 0x7F090203
-			public const int localVideo = 2131296771;
-			
-			// aapt resource value: 0x7F090201
-			public const int locaVideo = 2131296769;
-			
-			// aapt resource value: 0x7F090205
-			public const int login_login = 2131296773;
-			
-			// aapt resource value: 0x7F090206
-			public const int login_regesiter = 2131296774;
-			
-			// aapt resource value: 0x7F090207
-			public const int login_username = 2131296775;
-			
-			// aapt resource value: 0x7F09020C
-			public const int lpsdk_dialog_cancel_tv = 2131296780;
-			
-			// aapt resource value: 0x7F09020D
-			public const int lpsdk_dialog_confirm_tv = 2131296781;
-			
-			// aapt resource value: 0x7F09020E
-			public const int lpsdk_dialog_content_tv = 2131296782;
-			
-			// aapt resource value: 0x7F09020F
-			public const int lpsdk_dialog_title_tv = 2131296783;
-			
-			// aapt resource value: 0x7F090208
-			public const int lp_dialog_cancel_tv = 2131296776;
-			
-			// aapt resource value: 0x7F090209
-			public const int lp_dialog_confirm_tv = 2131296777;
-			
-			// aapt resource value: 0x7F09020A
-			public const int lp_dialog_data_picker = 2131296778;
-			
-			// aapt resource value: 0x7F09020B
-			public const int lp_dialog_time_picker = 2131296779;
-			
-			// aapt resource value: 0x7F090210
-			public const int ltr = 2131296784;
-			
-			// aapt resource value: 0x7F090211
-			public const int m3_side_sheet = 2131296785;
-			
-			// aapt resource value: 0x7F090212
-			public const int manualOnly = 2131296786;
-			
-			// aapt resource value: 0x7F090213
-			public const int marquee = 2131296787;
-			
-			// aapt resource value: 0x7F090214
-			public const int masked = 2131296788;
+			public const int masked = 2131296766;
 			
 			// aapt resource value: 0x7F09000A
 			public const int MatchLayout = 2131296266;
 			
+			// aapt resource value: 0x7F0901FF
+			public const int match_constraint = 2131296767;
+			
+			// aapt resource value: 0x7F090200
+			public const int match_parent = 2131296768;
+			
+			// aapt resource value: 0x7F090201
+			public const int material_clock_display = 2131296769;
+			
+			// aapt resource value: 0x7F090202
+			public const int material_clock_display_and_toggle = 2131296770;
+			
+			// aapt resource value: 0x7F090203
+			public const int material_clock_face = 2131296771;
+			
+			// aapt resource value: 0x7F090204
+			public const int material_clock_hand = 2131296772;
+			
+			// aapt resource value: 0x7F090205
+			public const int material_clock_level = 2131296773;
+			
+			// aapt resource value: 0x7F090206
+			public const int material_clock_period_am_button = 2131296774;
+			
+			// aapt resource value: 0x7F090207
+			public const int material_clock_period_pm_button = 2131296775;
+			
+			// aapt resource value: 0x7F090208
+			public const int material_clock_period_toggle = 2131296776;
+			
+			// aapt resource value: 0x7F090209
+			public const int material_hour_text_input = 2131296777;
+			
+			// aapt resource value: 0x7F09020A
+			public const int material_hour_tv = 2131296778;
+			
+			// aapt resource value: 0x7F09020B
+			public const int material_label = 2131296779;
+			
+			// aapt resource value: 0x7F09020C
+			public const int material_minute_text_input = 2131296780;
+			
+			// aapt resource value: 0x7F09020D
+			public const int material_minute_tv = 2131296781;
+			
+			// aapt resource value: 0x7F09020E
+			public const int material_textinput_timepicker = 2131296782;
+			
+			// aapt resource value: 0x7F09020F
+			public const int material_timepicker_cancel_button = 2131296783;
+			
+			// aapt resource value: 0x7F090210
+			public const int material_timepicker_container = 2131296784;
+			
+			// aapt resource value: 0x7F090211
+			public const int material_timepicker_mode_button = 2131296785;
+			
+			// aapt resource value: 0x7F090212
+			public const int material_timepicker_ok_button = 2131296786;
+			
+			// aapt resource value: 0x7F090213
+			public const int material_timepicker_view = 2131296787;
+			
+			// aapt resource value: 0x7F090214
+			public const int material_value_index = 2131296788;
+			
 			// aapt resource value: 0x7F090215
-			public const int match_constraint = 2131296789;
+			public const int matrix = 2131296789;
 			
 			// aapt resource value: 0x7F090216
-			public const int match_parent = 2131296790;
+			public const int media_actions = 2131296790;
 			
 			// aapt resource value: 0x7F090217
-			public const int material_clock_display = 2131296791;
+			public const int media_controller_compat_view_tag = 2131296791;
 			
 			// aapt resource value: 0x7F090218
-			public const int material_clock_display_and_toggle = 2131296792;
-			
-			// aapt resource value: 0x7F090219
-			public const int material_clock_face = 2131296793;
-			
-			// aapt resource value: 0x7F09021A
-			public const int material_clock_hand = 2131296794;
-			
-			// aapt resource value: 0x7F09021B
-			public const int material_clock_level = 2131296795;
-			
-			// aapt resource value: 0x7F09021C
-			public const int material_clock_period_am_button = 2131296796;
-			
-			// aapt resource value: 0x7F09021D
-			public const int material_clock_period_pm_button = 2131296797;
-			
-			// aapt resource value: 0x7F09021E
-			public const int material_clock_period_toggle = 2131296798;
-			
-			// aapt resource value: 0x7F09021F
-			public const int material_hour_text_input = 2131296799;
-			
-			// aapt resource value: 0x7F090220
-			public const int material_hour_tv = 2131296800;
-			
-			// aapt resource value: 0x7F090221
-			public const int material_label = 2131296801;
-			
-			// aapt resource value: 0x7F090222
-			public const int material_minute_text_input = 2131296802;
-			
-			// aapt resource value: 0x7F090223
-			public const int material_minute_tv = 2131296803;
-			
-			// aapt resource value: 0x7F090224
-			public const int material_textinput_timepicker = 2131296804;
-			
-			// aapt resource value: 0x7F090225
-			public const int material_timepicker_cancel_button = 2131296805;
-			
-			// aapt resource value: 0x7F090226
-			public const int material_timepicker_container = 2131296806;
-			
-			// aapt resource value: 0x7F090227
-			public const int material_timepicker_mode_button = 2131296807;
-			
-			// aapt resource value: 0x7F090228
-			public const int material_timepicker_ok_button = 2131296808;
-			
-			// aapt resource value: 0x7F090229
-			public const int material_timepicker_view = 2131296809;
-			
-			// aapt resource value: 0x7F09022A
-			public const int material_value_index = 2131296810;
-			
-			// aapt resource value: 0x7F09022B
-			public const int matrix = 2131296811;
-			
-			// aapt resource value: 0x7F09022C
-			public const int media_actions = 2131296812;
-			
-			// aapt resource value: 0x7F09022D
-			public const int media_controller_compat_view_tag = 2131296813;
-			
-			// aapt resource value: 0x7F09022E
-			public const int message = 2131296814;
+			public const int message = 2131296792;
 			
 			// aapt resource value: 0x7F090009
 			public const int META = 2131296265;
 			
+			// aapt resource value: 0x7F090219
+			public const int middle = 2131296793;
+			
+			// aapt resource value: 0x7F09021A
+			public const int min = 2131296794;
+			
+			// aapt resource value: 0x7F09021B
+			public const int mini = 2131296795;
+			
+			// aapt resource value: 0x7F09021C
+			public const int monitor = 2131296796;
+			
+			// aapt resource value: 0x7F09021D
+			public const int month = 2131296797;
+			
+			// aapt resource value: 0x7F09021E
+			public const int month_grid = 2131296798;
+			
+			// aapt resource value: 0x7F09021F
+			public const int month_navigation_bar = 2131296799;
+			
+			// aapt resource value: 0x7F090220
+			public const int month_navigation_fragment_toggle = 2131296800;
+			
+			// aapt resource value: 0x7F090221
+			public const int month_navigation_next = 2131296801;
+			
+			// aapt resource value: 0x7F090222
+			public const int month_navigation_previous = 2131296802;
+			
+			// aapt resource value: 0x7F090223
+			public const int month_title = 2131296803;
+			
+			// aapt resource value: 0x7F090224
+			public const int motion_base = 2131296804;
+			
+			// aapt resource value: 0x7F090225
+			public const int msg_content_tv = 2131296805;
+			
+			// aapt resource value: 0x7F090226
+			public const int mtrl_anchor_parent = 2131296806;
+			
+			// aapt resource value: 0x7F090228
+			public const int mtrl_calendar_days_of_week = 2131296808;
+			
+			// aapt resource value: 0x7F090227
+			public const int mtrl_calendar_day_selector_frame = 2131296807;
+			
+			// aapt resource value: 0x7F090229
+			public const int mtrl_calendar_frame = 2131296809;
+			
+			// aapt resource value: 0x7F09022A
+			public const int mtrl_calendar_main_pane = 2131296810;
+			
+			// aapt resource value: 0x7F09022B
+			public const int mtrl_calendar_months = 2131296811;
+			
+			// aapt resource value: 0x7F09022C
+			public const int mtrl_calendar_selection_frame = 2131296812;
+			
+			// aapt resource value: 0x7F09022D
+			public const int mtrl_calendar_text_input_frame = 2131296813;
+			
+			// aapt resource value: 0x7F09022E
+			public const int mtrl_calendar_year_selector_frame = 2131296814;
+			
 			// aapt resource value: 0x7F09022F
-			public const int middle = 2131296815;
+			public const int mtrl_card_checked_layer_id = 2131296815;
 			
 			// aapt resource value: 0x7F090230
-			public const int min = 2131296816;
+			public const int mtrl_child_content_container = 2131296816;
 			
 			// aapt resource value: 0x7F090231
-			public const int mini = 2131296817;
+			public const int mtrl_internal_children_alpha_tag = 2131296817;
 			
 			// aapt resource value: 0x7F090232
-			public const int monitor = 2131296818;
+			public const int mtrl_motion_snapshot_view = 2131296818;
 			
 			// aapt resource value: 0x7F090233
-			public const int month = 2131296819;
+			public const int mtrl_picker_fullscreen = 2131296819;
 			
 			// aapt resource value: 0x7F090234
-			public const int month_grid = 2131296820;
+			public const int mtrl_picker_header = 2131296820;
 			
 			// aapt resource value: 0x7F090235
-			public const int month_navigation_bar = 2131296821;
+			public const int mtrl_picker_header_selection_text = 2131296821;
 			
 			// aapt resource value: 0x7F090236
-			public const int month_navigation_fragment_toggle = 2131296822;
+			public const int mtrl_picker_header_title_and_selection = 2131296822;
 			
 			// aapt resource value: 0x7F090237
-			public const int month_navigation_next = 2131296823;
+			public const int mtrl_picker_header_toggle = 2131296823;
 			
 			// aapt resource value: 0x7F090238
-			public const int month_navigation_previous = 2131296824;
+			public const int mtrl_picker_text_input_date = 2131296824;
 			
 			// aapt resource value: 0x7F090239
-			public const int month_title = 2131296825;
+			public const int mtrl_picker_text_input_range_end = 2131296825;
 			
 			// aapt resource value: 0x7F09023A
-			public const int motion_base = 2131296826;
+			public const int mtrl_picker_text_input_range_start = 2131296826;
 			
 			// aapt resource value: 0x7F09023B
-			public const int msg_content_tv = 2131296827;
+			public const int mtrl_picker_title_text = 2131296827;
 			
 			// aapt resource value: 0x7F09023C
-			public const int mtrl_anchor_parent = 2131296828;
-			
-			// aapt resource value: 0x7F09023E
-			public const int mtrl_calendar_days_of_week = 2131296830;
+			public const int mtrl_view_tag_bottom_padding = 2131296828;
 			
 			// aapt resource value: 0x7F09023D
-			public const int mtrl_calendar_day_selector_frame = 2131296829;
+			public const int multiply = 2131296829;
+			
+			// aapt resource value: 0x7F09023E
+			public const int nameText = 2131296830;
 			
 			// aapt resource value: 0x7F09023F
-			public const int mtrl_calendar_frame = 2131296831;
+			public const int name_tv = 2131296831;
 			
 			// aapt resource value: 0x7F090240
-			public const int mtrl_calendar_main_pane = 2131296832;
+			public const int navigation_bar_item_active_indicator_view = 2131296832;
 			
 			// aapt resource value: 0x7F090241
-			public const int mtrl_calendar_months = 2131296833;
+			public const int navigation_bar_item_icon_container = 2131296833;
 			
 			// aapt resource value: 0x7F090242
-			public const int mtrl_calendar_selection_frame = 2131296834;
+			public const int navigation_bar_item_icon_view = 2131296834;
 			
 			// aapt resource value: 0x7F090243
-			public const int mtrl_calendar_text_input_frame = 2131296835;
+			public const int navigation_bar_item_labels_group = 2131296835;
 			
 			// aapt resource value: 0x7F090244
-			public const int mtrl_calendar_year_selector_frame = 2131296836;
+			public const int navigation_bar_item_large_label_view = 2131296836;
 			
 			// aapt resource value: 0x7F090245
-			public const int mtrl_card_checked_layer_id = 2131296837;
+			public const int navigation_bar_item_small_label_view = 2131296837;
 			
 			// aapt resource value: 0x7F090246
-			public const int mtrl_child_content_container = 2131296838;
+			public const int navigation_header_container = 2131296838;
 			
 			// aapt resource value: 0x7F090247
-			public const int mtrl_internal_children_alpha_tag = 2131296839;
+			public const int never = 2131296839;
 			
 			// aapt resource value: 0x7F090248
-			public const int mtrl_motion_snapshot_view = 2131296840;
+			public const int neverCompleteToEnd = 2131296840;
 			
 			// aapt resource value: 0x7F090249
-			public const int mtrl_picker_fullscreen = 2131296841;
+			public const int neverCompleteToStart = 2131296841;
 			
 			// aapt resource value: 0x7F09024A
-			public const int mtrl_picker_header = 2131296842;
+			public const int next = 2131296842;
 			
 			// aapt resource value: 0x7F09024B
-			public const int mtrl_picker_header_selection_text = 2131296843;
-			
-			// aapt resource value: 0x7F09024C
-			public const int mtrl_picker_header_title_and_selection = 2131296844;
-			
-			// aapt resource value: 0x7F09024D
-			public const int mtrl_picker_header_toggle = 2131296845;
+			public const int next_btn = 2131296843;
 			
 			// aapt resource value: 0x7F09024E
-			public const int mtrl_picker_text_input_date = 2131296846;
+			public const int none = 2131296846;
 			
 			// aapt resource value: 0x7F09024F
-			public const int mtrl_picker_text_input_range_end = 2131296847;
+			public const int normal = 2131296847;
 			
 			// aapt resource value: 0x7F090250
-			public const int mtrl_picker_text_input_range_start = 2131296848;
+			public const int north = 2131296848;
 			
-			// aapt resource value: 0x7F090251
-			public const int mtrl_picker_title_text = 2131296849;
+			// aapt resource value: 0x7F09024C
+			public const int noScroll = 2131296844;
+			
+			// aapt resource value: 0x7F09024D
+			public const int noState = 2131296845;
 			
 			// aapt resource value: 0x7F090252
-			public const int mtrl_view_tag_bottom_padding = 2131296850;
+			public const int notification_background = 2131296850;
 			
 			// aapt resource value: 0x7F090253
-			public const int multiply = 2131296851;
+			public const int notification_main_column = 2131296851;
 			
 			// aapt resource value: 0x7F090254
-			public const int nameText = 2131296852;
+			public const int notification_main_column_container = 2131296852;
 			
-			// aapt resource value: 0x7F090255
-			public const int name_tv = 2131296853;
-			
-			// aapt resource value: 0x7F090256
-			public const int navigation_bar_item_active_indicator_view = 2131296854;
-			
-			// aapt resource value: 0x7F090257
-			public const int navigation_bar_item_icon_container = 2131296855;
-			
-			// aapt resource value: 0x7F090258
-			public const int navigation_bar_item_icon_view = 2131296856;
-			
-			// aapt resource value: 0x7F090259
-			public const int navigation_bar_item_labels_group = 2131296857;
-			
-			// aapt resource value: 0x7F09025A
-			public const int navigation_bar_item_large_label_view = 2131296858;
-			
-			// aapt resource value: 0x7F09025B
-			public const int navigation_bar_item_small_label_view = 2131296859;
-			
-			// aapt resource value: 0x7F09025C
-			public const int navigation_header_container = 2131296860;
-			
-			// aapt resource value: 0x7F09025D
-			public const int never = 2131296861;
-			
-			// aapt resource value: 0x7F09025E
-			public const int neverCompleteToEnd = 2131296862;
-			
-			// aapt resource value: 0x7F09025F
-			public const int neverCompleteToStart = 2131296863;
-			
-			// aapt resource value: 0x7F090260
-			public const int next = 2131296864;
-			
-			// aapt resource value: 0x7F090261
-			public const int next_btn = 2131296865;
-			
-			// aapt resource value: 0x7F090264
-			public const int none = 2131296868;
-			
-			// aapt resource value: 0x7F090265
-			public const int normal = 2131296869;
-			
-			// aapt resource value: 0x7F090266
-			public const int north = 2131296870;
-			
-			// aapt resource value: 0x7F090262
-			public const int noScroll = 2131296866;
-			
-			// aapt resource value: 0x7F090263
-			public const int noState = 2131296867;
-			
-			// aapt resource value: 0x7F090268
-			public const int notification_background = 2131296872;
-			
-			// aapt resource value: 0x7F090269
-			public const int notification_main_column = 2131296873;
-			
-			// aapt resource value: 0x7F09026A
-			public const int notification_main_column_container = 2131296874;
-			
-			// aapt resource value: 0x7F090267
-			public const int not_show = 2131296871;
+			// aapt resource value: 0x7F090251
+			public const int not_show = 2131296849;
 			
 			// aapt resource value: 0x7F09000B
 			public const int NO_DEBUG = 2131296267;
 			
+			// aapt resource value: 0x7F090255
+			public const int off = 2131296853;
+			
+			// aapt resource value: 0x7F090256
+			public const int on = 2131296854;
+			
+			// aapt resource value: 0x7F090257
+			public const int onInterceptTouchReturnSwipe = 2131296855;
+			
+			// aapt resource value: 0x7F090258
+			public const int open_search_bar_text_view = 2131296856;
+			
+			// aapt resource value: 0x7F090259
+			public const int open_search_view_background = 2131296857;
+			
+			// aapt resource value: 0x7F09025A
+			public const int open_search_view_clear_button = 2131296858;
+			
+			// aapt resource value: 0x7F09025B
+			public const int open_search_view_content_container = 2131296859;
+			
+			// aapt resource value: 0x7F09025C
+			public const int open_search_view_divider = 2131296860;
+			
+			// aapt resource value: 0x7F09025D
+			public const int open_search_view_dummy_toolbar = 2131296861;
+			
+			// aapt resource value: 0x7F09025E
+			public const int open_search_view_edit_text = 2131296862;
+			
+			// aapt resource value: 0x7F09025F
+			public const int open_search_view_header_container = 2131296863;
+			
+			// aapt resource value: 0x7F090260
+			public const int open_search_view_root = 2131296864;
+			
+			// aapt resource value: 0x7F090261
+			public const int open_search_view_scrim = 2131296865;
+			
+			// aapt resource value: 0x7F090262
+			public const int open_search_view_search_prefix = 2131296866;
+			
+			// aapt resource value: 0x7F090263
+			public const int open_search_view_status_bar_spacer = 2131296867;
+			
+			// aapt resource value: 0x7F090264
+			public const int open_search_view_toolbar = 2131296868;
+			
+			// aapt resource value: 0x7F090265
+			public const int open_search_view_toolbar_container = 2131296869;
+			
+			// aapt resource value: 0x7F090268
+			public const int options1 = 2131296872;
+			
+			// aapt resource value: 0x7F090269
+			public const int options2 = 2131296873;
+			
+			// aapt resource value: 0x7F09026A
+			public const int options3 = 2131296874;
+			
 			// aapt resource value: 0x7F09026B
-			public const int off = 2131296875;
+			public const int optionspicker = 2131296875;
+			
+			// aapt resource value: 0x7F090266
+			public const int option_list = 2131296870;
+			
+			// aapt resource value: 0x7F090267
+			public const int option_name = 2131296871;
 			
 			// aapt resource value: 0x7F09026C
-			public const int on = 2131296876;
+			public const int outline = 2131296876;
 			
 			// aapt resource value: 0x7F09026D
-			public const int onInterceptTouchReturnSwipe = 2131296877;
+			public const int outmost_container = 2131296877;
 			
 			// aapt resource value: 0x7F09026E
-			public const int open_search_bar_text_view = 2131296878;
+			public const int outward = 2131296878;
 			
 			// aapt resource value: 0x7F09026F
-			public const int open_search_view_background = 2131296879;
+			public const int overshoot = 2131296879;
 			
 			// aapt resource value: 0x7F090270
-			public const int open_search_view_clear_button = 2131296880;
+			public const int packed = 2131296880;
 			
 			// aapt resource value: 0x7F090271
-			public const int open_search_view_content_container = 2131296881;
+			public const int pair_img1 = 2131296881;
 			
 			// aapt resource value: 0x7F090272
-			public const int open_search_view_divider = 2131296882;
+			public const int pair_img2 = 2131296882;
 			
 			// aapt resource value: 0x7F090273
-			public const int open_search_view_dummy_toolbar = 2131296883;
+			public const int parallax = 2131296883;
 			
 			// aapt resource value: 0x7F090274
-			public const int open_search_view_edit_text = 2131296884;
+			public const int parent = 2131296884;
 			
 			// aapt resource value: 0x7F090275
-			public const int open_search_view_header_container = 2131296885;
+			public const int parentPanel = 2131296885;
 			
 			// aapt resource value: 0x7F090276
-			public const int open_search_view_root = 2131296886;
+			public const int parentRelative = 2131296886;
 			
 			// aapt resource value: 0x7F090277
-			public const int open_search_view_scrim = 2131296887;
+			public const int parent_matrix = 2131296887;
 			
 			// aapt resource value: 0x7F090278
-			public const int open_search_view_search_prefix = 2131296888;
+			public const int password_toggle = 2131296888;
 			
 			// aapt resource value: 0x7F090279
-			public const int open_search_view_status_bar_spacer = 2131296889;
+			public const int path = 2131296889;
 			
 			// aapt resource value: 0x7F09027A
-			public const int open_search_view_toolbar = 2131296890;
+			public const int pathRelative = 2131296890;
 			
 			// aapt resource value: 0x7F09027B
-			public const int open_search_view_toolbar_container = 2131296891;
-			
-			// aapt resource value: 0x7F09027E
-			public const int options1 = 2131296894;
-			
-			// aapt resource value: 0x7F09027F
-			public const int options2 = 2131296895;
-			
-			// aapt resource value: 0x7F090280
-			public const int options3 = 2131296896;
-			
-			// aapt resource value: 0x7F090281
-			public const int optionspicker = 2131296897;
+			public const int pb_loading = 2131296891;
 			
 			// aapt resource value: 0x7F09027C
-			public const int option_list = 2131296892;
+			public const int peekHeight = 2131296892;
 			
 			// aapt resource value: 0x7F09027D
-			public const int option_name = 2131296893;
+			public const int peerAddress = 2131296893;
+			
+			// aapt resource value: 0x7F09027E
+			public const int percent = 2131296894;
+			
+			// aapt resource value: 0x7F09027F
+			public const int pg_download = 2131296895;
+			
+			// aapt resource value: 0x7F090280
+			public const int pg_upodate = 2131296896;
+			
+			// aapt resource value: 0x7F090281
+			public const int phone_btn = 2131296897;
 			
 			// aapt resource value: 0x7F090282
-			public const int outline = 2131296898;
+			public const int pin = 2131296898;
 			
 			// aapt resource value: 0x7F090283
-			public const int outmost_container = 2131296899;
+			public const int pixel_recycle = 2131296899;
 			
 			// aapt resource value: 0x7F090284
-			public const int outward = 2131296900;
+			public const int pooling_container_listener_holder_tag = 2131296900;
 			
 			// aapt resource value: 0x7F090285
-			public const int overshoot = 2131296901;
+			public const int position = 2131296901;
 			
 			// aapt resource value: 0x7F090286
-			public const int packed = 2131296902;
+			public const int postLayout = 2131296902;
 			
 			// aapt resource value: 0x7F090287
-			public const int pair_img1 = 2131296903;
+			public const int pressed = 2131296903;
 			
 			// aapt resource value: 0x7F090288
-			public const int pair_img2 = 2131296904;
+			public const int privacy_policy_btn = 2131296904;
 			
 			// aapt resource value: 0x7F090289
-			public const int parallax = 2131296905;
+			public const int progress_circular = 2131296905;
 			
 			// aapt resource value: 0x7F09028A
-			public const int parent = 2131296906;
+			public const int progress_horizontal = 2131296906;
 			
 			// aapt resource value: 0x7F09028B
-			public const int parentPanel = 2131296907;
+			public const int pullDownFromTop = 2131296907;
 			
 			// aapt resource value: 0x7F09028C
-			public const int parentRelative = 2131296908;
+			public const int pullFromEnd = 2131296908;
 			
 			// aapt resource value: 0x7F09028D
-			public const int parent_matrix = 2131296909;
+			public const int pullFromStart = 2131296909;
 			
 			// aapt resource value: 0x7F09028E
-			public const int password_toggle = 2131296910;
+			public const int pullUpFromBottom = 2131296910;
 			
 			// aapt resource value: 0x7F09028F
-			public const int path = 2131296911;
+			public const int pull_out = 2131296911;
 			
 			// aapt resource value: 0x7F090290
-			public const int pathRelative = 2131296912;
+			public const int pull_to_refresh_image = 2131296912;
 			
 			// aapt resource value: 0x7F090291
-			public const int pb_loading = 2131296913;
+			public const int pull_to_refresh_progress = 2131296913;
 			
 			// aapt resource value: 0x7F090292
-			public const int peekHeight = 2131296914;
+			public const int pull_to_refresh_sub_text = 2131296914;
 			
 			// aapt resource value: 0x7F090293
-			public const int peerAddress = 2131296915;
+			public const int pull_to_refresh_text = 2131296915;
 			
 			// aapt resource value: 0x7F090294
-			public const int percent = 2131296916;
+			public const int quit = 2131296916;
 			
 			// aapt resource value: 0x7F090295
-			public const int pg_download = 2131296917;
+			public const int radio = 2131296917;
 			
 			// aapt resource value: 0x7F090296
-			public const int pg_upodate = 2131296918;
+			public const int ratio = 2131296918;
 			
 			// aapt resource value: 0x7F090297
-			public const int phone_btn = 2131296919;
+			public const int rb_never_remind = 2131296919;
 			
 			// aapt resource value: 0x7F090298
-			public const int pin = 2131296920;
+			public const int rcv_channel = 2131296920;
 			
 			// aapt resource value: 0x7F090299
-			public const int pixel_recycle = 2131296921;
+			public const int rcv_record = 2131296921;
 			
 			// aapt resource value: 0x7F09029A
-			public const int pooling_container_listener_holder_tag = 2131296922;
+			public const int rcv_video_list = 2131296922;
 			
 			// aapt resource value: 0x7F09029B
-			public const int popLayoutId = 2131296923;
+			public const int record_endTime = 2131296923;
 			
 			// aapt resource value: 0x7F09029C
-			public const int position = 2131296924;
+			public const int record_list = 2131296924;
 			
 			// aapt resource value: 0x7F09029D
-			public const int postLayout = 2131296925;
+			public const int record_seekbar = 2131296925;
 			
 			// aapt resource value: 0x7F09029E
-			public const int pressed = 2131296926;
+			public const int record_startTime = 2131296926;
 			
 			// aapt resource value: 0x7F09029F
-			public const int privacy_policy_btn = 2131296927;
+			public const int rectangle = 2131296927;
 			
 			// aapt resource value: 0x7F0902A0
-			public const int progress_circular = 2131296928;
+			public const int rectangles = 2131296928;
 			
 			// aapt resource value: 0x7F0902A1
-			public const int progress_horizontal = 2131296929;
+			public const int remoteFrame = 2131296929;
 			
 			// aapt resource value: 0x7F0902A2
-			public const int pullDownFromTop = 2131296930;
+			public const int remoteFrameContainer = 2131296930;
 			
 			// aapt resource value: 0x7F0902A3
-			public const int pullFromEnd = 2131296931;
+			public const int remoteVideo = 2131296931;
 			
 			// aapt resource value: 0x7F0902A4
-			public const int pullFromStart = 2131296932;
+			public const int report_drawn = 2131296932;
 			
 			// aapt resource value: 0x7F0902A5
-			public const int pullUpFromBottom = 2131296933;
+			public const int requestA = 2131296933;
 			
 			// aapt resource value: 0x7F0902A6
-			public const int pull_out = 2131296934;
+			public const int requestMasterAudio = 2131296934;
 			
 			// aapt resource value: 0x7F0902A7
-			public const int pull_to_refresh_image = 2131296935;
+			public const int requestMasterVideo = 2131296935;
 			
 			// aapt resource value: 0x7F0902A8
-			public const int pull_to_refresh_progress = 2131296936;
+			public const int requestV = 2131296936;
 			
 			// aapt resource value: 0x7F0902A9
-			public const int pull_to_refresh_sub_text = 2131296937;
+			public const int restart_preview = 2131296937;
 			
 			// aapt resource value: 0x7F0902AA
-			public const int pull_to_refresh_text = 2131296938;
+			public const int return_scan_result = 2131296938;
 			
 			// aapt resource value: 0x7F0902AB
-			public const int pushPrograssBar = 2131296939;
+			public const int reverseCall = 2131296939;
 			
 			// aapt resource value: 0x7F0902AC
-			public const int push_big_bigtext_defaultView = 2131296940;
+			public const int reverseCallInfo = 2131296940;
 			
 			// aapt resource value: 0x7F0902AD
-			public const int push_big_bigview_defaultView = 2131296941;
+			public const int reverseSawtooth = 2131296941;
 			
 			// aapt resource value: 0x7F0902AE
-			public const int push_big_defaultView = 2131296942;
+			public const int right = 2131296942;
 			
 			// aapt resource value: 0x7F0902AF
-			public const int push_big_notification = 2131296943;
+			public const int rightToLeft = 2131296943;
 			
 			// aapt resource value: 0x7F0902B0
-			public const int push_big_notification_content = 2131296944;
+			public const int right_icon = 2131296944;
 			
 			// aapt resource value: 0x7F0902B1
-			public const int push_big_notification_date = 2131296945;
+			public const int right_side = 2131296945;
 			
 			// aapt resource value: 0x7F0902B2
-			public const int push_big_notification_icon = 2131296946;
+			public const int rl_cur_wifi = 2131296946;
 			
 			// aapt resource value: 0x7F0902B3
-			public const int push_big_notification_icon2 = 2131296947;
+			public const int rl_deployment = 2131296947;
 			
 			// aapt resource value: 0x7F0902B4
-			public const int push_big_notification_title = 2131296948;
+			public const int rl_detail = 2131296948;
 			
 			// aapt resource value: 0x7F0902B5
-			public const int push_big_pic_default_Content = 2131296949;
+			public const int rl_detail_type = 2131296949;
 			
 			// aapt resource value: 0x7F0902B6
-			public const int push_big_text_notification_area = 2131296950;
+			public const int rl_detail_version = 2131296950;
 			
 			// aapt resource value: 0x7F0902B7
-			public const int push_notification_banner_icon = 2131296951;
+			public const int rl_detele = 2131296951;
 			
 			// aapt resource value: 0x7F0902B8
-			public const int push_notification_banner_img = 2131296952;
+			public const int rl_device_detail = 2131296952;
 			
 			// aapt resource value: 0x7F0902B9
-			public const int push_notification_banner_layout = 2131296953;
+			public const int rl_device_modify = 2131296953;
 			
 			// aapt resource value: 0x7F0902BA
-			public const int push_notification_big_icon = 2131296954;
+			public const int rl_device_serial = 2131296954;
 			
 			// aapt resource value: 0x7F0902BB
-			public const int push_notification_content = 2131296955;
+			public const int rl_loading = 2131296955;
 			
 			// aapt resource value: 0x7F0902BC
-			public const int push_notification_content_one_line = 2131296956;
+			public const int rl_lp_answerView = 2131296956;
 			
 			// aapt resource value: 0x7F0902BD
-			public const int push_notification_date = 2131296957;
+			public const int rl_lp_topView = 2131296957;
 			
 			// aapt resource value: 0x7F0902BE
-			public const int push_notification_dot = 2131296958;
+			public const int rl_lp_unlock = 2131296958;
 			
 			// aapt resource value: 0x7F0902BF
-			public const int push_notification_fb_content = 2131296959;
+			public const int rl_no_device = 2131296959;
 			
 			// aapt resource value: 0x7F0902C0
-			public const int push_notification_fb_content_no_like1 = 2131296960;
+			public const int rl_offline = 2131296960;
 			
 			// aapt resource value: 0x7F0902C1
-			public const int push_notification_fb_content_no_like2 = 2131296961;
+			public const int rl_title = 2131296961;
 			
 			// aapt resource value: 0x7F0902C2
-			public const int push_notification_fb_content_no_like3 = 2131296962;
+			public const int rotate = 2131296962;
 			
 			// aapt resource value: 0x7F0902C3
-			public const int push_notification_fb_content_no_like4 = 2131296963;
+			public const int rotatedown = 2131296963;
 			
 			// aapt resource value: 0x7F0902C4
-			public const int push_notification_for_bottom_margin = 2131296964;
+			public const int rotateup = 2131296964;
 			
 			// aapt resource value: 0x7F0902C5
-			public const int push_notification_header_expand = 2131296965;
+			public const int round = 2131296965;
 			
 			// aapt resource value: 0x7F0902C6
-			public const int push_notification_header_neg_fb = 2131296966;
+			public const int rounded = 2131296966;
 			
 			// aapt resource value: 0x7F0902C7
-			public const int push_notification_layout_lefttop = 2131296967;
+			public const int row_index_key = 2131296967;
 			
 			// aapt resource value: 0x7F0902C8
-			public const int push_notification_layout_time = 2131296968;
+			public const int rtl = 2131296968;
 			
 			// aapt resource value: 0x7F0902C9
-			public const int push_notification_main_layout = 2131296969;
+			public const int rudder = 2131296969;
 			
 			// aapt resource value: 0x7F0902CA
-			public const int push_notification_null = 2131296970;
+			public const int rv_topbar = 2131296970;
 			
 			// aapt resource value: 0x7F0902CB
-			public const int push_notification_small_icon = 2131296971;
+			public const int sample_text = 2131296971;
 			
 			// aapt resource value: 0x7F0902CC
-			public const int push_notification_style_1 = 2131296972;
+			public const int save_non_transition_alpha = 2131296972;
 			
 			// aapt resource value: 0x7F0902CD
-			public const int push_notification_style_1_banner_icon = 2131296973;
+			public const int save_overlay_view = 2131296973;
 			
 			// aapt resource value: 0x7F0902CE
-			public const int push_notification_style_1_big_icon = 2131296974;
+			public const int sawtooth = 2131296974;
 			
 			// aapt resource value: 0x7F0902CF
-			public const int push_notification_style_1_content = 2131296975;
-			
-			// aapt resource value: 0x7F0902D0
-			public const int push_notification_style_1_date = 2131296976;
-			
-			// aapt resource value: 0x7F0902D1
-			public const int push_notification_style_1_main_layout = 2131296977;
-			
-			// aapt resource value: 0x7F0902D2
-			public const int push_notification_style_1_title = 2131296978;
-			
-			// aapt resource value: 0x7F0902D3
-			public const int push_notification_style_default = 2131296979;
-			
-			// aapt resource value: 0x7F0902D4
-			public const int push_notification_sub_title = 2131296980;
-			
-			// aapt resource value: 0x7F0902D5
-			public const int push_notification_title = 2131296981;
-			
-			// aapt resource value: 0x7F0902D6
-			public const int push_pure_bigview_banner = 2131296982;
-			
-			// aapt resource value: 0x7F0902D7
-			public const int push_pure_bigview_expanded = 2131296983;
-			
-			// aapt resource value: 0x7F0902D8
-			public const int push_pure_close = 2131296984;
-			
-			// aapt resource value: 0x7F0902D9
-			public const int push_root_view = 2131296985;
-			
-			// aapt resource value: 0x7F0902DA
-			public const int quit = 2131296986;
-			
-			// aapt resource value: 0x7F0902DB
-			public const int radio = 2131296987;
-			
-			// aapt resource value: 0x7F0902DC
-			public const int ratio = 2131296988;
-			
-			// aapt resource value: 0x7F0902DD
-			public const int rb_never_remind = 2131296989;
-			
-			// aapt resource value: 0x7F0902DE
-			public const int rcv_channel = 2131296990;
-			
-			// aapt resource value: 0x7F0902DF
-			public const int rcv_record = 2131296991;
-			
-			// aapt resource value: 0x7F0902E0
-			public const int rcv_video_list = 2131296992;
-			
-			// aapt resource value: 0x7F0902E1
-			public const int record_endTime = 2131296993;
-			
-			// aapt resource value: 0x7F0902E2
-			public const int record_list = 2131296994;
-			
-			// aapt resource value: 0x7F0902E3
-			public const int record_seekbar = 2131296995;
-			
-			// aapt resource value: 0x7F0902E4
-			public const int record_startTime = 2131296996;
-			
-			// aapt resource value: 0x7F0902E5
-			public const int rectangle = 2131296997;
-			
-			// aapt resource value: 0x7F0902E6
-			public const int rectangles = 2131296998;
-			
-			// aapt resource value: 0x7F0902E7
-			public const int remoteFrame = 2131296999;
-			
-			// aapt resource value: 0x7F0902E8
-			public const int remoteFrameContainer = 2131297000;
-			
-			// aapt resource value: 0x7F0902E9
-			public const int remoteVideo = 2131297001;
-			
-			// aapt resource value: 0x7F0902EA
-			public const int report_drawn = 2131297002;
-			
-			// aapt resource value: 0x7F0902EB
-			public const int requestA = 2131297003;
-			
-			// aapt resource value: 0x7F0902EC
-			public const int requestMasterAudio = 2131297004;
-			
-			// aapt resource value: 0x7F0902ED
-			public const int requestMasterVideo = 2131297005;
-			
-			// aapt resource value: 0x7F0902EE
-			public const int requestV = 2131297006;
-			
-			// aapt resource value: 0x7F0902EF
-			public const int restart_preview = 2131297007;
-			
-			// aapt resource value: 0x7F0902F0
-			public const int return_scan_result = 2131297008;
-			
-			// aapt resource value: 0x7F0902F1
-			public const int reverseCall = 2131297009;
-			
-			// aapt resource value: 0x7F0902F2
-			public const int reverseCallInfo = 2131297010;
-			
-			// aapt resource value: 0x7F0902F3
-			public const int reverseSawtooth = 2131297011;
-			
-			// aapt resource value: 0x7F0902F4
-			public const int right = 2131297012;
-			
-			// aapt resource value: 0x7F0902F5
-			public const int rightToLeft = 2131297013;
-			
-			// aapt resource value: 0x7F0902F6
-			public const int right_icon = 2131297014;
-			
-			// aapt resource value: 0x7F0902F7
-			public const int right_side = 2131297015;
-			
-			// aapt resource value: 0x7F0902F8
-			public const int rlRichpushTitleBar = 2131297016;
-			
-			// aapt resource value: 0x7F0902F9
-			public const int rl_cur_wifi = 2131297017;
-			
-			// aapt resource value: 0x7F0902FA
-			public const int rl_deployment = 2131297018;
-			
-			// aapt resource value: 0x7F0902FB
-			public const int rl_detail = 2131297019;
-			
-			// aapt resource value: 0x7F0902FC
-			public const int rl_detail_type = 2131297020;
-			
-			// aapt resource value: 0x7F0902FD
-			public const int rl_detail_version = 2131297021;
-			
-			// aapt resource value: 0x7F0902FE
-			public const int rl_detele = 2131297022;
-			
-			// aapt resource value: 0x7F0902FF
-			public const int rl_device_detail = 2131297023;
-			
-			// aapt resource value: 0x7F090300
-			public const int rl_device_modify = 2131297024;
-			
-			// aapt resource value: 0x7F090301
-			public const int rl_device_serial = 2131297025;
-			
-			// aapt resource value: 0x7F090302
-			public const int rl_loading = 2131297026;
-			
-			// aapt resource value: 0x7F090303
-			public const int rl_lp_answerView = 2131297027;
-			
-			// aapt resource value: 0x7F090304
-			public const int rl_lp_topView = 2131297028;
-			
-			// aapt resource value: 0x7F090305
-			public const int rl_lp_unlock = 2131297029;
-			
-			// aapt resource value: 0x7F090306
-			public const int rl_no_device = 2131297030;
-			
-			// aapt resource value: 0x7F090307
-			public const int rl_offline = 2131297031;
-			
-			// aapt resource value: 0x7F090308
-			public const int rl_title = 2131297032;
-			
-			// aapt resource value: 0x7F090309
-			public const int rotate = 2131297033;
-			
-			// aapt resource value: 0x7F09030A
-			public const int rotatedown = 2131297034;
-			
-			// aapt resource value: 0x7F09030B
-			public const int rotateup = 2131297035;
-			
-			// aapt resource value: 0x7F09030C
-			public const int round = 2131297036;
-			
-			// aapt resource value: 0x7F09030D
-			public const int rounded = 2131297037;
-			
-			// aapt resource value: 0x7F09030E
-			public const int row_index_key = 2131297038;
-			
-			// aapt resource value: 0x7F09030F
-			public const int rtl = 2131297039;
-			
-			// aapt resource value: 0x7F090310
-			public const int rudder = 2131297040;
-			
-			// aapt resource value: 0x7F090311
-			public const int rv_topbar = 2131297041;
-			
-			// aapt resource value: 0x7F090312
-			public const int sample_text = 2131297042;
-			
-			// aapt resource value: 0x7F090313
-			public const int save_non_transition_alpha = 2131297043;
-			
-			// aapt resource value: 0x7F090314
-			public const int save_overlay_view = 2131297044;
-			
-			// aapt resource value: 0x7F090315
-			public const int sawtooth = 2131297045;
+			public const int scale = 2131296975;
 			
 			// aapt resource value: 0x7F090012
 			public const int Scale = 2131296274;
 			
-			// aapt resource value: 0x7F090316
-			public const int scale = 2131297046;
+			// aapt resource value: 0x7F0902D0
+			public const int scan_line = 2131296976;
 			
-			// aapt resource value: 0x7F090317
-			public const int scan_line = 2131297047;
+			// aapt resource value: 0x7F0902D1
+			public const int screen = 2131296977;
 			
-			// aapt resource value: 0x7F090318
-			public const int screen = 2131297048;
+			// aapt resource value: 0x7F0902D2
+			public const int scroll = 2131296978;
 			
-			// aapt resource value: 0x7F090319
-			public const int scroll = 2131297049;
+			// aapt resource value: 0x7F0902D6
+			public const int scrollable = 2131296982;
 			
-			// aapt resource value: 0x7F09031D
-			public const int scrollable = 2131297053;
+			// aapt resource value: 0x7F0902D3
+			public const int scrollIndicatorDown = 2131296979;
 			
-			// aapt resource value: 0x7F09031A
-			public const int scrollIndicatorDown = 2131297050;
+			// aapt resource value: 0x7F0902D4
+			public const int scrollIndicatorUp = 2131296980;
 			
-			// aapt resource value: 0x7F09031B
-			public const int scrollIndicatorUp = 2131297051;
+			// aapt resource value: 0x7F0902D5
+			public const int scrollView = 2131296981;
 			
-			// aapt resource value: 0x7F09031E
-			public const int scrollview = 2131297054;
+			// aapt resource value: 0x7F0902D7
+			public const int scrollview = 2131296983;
 			
-			// aapt resource value: 0x7F09031C
-			public const int scrollView = 2131297052;
+			// aapt resource value: 0x7F0902D8
+			public const int search_badge = 2131296984;
 			
-			// aapt resource value: 0x7F09031F
-			public const int search_badge = 2131297055;
+			// aapt resource value: 0x7F0902D9
+			public const int search_bar = 2131296985;
 			
-			// aapt resource value: 0x7F090320
-			public const int search_bar = 2131297056;
+			// aapt resource value: 0x7F0902DA
+			public const int search_button = 2131296986;
 			
-			// aapt resource value: 0x7F090321
-			public const int search_button = 2131297057;
+			// aapt resource value: 0x7F0902DB
+			public const int search_close_btn = 2131296987;
 			
-			// aapt resource value: 0x7F090322
-			public const int search_close_btn = 2131297058;
+			// aapt resource value: 0x7F0902DC
+			public const int search_edit_frame = 2131296988;
 			
-			// aapt resource value: 0x7F090323
-			public const int search_edit_frame = 2131297059;
+			// aapt resource value: 0x7F0902DD
+			public const int search_go_btn = 2131296989;
 			
-			// aapt resource value: 0x7F090324
-			public const int search_go_btn = 2131297060;
+			// aapt resource value: 0x7F0902DE
+			public const int search_mag_icon = 2131296990;
 			
-			// aapt resource value: 0x7F090325
-			public const int search_mag_icon = 2131297061;
+			// aapt resource value: 0x7F0902DF
+			public const int search_plate = 2131296991;
 			
-			// aapt resource value: 0x7F090326
-			public const int search_plate = 2131297062;
+			// aapt resource value: 0x7F0902E0
+			public const int search_src_text = 2131296992;
 			
-			// aapt resource value: 0x7F090327
-			public const int search_src_text = 2131297063;
+			// aapt resource value: 0x7F0902E1
+			public const int search_voice_btn = 2131296993;
 			
-			// aapt resource value: 0x7F090328
-			public const int search_voice_btn = 2131297064;
+			// aapt resource value: 0x7F0902E2
+			public const int second = 2131296994;
 			
-			// aapt resource value: 0x7F090329
-			public const int second = 2131297065;
+			// aapt resource value: 0x7F0902E4
+			public const int selected = 2131296996;
 			
-			// aapt resource value: 0x7F09032B
-			public const int selected = 2131297067;
+			// aapt resource value: 0x7F0902E5
+			public const int selection_type = 2131296997;
 			
-			// aapt resource value: 0x7F09032C
-			public const int selection_type = 2131297068;
+			// aapt resource value: 0x7F0902E3
+			public const int select_dialog_listview = 2131296995;
 			
-			// aapt resource value: 0x7F09032A
-			public const int select_dialog_listview = 2131297066;
+			// aapt resource value: 0x7F0902E6
+			public const int sendA = 2131296998;
 			
-			// aapt resource value: 0x7F09032D
-			public const int sendA = 2131297069;
+			// aapt resource value: 0x7F0902E7
+			public const int sendCustomData = 2131296999;
 			
-			// aapt resource value: 0x7F09032E
-			public const int sendCustomData = 2131297070;
+			// aapt resource value: 0x7F0902E8
+			public const int sendV = 2131297000;
 			
-			// aapt resource value: 0x7F09032F
-			public const int sendV = 2131297071;
+			// aapt resource value: 0x7F0902E9
+			public const int service_agreement_btn = 2131297001;
 			
-			// aapt resource value: 0x7F090330
-			public const int service_agreement_btn = 2131297072;
+			// aapt resource value: 0x7F0902EA
+			public const int sharedValueSet = 2131297002;
 			
-			// aapt resource value: 0x7F090331
-			public const int sharedValueSet = 2131297073;
-			
-			// aapt resource value: 0x7F090332
-			public const int sharedValueUnset = 2131297074;
+			// aapt resource value: 0x7F0902EB
+			public const int sharedValueUnset = 2131297003;
 			
 			// aapt resource value: 0x7F09000C
 			public const int SHIFT = 2131296268;
 			
-			// aapt resource value: 0x7F090333
-			public const int shortcut = 2131297075;
+			// aapt resource value: 0x7F0902EC
+			public const int shortcut = 2131297004;
 			
-			// aapt resource value: 0x7F090334
-			public const int show = 2131297076;
+			// aapt resource value: 0x7F0902ED
+			public const int show = 2131297005;
 			
-			// aapt resource value: 0x7F090335
-			public const int showCustom = 2131297077;
+			// aapt resource value: 0x7F0902EE
+			public const int showCustom = 2131297006;
 			
-			// aapt resource value: 0x7F090336
-			public const int showHome = 2131297078;
+			// aapt resource value: 0x7F0902EF
+			public const int showHome = 2131297007;
 			
-			// aapt resource value: 0x7F090337
-			public const int showTitle = 2131297079;
+			// aapt resource value: 0x7F0902F0
+			public const int showTitle = 2131297008;
 			
 			// aapt resource value: 0x7F09000D
 			public const int SHOW_ALL = 2131296269;
@@ -17417,920 +16974,911 @@
 			// aapt resource value: 0x7F09000F
 			public const int SHOW_PROGRESS = 2131296271;
 			
-			// aapt resource value: 0x7F090338
-			public const int sin = 2131297080;
+			// aapt resource value: 0x7F0902F1
+			public const int sin = 2131297009;
 			
-			// aapt resource value: 0x7F090339
-			public const int skipCollapsed = 2131297081;
+			// aapt resource value: 0x7F0902F2
+			public const int skipCollapsed = 2131297010;
 			
-			// aapt resource value: 0x7F09033A
-			public const int skipped = 2131297082;
+			// aapt resource value: 0x7F0902F3
+			public const int skipped = 2131297011;
 			
-			// aapt resource value: 0x7F09033B
-			public const int slide = 2131297083;
+			// aapt resource value: 0x7F0902F4
+			public const int slide = 2131297012;
 			
-			// aapt resource value: 0x7F09033C
-			public const int snackbar_action = 2131297084;
+			// aapt resource value: 0x7F0902F5
+			public const int snackbar_action = 2131297013;
 			
-			// aapt resource value: 0x7F09033D
-			public const int snackbar_text = 2131297085;
+			// aapt resource value: 0x7F0902F6
+			public const int snackbar_text = 2131297014;
 			
-			// aapt resource value: 0x7F09033E
-			public const int snap = 2131297086;
+			// aapt resource value: 0x7F0902F7
+			public const int snap = 2131297015;
 			
-			// aapt resource value: 0x7F09033F
-			public const int snapMargins = 2131297087;
+			// aapt resource value: 0x7F0902F8
+			public const int snapMargins = 2131297016;
 			
-			// aapt resource value: 0x7F090340
-			public const int snapshot = 2131297088;
+			// aapt resource value: 0x7F0902F9
+			public const int snapshot = 2131297017;
 			
-			// aapt resource value: 0x7F090341
-			public const int south = 2131297089;
+			// aapt resource value: 0x7F0902FA
+			public const int south = 2131297018;
 			
-			// aapt resource value: 0x7F090342
-			public const int spacer = 2131297090;
+			// aapt resource value: 0x7F0902FB
+			public const int spacer = 2131297019;
 			
-			// aapt resource value: 0x7F090343
-			public const int special_effects_controller_view_tag = 2131297091;
+			// aapt resource value: 0x7F0902FC
+			public const int special_effects_controller_view_tag = 2131297020;
 			
-			// aapt resource value: 0x7F090344
-			public const int spline = 2131297092;
+			// aapt resource value: 0x7F0902FD
+			public const int spline = 2131297021;
 			
-			// aapt resource value: 0x7F090345
-			public const int split_action_bar = 2131297093;
+			// aapt resource value: 0x7F0902FE
+			public const int split_action_bar = 2131297022;
 			
-			// aapt resource value: 0x7F090346
-			public const int spread = 2131297094;
+			// aapt resource value: 0x7F0902FF
+			public const int spread = 2131297023;
 			
-			// aapt resource value: 0x7F090347
-			public const int spread_inside = 2131297095;
+			// aapt resource value: 0x7F090300
+			public const int spread_inside = 2131297024;
 			
-			// aapt resource value: 0x7F090348
-			public const int spring = 2131297096;
+			// aapt resource value: 0x7F090301
+			public const int spring = 2131297025;
 			
-			// aapt resource value: 0x7F090349
-			public const int square = 2131297097;
+			// aapt resource value: 0x7F090302
+			public const int square = 2131297026;
 			
-			// aapt resource value: 0x7F09034A
-			public const int src_atop = 2131297098;
+			// aapt resource value: 0x7F090303
+			public const int src_atop = 2131297027;
 			
-			// aapt resource value: 0x7F09034B
-			public const int src_in = 2131297099;
+			// aapt resource value: 0x7F090304
+			public const int src_in = 2131297028;
 			
-			// aapt resource value: 0x7F09034C
-			public const int src_over = 2131297100;
+			// aapt resource value: 0x7F090305
+			public const int src_over = 2131297029;
 			
-			// aapt resource value: 0x7F09034D
-			public const int srl_classics_arrow = 2131297101;
+			// aapt resource value: 0x7F090306
+			public const int srl_classics_arrow = 2131297030;
 			
-			// aapt resource value: 0x7F09034E
-			public const int srl_classics_center = 2131297102;
+			// aapt resource value: 0x7F090307
+			public const int srl_classics_center = 2131297031;
 			
-			// aapt resource value: 0x7F09034F
-			public const int srl_classics_progress = 2131297103;
+			// aapt resource value: 0x7F090308
+			public const int srl_classics_progress = 2131297032;
 			
-			// aapt resource value: 0x7F090350
-			public const int srl_classics_title = 2131297104;
+			// aapt resource value: 0x7F090309
+			public const int srl_classics_title = 2131297033;
 			
-			// aapt resource value: 0x7F090351
-			public const int srl_classics_update = 2131297105;
+			// aapt resource value: 0x7F09030A
+			public const int srl_classics_update = 2131297034;
 			
-			// aapt resource value: 0x7F090352
-			public const int ssid = 2131297106;
+			// aapt resource value: 0x7F09030B
+			public const int ssid = 2131297035;
 			
-			// aapt resource value: 0x7F090353
-			public const int ssid_title = 2131297107;
+			// aapt resource value: 0x7F09030C
+			public const int ssid_title = 2131297036;
 			
-			// aapt resource value: 0x7F090354
-			public const int stack = 2131297108;
+			// aapt resource value: 0x7F09030D
+			public const int stack = 2131297037;
 			
-			// aapt resource value: 0x7F090355
-			public const int standard = 2131297109;
+			// aapt resource value: 0x7F09030E
+			public const int standard = 2131297038;
 			
-			// aapt resource value: 0x7F090356
-			public const int start = 2131297110;
+			// aapt resource value: 0x7F09030F
+			public const int start = 2131297039;
 			
-			// aapt resource value: 0x7F090357
-			public const int startAVMsg = 2131297111;
+			// aapt resource value: 0x7F090310
+			public const int startAVMsg = 2131297040;
 			
-			// aapt resource value: 0x7F090358
-			public const int startDoorKey = 2131297112;
+			// aapt resource value: 0x7F090311
+			public const int startDoorKey = 2131297041;
 			
-			// aapt resource value: 0x7F090359
-			public const int startHorizontal = 2131297113;
+			// aapt resource value: 0x7F090312
+			public const int startHorizontal = 2131297042;
 			
-			// aapt resource value: 0x7F09035A
-			public const int startLocalRecord = 2131297114;
+			// aapt resource value: 0x7F090313
+			public const int startLocalRecord = 2131297043;
 			
-			// aapt resource value: 0x7F09035B
-			public const int startReadCard = 2131297115;
+			// aapt resource value: 0x7F090314
+			public const int startReadCard = 2131297044;
 			
-			// aapt resource value: 0x7F09035C
-			public const int startRecord = 2131297116;
+			// aapt resource value: 0x7F090315
+			public const int startRecord = 2131297045;
 			
-			// aapt resource value: 0x7F09035D
-			public const int startRecordLocalAudio = 2131297117;
+			// aapt resource value: 0x7F090316
+			public const int startRecordLocalAudio = 2131297046;
 			
-			// aapt resource value: 0x7F09035E
-			public const int startRecordPeerAudio = 2131297118;
+			// aapt resource value: 0x7F090317
+			public const int startRecordPeerAudio = 2131297047;
 			
-			// aapt resource value: 0x7F09035F
-			public const int startStream = 2131297119;
+			// aapt resource value: 0x7F090318
+			public const int startStream = 2131297048;
 			
-			// aapt resource value: 0x7F090360
-			public const int startToEnd = 2131297120;
+			// aapt resource value: 0x7F090319
+			public const int startToEnd = 2131297049;
 			
-			// aapt resource value: 0x7F090361
-			public const int startVertical = 2131297121;
+			// aapt resource value: 0x7F09031A
+			public const int startVertical = 2131297050;
 			
-			// aapt resource value: 0x7F090362
-			public const int startWatchDog = 2131297122;
+			// aapt resource value: 0x7F09031B
+			public const int startWatchDog = 2131297051;
 			
-			// aapt resource value: 0x7F090363
-			public const int start_stop = 2131297123;
+			// aapt resource value: 0x7F09031C
+			public const int start_stop = 2131297052;
 			
-			// aapt resource value: 0x7F090364
-			public const int start_stop_stream = 2131297124;
+			// aapt resource value: 0x7F09031D
+			public const int start_stop_stream = 2131297053;
 			
-			// aapt resource value: 0x7F090365
-			public const int staticLayout = 2131297125;
+			// aapt resource value: 0x7F09031E
+			public const int staticLayout = 2131297054;
 			
-			// aapt resource value: 0x7F090366
-			public const int staticPostLayout = 2131297126;
+			// aapt resource value: 0x7F09031F
+			public const int staticPostLayout = 2131297055;
 			
-			// aapt resource value: 0x7F090367
-			public const int status = 2131297127;
+			// aapt resource value: 0x7F090320
+			public const int status = 2131297056;
 			
-			// aapt resource value: 0x7F090369
-			public const int statusbarutil_fake_status_bar_view = 2131297129;
+			// aapt resource value: 0x7F090322
+			public const int statusbarutil_fake_status_bar_view = 2131297058;
 			
-			// aapt resource value: 0x7F09036A
-			public const int statusbarutil_translucent_view = 2131297130;
+			// aapt resource value: 0x7F090323
+			public const int statusbarutil_translucent_view = 2131297059;
 			
-			// aapt resource value: 0x7F090368
-			public const int status_bar_latest_event_content = 2131297128;
+			// aapt resource value: 0x7F090321
+			public const int status_bar_latest_event_content = 2131297057;
 			
-			// aapt resource value: 0x7F09036B
-			public const int stop = 2131297131;
+			// aapt resource value: 0x7F090324
+			public const int stop = 2131297060;
 			
-			// aapt resource value: 0x7F09036C
-			public const int stopAVMsg = 2131297132;
+			// aapt resource value: 0x7F090325
+			public const int stopAVMsg = 2131297061;
 			
-			// aapt resource value: 0x7F09036D
-			public const int stopDoorKey = 2131297133;
+			// aapt resource value: 0x7F090326
+			public const int stopDoorKey = 2131297062;
 			
-			// aapt resource value: 0x7F09036E
-			public const int stopLocalRecord = 2131297134;
+			// aapt resource value: 0x7F090327
+			public const int stopLocalRecord = 2131297063;
 			
-			// aapt resource value: 0x7F09036F
-			public const int stopReadCard = 2131297135;
+			// aapt resource value: 0x7F090328
+			public const int stopReadCard = 2131297064;
 			
-			// aapt resource value: 0x7F090370
-			public const int stopRecord = 2131297136;
+			// aapt resource value: 0x7F090329
+			public const int stopRecord = 2131297065;
 			
-			// aapt resource value: 0x7F090371
-			public const int stopRecordLocalAudio = 2131297137;
+			// aapt resource value: 0x7F09032A
+			public const int stopRecordLocalAudio = 2131297066;
 			
-			// aapt resource value: 0x7F090372
-			public const int stopRecordPeerAudio = 2131297138;
+			// aapt resource value: 0x7F09032B
+			public const int stopRecordPeerAudio = 2131297067;
 			
-			// aapt resource value: 0x7F090373
-			public const int stopStream = 2131297139;
+			// aapt resource value: 0x7F09032C
+			public const int stopStream = 2131297068;
 			
-			// aapt resource value: 0x7F090374
-			public const int stopWatchDog = 2131297140;
+			// aapt resource value: 0x7F09032D
+			public const int stopWatchDog = 2131297069;
 			
-			// aapt resource value: 0x7F090375
-			public const int stretch = 2131297141;
+			// aapt resource value: 0x7F09032E
+			public const int stretch = 2131297070;
 			
 			// aapt resource value: 0x7F090010
 			public const int STROKE = 2131296272;
 			
-			// aapt resource value: 0x7F090377
-			public const int submenuarrow = 2131297143;
+			// aapt resource value: 0x7F090330
+			public const int submenuarrow = 2131297072;
 			
-			// aapt resource value: 0x7F090378
-			public const int submit_area = 2131297144;
+			// aapt resource value: 0x7F090331
+			public const int submit_area = 2131297073;
 			
-			// aapt resource value: 0x7F090379
-			public const int subtitle = 2131297145;
+			// aapt resource value: 0x7F090332
+			public const int subtitle = 2131297074;
 			
-			// aapt resource value: 0x7F090376
-			public const int sub_tv = 2131297142;
+			// aapt resource value: 0x7F09032F
+			public const int sub_tv = 2131297071;
 			
-			// aapt resource value: 0x7F09037A
-			public const int supportScrollUp = 2131297146;
+			// aapt resource value: 0x7F090333
+			public const int supportScrollUp = 2131297075;
 			
-			// aapt resource value: 0x7F09037B
-			public const int switch_tv = 2131297147;
+			// aapt resource value: 0x7F090334
+			public const int switch_tv = 2131297076;
 			
-			// aapt resource value: 0x7F09037C
-			public const int switch_wifi = 2131297148;
+			// aapt resource value: 0x7F090335
+			public const int switch_wifi = 2131297077;
 			
 			// aapt resource value: 0x7F090011
 			public const int SYM = 2131296273;
 			
-			// aapt resource value: 0x7F09037E
-			public const int tablet = 2131297150;
+			// aapt resource value: 0x7F090337
+			public const int tablet = 2131297079;
 			
-			// aapt resource value: 0x7F09037D
-			public const int tabMode = 2131297149;
+			// aapt resource value: 0x7F090336
+			public const int tabMode = 2131297078;
 			
-			// aapt resource value: 0x7F09037F
-			public const int tag_accessibility_actions = 2131297151;
+			// aapt resource value: 0x7F090338
+			public const int tag_accessibility_actions = 2131297080;
 			
-			// aapt resource value: 0x7F090380
-			public const int tag_accessibility_clickable_spans = 2131297152;
+			// aapt resource value: 0x7F090339
+			public const int tag_accessibility_clickable_spans = 2131297081;
 			
-			// aapt resource value: 0x7F090381
-			public const int tag_accessibility_heading = 2131297153;
+			// aapt resource value: 0x7F09033A
+			public const int tag_accessibility_heading = 2131297082;
 			
-			// aapt resource value: 0x7F090382
-			public const int tag_accessibility_pane_title = 2131297154;
+			// aapt resource value: 0x7F09033B
+			public const int tag_accessibility_pane_title = 2131297083;
 			
-			// aapt resource value: 0x7F090383
-			public const int tag_left = 2131297155;
+			// aapt resource value: 0x7F09033C
+			public const int tag_left = 2131297084;
 			
-			// aapt resource value: 0x7F090384
-			public const int tag_on_apply_window_listener = 2131297156;
+			// aapt resource value: 0x7F09033D
+			public const int tag_on_apply_window_listener = 2131297085;
 			
-			// aapt resource value: 0x7F090385
-			public const int tag_on_receive_content_listener = 2131297157;
+			// aapt resource value: 0x7F09033E
+			public const int tag_on_receive_content_listener = 2131297086;
 			
-			// aapt resource value: 0x7F090386
-			public const int tag_on_receive_content_mime_types = 2131297158;
+			// aapt resource value: 0x7F09033F
+			public const int tag_on_receive_content_mime_types = 2131297087;
 			
-			// aapt resource value: 0x7F090387
-			public const int tag_right = 2131297159;
+			// aapt resource value: 0x7F090340
+			public const int tag_right = 2131297088;
 			
-			// aapt resource value: 0x7F090388
-			public const int tag_screen_reader_focusable = 2131297160;
+			// aapt resource value: 0x7F090341
+			public const int tag_screen_reader_focusable = 2131297089;
 			
-			// aapt resource value: 0x7F090389
-			public const int tag_state_description = 2131297161;
+			// aapt resource value: 0x7F090342
+			public const int tag_state_description = 2131297090;
 			
-			// aapt resource value: 0x7F09038A
-			public const int tag_transition_group = 2131297162;
+			// aapt resource value: 0x7F090343
+			public const int tag_transition_group = 2131297091;
 			
-			// aapt resource value: 0x7F09038B
-			public const int tag_unhandled_key_event_manager = 2131297163;
+			// aapt resource value: 0x7F090344
+			public const int tag_unhandled_key_event_manager = 2131297092;
 			
-			// aapt resource value: 0x7F09038C
-			public const int tag_unhandled_key_listeners = 2131297164;
+			// aapt resource value: 0x7F090345
+			public const int tag_unhandled_key_listeners = 2131297093;
 			
-			// aapt resource value: 0x7F09038D
-			public const int tag_window_insets_animation_callback = 2131297165;
+			// aapt resource value: 0x7F090346
+			public const int tag_window_insets_animation_callback = 2131297094;
 			
-			// aapt resource value: 0x7F09038E
-			public const int test = 2131297166;
+			// aapt resource value: 0x7F090347
+			public const int test = 2131297095;
 			
-			// aapt resource value: 0x7F09038F
-			public const int testWatchDogReboot = 2131297167;
+			// aapt resource value: 0x7F090348
+			public const int testWatchDogReboot = 2131297096;
 			
-			// aapt resource value: 0x7F090390
-			public const int text = 2131297168;
+			// aapt resource value: 0x7F090349
+			public const int text = 2131297097;
 			
-			// aapt resource value: 0x7F090391
-			public const int text2 = 2131297169;
+			// aapt resource value: 0x7F09034A
+			public const int text2 = 2131297098;
 			
-			// aapt resource value: 0x7F090392
-			public const int textEnd = 2131297170;
+			// aapt resource value: 0x7F09034B
+			public const int textEnd = 2131297099;
 			
-			// aapt resource value: 0x7F09039A
-			public const int textinput_counter = 2131297178;
+			// aapt resource value: 0x7F090353
+			public const int textinput_counter = 2131297107;
 			
-			// aapt resource value: 0x7F09039B
-			public const int textinput_error = 2131297179;
+			// aapt resource value: 0x7F090354
+			public const int textinput_error = 2131297108;
 			
-			// aapt resource value: 0x7F09039C
-			public const int textinput_helper_text = 2131297180;
+			// aapt resource value: 0x7F090355
+			public const int textinput_helper_text = 2131297109;
 			
-			// aapt resource value: 0x7F09039D
-			public const int textinput_placeholder = 2131297181;
+			// aapt resource value: 0x7F090356
+			public const int textinput_placeholder = 2131297110;
 			
-			// aapt resource value: 0x7F09039E
-			public const int textinput_prefix_text = 2131297182;
+			// aapt resource value: 0x7F090357
+			public const int textinput_prefix_text = 2131297111;
 			
-			// aapt resource value: 0x7F09039F
-			public const int textinput_suffix_text = 2131297183;
+			// aapt resource value: 0x7F090358
+			public const int textinput_suffix_text = 2131297112;
 			
-			// aapt resource value: 0x7F090393
-			public const int textSpacerNoButtons = 2131297171;
+			// aapt resource value: 0x7F09034C
+			public const int textSpacerNoButtons = 2131297100;
 			
-			// aapt resource value: 0x7F090394
-			public const int textSpacerNoTitle = 2131297172;
+			// aapt resource value: 0x7F09034D
+			public const int textSpacerNoTitle = 2131297101;
 			
-			// aapt resource value: 0x7F090395
-			public const int textStart = 2131297173;
+			// aapt resource value: 0x7F09034E
+			public const int textStart = 2131297102;
 			
-			// aapt resource value: 0x7F090396
-			public const int textTop = 2131297174;
+			// aapt resource value: 0x7F09034F
+			public const int textTop = 2131297103;
 			
-			// aapt resource value: 0x7F090397
-			public const int text_input_end_icon = 2131297175;
+			// aapt resource value: 0x7F090350
+			public const int text_input_end_icon = 2131297104;
 			
-			// aapt resource value: 0x7F090398
-			public const int text_input_error_icon = 2131297176;
+			// aapt resource value: 0x7F090351
+			public const int text_input_error_icon = 2131297105;
 			
-			// aapt resource value: 0x7F090399
-			public const int text_input_start_icon = 2131297177;
+			// aapt resource value: 0x7F090352
+			public const int text_input_start_icon = 2131297106;
 			
-			// aapt resource value: 0x7F0903A0
-			public const int time = 2131297184;
+			// aapt resource value: 0x7F090359
+			public const int time = 2131297113;
 			
-			// aapt resource value: 0x7F0903A1
-			public const int timepicker = 2131297185;
+			// aapt resource value: 0x7F09035A
+			public const int timepicker = 2131297114;
 			
-			// aapt resource value: 0x7F0903A2
-			public const int timer_lp_calltime = 2131297186;
+			// aapt resource value: 0x7F09035B
+			public const int timer_lp_calltime = 2131297115;
 			
-			// aapt resource value: 0x7F0903A3
-			public const int tip = 2131297187;
+			// aapt resource value: 0x7F09035C
+			public const int tip = 2131297116;
 			
-			// aapt resource value: 0x7F0903A4
-			public const int tip1 = 2131297188;
+			// aapt resource value: 0x7F09035D
+			public const int tip1 = 2131297117;
 			
-			// aapt resource value: 0x7F0903A5
-			public const int tip2_txt = 2131297189;
+			// aapt resource value: 0x7F09035E
+			public const int tip2_txt = 2131297118;
 			
-			// aapt resource value: 0x7F0903A6
-			public const int tip_img = 2131297190;
+			// aapt resource value: 0x7F09035F
+			public const int tip_img = 2131297119;
 			
-			// aapt resource value: 0x7F0903A7
-			public const int tip_txt = 2131297191;
+			// aapt resource value: 0x7F090360
+			public const int tip_txt = 2131297120;
 			
-			// aapt resource value: 0x7F0903A8
-			public const int tip_txt2 = 2131297192;
+			// aapt resource value: 0x7F090361
+			public const int tip_txt2 = 2131297121;
 			
-			// aapt resource value: 0x7F0903A9
-			public const int tip_txt_1 = 2131297193;
+			// aapt resource value: 0x7F090362
+			public const int tip_txt_1 = 2131297122;
 			
-			// aapt resource value: 0x7F0903AA
-			public const int tip_wifi_pwd_error = 2131297194;
+			// aapt resource value: 0x7F090363
+			public const int tip_wifi_pwd_error = 2131297123;
 			
-			// aapt resource value: 0x7F0903AB
-			public const int title = 2131297195;
+			// aapt resource value: 0x7F090364
+			public const int title = 2131297124;
 			
-			// aapt resource value: 0x7F0903AC
-			public const int titleDividerNoCustom = 2131297196;
+			// aapt resource value: 0x7F090365
+			public const int titleDividerNoCustom = 2131297125;
 			
-			// aapt resource value: 0x7F0903AD
-			public const int title_template = 2131297197;
+			// aapt resource value: 0x7F090366
+			public const int title_template = 2131297126;
 			
-			// aapt resource value: 0x7F0903AE
-			public const int title_tv = 2131297198;
+			// aapt resource value: 0x7F090367
+			public const int title_tv = 2131297127;
 			
-			// aapt resource value: 0x7F0903AF
-			public const int toggle = 2131297199;
+			// aapt resource value: 0x7F090368
+			public const int toggle = 2131297128;
 			
-			// aapt resource value: 0x7F0903B0
-			public const int top = 2131297200;
+			// aapt resource value: 0x7F090369
+			public const int top = 2131297129;
 			
-			// aapt resource value: 0x7F0903B1
-			public const int topPanel = 2131297201;
+			// aapt resource value: 0x7F09036A
+			public const int topPanel = 2131297130;
 			
-			// aapt resource value: 0x7F0903B2
-			public const int topToBottom = 2131297202;
+			// aapt resource value: 0x7F09036B
+			public const int topToBottom = 2131297131;
 			
-			// aapt resource value: 0x7F0903B3
-			public const int top_bar = 2131297203;
+			// aapt resource value: 0x7F09036C
+			public const int top_bar = 2131297132;
 			
-			// aapt resource value: 0x7F0903B4
-			public const int top_container = 2131297204;
+			// aapt resource value: 0x7F09036D
+			public const int top_container = 2131297133;
 			
 			// aapt resource value: 0x7F090013
 			public const int TOP_END = 2131296275;
 			
-			// aapt resource value: 0x7F0903B5
-			public const int top_img_container = 2131297205;
+			// aapt resource value: 0x7F09036E
+			public const int top_img_container = 2131297134;
 			
-			// aapt resource value: 0x7F0903B6
-			public const int top_line = 2131297206;
+			// aapt resource value: 0x7F09036F
+			public const int top_line = 2131297135;
 			
 			// aapt resource value: 0x7F090014
 			public const int TOP_START = 2131296276;
 			
-			// aapt resource value: 0x7F0903B7
-			public const int touch_outside = 2131297207;
+			// aapt resource value: 0x7F090370
+			public const int touch_outside = 2131297136;
 			
-			// aapt resource value: 0x7F0903B8
-			public const int transitionToEnd = 2131297208;
+			// aapt resource value: 0x7F090371
+			public const int transitionToEnd = 2131297137;
 			
-			// aapt resource value: 0x7F0903B9
-			public const int transitionToStart = 2131297209;
+			// aapt resource value: 0x7F090372
+			public const int transitionToStart = 2131297138;
 			
-			// aapt resource value: 0x7F0903BA
-			public const int transition_current_scene = 2131297210;
+			// aapt resource value: 0x7F090373
+			public const int transition_current_scene = 2131297139;
 			
-			// aapt resource value: 0x7F0903BB
-			public const int transition_layout_save = 2131297211;
+			// aapt resource value: 0x7F090374
+			public const int transition_layout_save = 2131297140;
 			
-			// aapt resource value: 0x7F0903BC
-			public const int transition_position = 2131297212;
+			// aapt resource value: 0x7F090375
+			public const int transition_position = 2131297141;
 			
-			// aapt resource value: 0x7F0903BD
-			public const int transition_scene_layoutid_cache = 2131297213;
+			// aapt resource value: 0x7F090376
+			public const int transition_scene_layoutid_cache = 2131297142;
 			
-			// aapt resource value: 0x7F0903BE
-			public const int transition_transform = 2131297214;
+			// aapt resource value: 0x7F090377
+			public const int transition_transform = 2131297143;
 			
 			// aapt resource value: 0x7F090015
 			public const int Translate = 2131296277;
 			
+			// aapt resource value: 0x7F090378
+			public const int triangle = 2131297144;
+			
+			// aapt resource value: 0x7F090379
+			public const int tvFormat_sd = 2131297145;
+			
+			// aapt resource value: 0x7F09037A
+			public const int tvTitle = 2131297146;
+			
+			// aapt resource value: 0x7F09037B
+			public const int tv_5g_tip = 2131297147;
+			
+			// aapt resource value: 0x7F09037C
+			public const int tv_about_wifi_pwd = 2131297148;
+			
+			// aapt resource value: 0x7F09037D
+			public const int tv_action1 = 2131297149;
+			
+			// aapt resource value: 0x7F09037E
+			public const int tv_all = 2131297150;
+			
+			// aapt resource value: 0x7F09037F
+			public const int tv_ap_sn = 2131297151;
+			
+			// aapt resource value: 0x7F090380
+			public const int tv_cancel = 2131297152;
+			
+			// aapt resource value: 0x7F090381
+			public const int tv_choose_other = 2131297153;
+			
+			// aapt resource value: 0x7F090382
+			public const int tv_cloud_record = 2131297154;
+			
+			// aapt resource value: 0x7F090383
+			public const int tv_cloud_video = 2131297155;
+			
+			// aapt resource value: 0x7F090384
+			public const int tv_content = 2131297156;
+			
+			// aapt resource value: 0x7F090385
+			public const int tv_content_tip = 2131297157;
+			
+			// aapt resource value: 0x7F090386
+			public const int tv_cover_stream = 2131297158;
+			
+			// aapt resource value: 0x7F090388
+			public const int tv_current_version_tip = 2131297160;
+			
+			// aapt resource value: 0x7F090389
+			public const int tv_current_wifi = 2131297161;
+			
+			// aapt resource value: 0x7F090387
+			public const int tv_cur_wifi_tip = 2131297159;
+			
+			// aapt resource value: 0x7F09038A
+			public const int tv_delete = 2131297162;
+			
+			// aapt resource value: 0x7F09038B
+			public const int tv_deployment_tip = 2131297163;
+			
+			// aapt resource value: 0x7F09038C
+			public const int tv_device_current_version = 2131297164;
+			
+			// aapt resource value: 0x7F09038D
+			public const int tv_device_info = 2131297165;
+			
+			// aapt resource value: 0x7F09038E
+			public const int tv_device_name = 2131297166;
+			
+			// aapt resource value: 0x7F09038F
+			public const int tv_device_name_tip = 2131297167;
+			
+			// aapt resource value: 0x7F090390
+			public const int tv_device_serial = 2131297168;
+			
+			// aapt resource value: 0x7F090391
+			public const int tv_device_serial_tip = 2131297169;
+			
+			// aapt resource value: 0x7F090392
+			public const int tv_device_type = 2131297170;
+			
+			// aapt resource value: 0x7F090393
+			public const int tv_device_version = 2131297171;
+			
+			// aapt resource value: 0x7F090394
+			public const int tv_edit = 2131297172;
+			
+			// aapt resource value: 0x7F090395
+			public const int tv_flash = 2131297173;
+			
+			// aapt resource value: 0x7F090396
+			public const int tv_goto_connect = 2131297174;
+			
+			// aapt resource value: 0x7F090397
+			public const int tv_help_phone = 2131297175;
+			
+			// aapt resource value: 0x7F090398
+			public const int tv_image_show_tip = 2131297176;
+			
+			// aapt resource value: 0x7F090399
+			public const int tv_init = 2131297177;
+			
+			// aapt resource value: 0x7F09039A
+			public const int tv_input_ok = 2131297178;
+			
+			// aapt resource value: 0x7F09039B
+			public const int tv_lan = 2131297179;
+			
+			// aapt resource value: 0x7F09039C
+			public const int tv_left_btn = 2131297180;
+			
+			// aapt resource value: 0x7F09039E
+			public const int tv_loadingmore = 2131297182;
+			
+			// aapt resource value: 0x7F09039D
+			public const int tv_loading_msg = 2131297181;
+			
+			// aapt resource value: 0x7F09039F
+			public const int tv_local_record = 2131297183;
+			
+			// aapt resource value: 0x7F0903A0
+			public const int tv_local_video = 2131297184;
+			
+			// aapt resource value: 0x7F0903A1
+			public const int tv_lp_answer = 2131297185;
+			
+			// aapt resource value: 0x7F0903A2
+			public const int tv_lp_calltime = 2131297186;
+			
+			// aapt resource value: 0x7F0903A3
+			public const int tv_lp_hangUp = 2131297187;
+			
+			// aapt resource value: 0x7F0903A4
+			public const int tv_lp_screenshot = 2131297188;
+			
+			// aapt resource value: 0x7F0903A5
+			public const int tv_lp_title = 2131297189;
+			
+			// aapt resource value: 0x7F0903A6
+			public const int tv_lp_unlock = 2131297190;
+			
+			// aapt resource value: 0x7F0903A7
+			public const int tv_message = 2131297191;
+			
+			// aapt resource value: 0x7F0903A8
+			public const int tv_message2 = 2131297192;
+			
+			// aapt resource value: 0x7F0903A9
+			public const int tv_modify_device_pwd = 2131297193;
+			
+			// aapt resource value: 0x7F0903AA
+			public const int tv_month_day = 2131297194;
+			
+			// aapt resource value: 0x7F0903AB
+			public const int tv_msg = 2131297195;
+			
+			// aapt resource value: 0x7F0903AC
+			public const int tv_name = 2131297196;
+			
+			// aapt resource value: 0x7F0903AD
+			public const int tv_name_input = 2131297197;
+			
+			// aapt resource value: 0x7F0903AE
+			public const int tv_new_version = 2131297198;
+			
+			// aapt resource value: 0x7F0903AF
+			public const int tv_new_version_1 = 2131297199;
+			
+			// aapt resource value: 0x7F0903B0
+			public const int tv_new_version_tip = 2131297200;
+			
+			// aapt resource value: 0x7F0903B1
+			public const int tv_next = 2131297201;
+			
+			// aapt resource value: 0x7F0903B2
+			public const int tv_no_video = 2131297202;
+			
+			// aapt resource value: 0x7F0903B3
+			public const int tv_offline = 2131297203;
+			
+			// aapt resource value: 0x7F0903B4
+			public const int tv_ok = 2131297204;
+			
+			// aapt resource value: 0x7F0903B5
+			public const int tv_overseas = 2131297205;
+			
+			// aapt resource value: 0x7F0903B6
+			public const int tv_pixel = 2131297206;
+			
+			// aapt resource value: 0x7F0903B7
+			public const int tv_play_pixel = 2131297207;
+			
+			// aapt resource value: 0x7F0903B8
+			public const int tv_pwd_tip_new = 2131297208;
+			
+			// aapt resource value: 0x7F0903B9
+			public const int tv_record_stream = 2131297209;
+			
+			// aapt resource value: 0x7F0903BA
+			public const int tv_right_btn = 2131297210;
+			
+			// aapt resource value: 0x7F0903BB
+			public const int tv_show_tip = 2131297211;
+			
+			// aapt resource value: 0x7F0903BC
+			public const int tv_single_btn = 2131297212;
+			
+			// aapt resource value: 0x7F0903BD
+			public const int tv_sms_valid_tip = 2131297213;
+			
+			// aapt resource value: 0x7F0903BE
+			public const int tv_softap = 2131297214;
+			
 			// aapt resource value: 0x7F0903BF
-			public const int triangle = 2131297215;
+			public const int tv_sure = 2131297215;
 			
 			// aapt resource value: 0x7F0903C0
-			public const int tvFormat_sd = 2131297216;
+			public const int tv_time = 2131297216;
 			
 			// aapt resource value: 0x7F0903C1
-			public const int tvRichpushTitle = 2131297217;
+			public const int tv_time_m = 2131297217;
 			
 			// aapt resource value: 0x7F0903C2
-			public const int tvTitle = 2131297218;
+			public const int tv_time_s = 2131297218;
 			
 			// aapt resource value: 0x7F0903C3
-			public const int tv_5g_tip = 2131297219;
+			public const int tv_tip = 2131297219;
 			
 			// aapt resource value: 0x7F0903C4
-			public const int tv_about_wifi_pwd = 2131297220;
+			public const int tv_tip_title = 2131297220;
 			
 			// aapt resource value: 0x7F0903C5
-			public const int tv_action1 = 2131297221;
+			public const int tv_title = 2131297221;
 			
 			// aapt resource value: 0x7F0903C6
-			public const int tv_all = 2131297222;
+			public const int tv_title_center = 2131297222;
 			
 			// aapt resource value: 0x7F0903C7
-			public const int tv_ap_sn = 2131297223;
+			public const int tv_title_center_sub = 2131297223;
 			
 			// aapt resource value: 0x7F0903C8
-			public const int tv_cancel = 2131297224;
+			public const int tv_title_cn = 2131297224;
 			
 			// aapt resource value: 0x7F0903C9
-			public const int tv_choose_other = 2131297225;
+			public const int tv_title_left = 2131297225;
 			
 			// aapt resource value: 0x7F0903CA
-			public const int tv_cloud_record = 2131297226;
+			public const int tv_title_left2 = 2131297226;
 			
 			// aapt resource value: 0x7F0903CB
-			public const int tv_cloud_video = 2131297227;
+			public const int tv_title_right = 2131297227;
 			
 			// aapt resource value: 0x7F0903CC
-			public const int tv_content = 2131297228;
+			public const int tv_title_right2 = 2131297228;
 			
 			// aapt resource value: 0x7F0903CD
-			public const int tv_content_tip = 2131297229;
+			public const int tv_title_type = 2131297229;
 			
 			// aapt resource value: 0x7F0903CE
-			public const int tv_cover_stream = 2131297230;
-			
-			// aapt resource value: 0x7F0903D0
-			public const int tv_current_version_tip = 2131297232;
-			
-			// aapt resource value: 0x7F0903D1
-			public const int tv_current_wifi = 2131297233;
+			public const int tv_today = 2131297230;
 			
 			// aapt resource value: 0x7F0903CF
-			public const int tv_cur_wifi_tip = 2131297231;
+			public const int tv_type_tip = 2131297231;
+			
+			// aapt resource value: 0x7F0903D0
+			public const int tv_version_tip = 2131297232;
+			
+			// aapt resource value: 0x7F0903D1
+			public const int tv_wifi_name = 2131297233;
 			
 			// aapt resource value: 0x7F0903D2
-			public const int tv_delete = 2131297234;
+			public const int tv_wifi_pwd = 2131297234;
 			
 			// aapt resource value: 0x7F0903D3
-			public const int tv_deployment_tip = 2131297235;
+			public const int tv_wlan = 2131297235;
 			
 			// aapt resource value: 0x7F0903D4
-			public const int tv_device_current_version = 2131297236;
+			public const int tv_zxing_back = 2131297236;
 			
 			// aapt resource value: 0x7F0903D5
-			public const int tv_device_info = 2131297237;
+			public const int tv_zxing_flash = 2131297237;
 			
 			// aapt resource value: 0x7F0903D6
-			public const int tv_device_name = 2131297238;
+			public const int tv_zxing_scan = 2131297238;
 			
 			// aapt resource value: 0x7F0903D7
-			public const int tv_device_name_tip = 2131297239;
+			public const int two_button_layout = 2131297239;
 			
 			// aapt resource value: 0x7F0903D8
-			public const int tv_device_serial = 2131297240;
+			public const int @unchecked = 2131297240;
 			
 			// aapt resource value: 0x7F0903D9
-			public const int tv_device_serial_tip = 2131297241;
+			public const int uniform = 2131297241;
 			
 			// aapt resource value: 0x7F0903DA
-			public const int tv_device_type = 2131297242;
+			public const int unlabeled = 2131297242;
 			
 			// aapt resource value: 0x7F0903DB
-			public const int tv_device_version = 2131297243;
+			public const int up = 2131297243;
 			
 			// aapt resource value: 0x7F0903DC
-			public const int tv_edit = 2131297244;
+			public const int useLogo = 2131297244;
 			
 			// aapt resource value: 0x7F0903DD
-			public const int tv_flash = 2131297245;
+			public const int user_layout = 2131297245;
 			
 			// aapt resource value: 0x7F0903DE
-			public const int tv_goto_connect = 2131297246;
+			public const int user_register = 2131297246;
 			
 			// aapt resource value: 0x7F0903DF
-			public const int tv_help_phone = 2131297247;
-			
-			// aapt resource value: 0x7F0903E0
-			public const int tv_image_show_tip = 2131297248;
+			public const int uvc = 2131297247;
 			
 			// aapt resource value: 0x7F0903E1
-			public const int tv_init = 2131297249;
+			public const int vertical_only = 2131297249;
 			
 			// aapt resource value: 0x7F0903E2
-			public const int tv_input_ok = 2131297250;
+			public const int videoBackImg = 2131297250;
 			
 			// aapt resource value: 0x7F0903E3
-			public const int tv_lan = 2131297251;
+			public const int videoParent = 2131297251;
 			
 			// aapt resource value: 0x7F0903E4
-			public const int tv_left_btn = 2131297252;
-			
-			// aapt resource value: 0x7F0903E6
-			public const int tv_loadingmore = 2131297254;
+			public const int video_lp_rendering = 2131297252;
 			
 			// aapt resource value: 0x7F0903E5
-			public const int tv_loading_msg = 2131297253;
+			public const int video_lp_rendering2 = 2131297253;
+			
+			// aapt resource value: 0x7F0903E6
+			public const int view_offset_helper = 2131297254;
 			
 			// aapt resource value: 0x7F0903E7
-			public const int tv_local_record = 2131297255;
+			public const int view_split = 2131297255;
 			
 			// aapt resource value: 0x7F0903E8
-			public const int tv_local_video = 2131297256;
+			public const int view_transition = 2131297256;
 			
 			// aapt resource value: 0x7F0903E9
-			public const int tv_lp_answer = 2131297257;
+			public const int view_tree_lifecycle_owner = 2131297257;
 			
 			// aapt resource value: 0x7F0903EA
-			public const int tv_lp_calltime = 2131297258;
+			public const int view_tree_on_back_pressed_dispatcher_owner = 2131297258;
 			
 			// aapt resource value: 0x7F0903EB
-			public const int tv_lp_hangUp = 2131297259;
+			public const int view_tree_saved_state_registry_owner = 2131297259;
 			
 			// aapt resource value: 0x7F0903EC
-			public const int tv_lp_screenshot = 2131297260;
+			public const int view_tree_view_model_store_owner = 2131297260;
 			
 			// aapt resource value: 0x7F0903ED
-			public const int tv_lp_title = 2131297261;
+			public const int visible = 2131297261;
 			
 			// aapt resource value: 0x7F0903EE
-			public const int tv_lp_unlock = 2131297262;
+			public const int visible_removing_fragment_view_tag = 2131297262;
 			
-			// aapt resource value: 0x7F0903EF
-			public const int tv_message = 2131297263;
+			// aapt resource value: 0x7F0903E0
+			public const int v_bottom_line = 2131297248;
 			
 			// aapt resource value: 0x7F0903F0
-			public const int tv_message2 = 2131297264;
+			public const int webview = 2131297264;
+			
+			// aapt resource value: 0x7F0903EF
+			public const int webView1 = 2131297263;
 			
 			// aapt resource value: 0x7F0903F1
-			public const int tv_modify_device_pwd = 2131297265;
+			public const int webview_back_img = 2131297265;
 			
 			// aapt resource value: 0x7F0903F2
-			public const int tv_month_day = 2131297266;
+			public const int webview_back_ll = 2131297266;
 			
 			// aapt resource value: 0x7F0903F3
-			public const int tv_msg = 2131297267;
+			public const int west = 2131297267;
 			
 			// aapt resource value: 0x7F0903F4
-			public const int tv_name = 2131297268;
+			public const int wheel_vertical_view = 2131297268;
 			
 			// aapt resource value: 0x7F0903F5
-			public const int tv_name_input = 2131297269;
+			public const int wifi_animation_view = 2131297269;
 			
 			// aapt resource value: 0x7F0903F6
-			public const int tv_new_version = 2131297270;
+			public const int wifi_img = 2131297270;
 			
 			// aapt resource value: 0x7F0903F7
-			public const int tv_new_version_1 = 2131297271;
+			public const int wifi_list = 2131297271;
 			
 			// aapt resource value: 0x7F0903F8
-			public const int tv_new_version_tip = 2131297272;
+			public const int wifi_list_container = 2131297272;
 			
 			// aapt resource value: 0x7F0903F9
-			public const int tv_next = 2131297273;
+			public const int wifi_name = 2131297273;
 			
 			// aapt resource value: 0x7F0903FA
-			public const int tv_no_video = 2131297274;
+			public const int wifi_psw = 2131297274;
 			
 			// aapt resource value: 0x7F0903FB
-			public const int tv_offline = 2131297275;
+			public const int wifi_pwd = 2131297275;
 			
 			// aapt resource value: 0x7F0903FC
-			public const int tv_ok = 2131297276;
+			public const int wifi_pwd_check = 2131297276;
 			
 			// aapt resource value: 0x7F0903FD
-			public const int tv_overseas = 2131297277;
+			public const int wifi_quality_icon = 2131297277;
 			
 			// aapt resource value: 0x7F0903FE
-			public const int tv_pixel = 2131297278;
-			
-			// aapt resource value: 0x7F0903FF
-			public const int tv_play_pixel = 2131297279;
-			
-			// aapt resource value: 0x7F090400
-			public const int tv_pwd_tip_new = 2131297280;
+			public const int wifi_ssid = 2131297278;
 			
 			// aapt resource value: 0x7F090401
-			public const int tv_record_stream = 2131297281;
+			public const int withinBounds = 2131297281;
+			
+			// aapt resource value: 0x7F0903FF
+			public const int withText = 2131297279;
+			
+			// aapt resource value: 0x7F090400
+			public const int with_icon = 2131297280;
 			
 			// aapt resource value: 0x7F090402
-			public const int tv_right_btn = 2131297282;
+			public const int wlan_len = 2131297282;
 			
 			// aapt resource value: 0x7F090403
-			public const int tv_show_tip = 2131297283;
+			public const int wlan_mode = 2131297283;
 			
 			// aapt resource value: 0x7F090404
-			public const int tv_single_btn = 2131297284;
+			public const int wlan_name = 2131297284;
 			
 			// aapt resource value: 0x7F090405
-			public const int tv_sms_valid_tip = 2131297285;
+			public const int wrap = 2131297285;
 			
 			// aapt resource value: 0x7F090406
-			public const int tv_softap = 2131297286;
+			public const int wrap_content = 2131297286;
 			
 			// aapt resource value: 0x7F090407
-			public const int tv_sure = 2131297287;
+			public const int wrap_content_constrained = 2131297287;
 			
 			// aapt resource value: 0x7F090408
-			public const int tv_time = 2131297288;
+			public const int x_left = 2131297288;
 			
 			// aapt resource value: 0x7F090409
-			public const int tv_time_m = 2131297289;
+			public const int x_right = 2131297289;
 			
 			// aapt resource value: 0x7F09040A
-			public const int tv_time_s = 2131297290;
+			public const int year = 2131297290;
 			
 			// aapt resource value: 0x7F09040B
-			public const int tv_tip = 2131297291;
+			public const int zoomin = 2131297291;
 			
 			// aapt resource value: 0x7F09040C
-			public const int tv_tip_title = 2131297292;
+			public const int zoomout = 2131297292;
 			
 			// aapt resource value: 0x7F09040D
-			public const int tv_title = 2131297293;
+			public const int zxing_back_button = 2131297293;
 			
 			// aapt resource value: 0x7F09040E
-			public const int tv_title_center = 2131297294;
+			public const int zxing_barcode_scanner = 2131297294;
 			
 			// aapt resource value: 0x7F09040F
-			public const int tv_title_center_sub = 2131297295;
+			public const int zxing_barcode_surface = 2131297295;
 			
 			// aapt resource value: 0x7F090410
-			public const int tv_title_cn = 2131297296;
+			public const int zxing_camera_closed = 2131297296;
 			
 			// aapt resource value: 0x7F090411
-			public const int tv_title_left = 2131297297;
+			public const int zxing_camera_error = 2131297297;
 			
 			// aapt resource value: 0x7F090412
-			public const int tv_title_left2 = 2131297298;
+			public const int zxing_decode = 2131297298;
 			
 			// aapt resource value: 0x7F090413
-			public const int tv_title_right = 2131297299;
+			public const int zxing_decode_failed = 2131297299;
 			
 			// aapt resource value: 0x7F090414
-			public const int tv_title_right2 = 2131297300;
+			public const int zxing_decode_succeeded = 2131297300;
 			
 			// aapt resource value: 0x7F090415
-			public const int tv_title_type = 2131297301;
+			public const int zxing_possible_result_points = 2131297301;
 			
 			// aapt resource value: 0x7F090416
-			public const int tv_today = 2131297302;
+			public const int zxing_preview_failed = 2131297302;
 			
 			// aapt resource value: 0x7F090417
-			public const int tv_type_tip = 2131297303;
+			public const int zxing_prewiew_size_ready = 2131297303;
 			
 			// aapt resource value: 0x7F090418
-			public const int tv_version_tip = 2131297304;
+			public const int zxing_status_view = 2131297304;
 			
 			// aapt resource value: 0x7F090419
-			public const int tv_wifi_name = 2131297305;
-			
-			// aapt resource value: 0x7F09041A
-			public const int tv_wifi_pwd = 2131297306;
-			
-			// aapt resource value: 0x7F09041B
-			public const int tv_wlan = 2131297307;
-			
-			// aapt resource value: 0x7F09041C
-			public const int tv_zxing_back = 2131297308;
-			
-			// aapt resource value: 0x7F09041D
-			public const int tv_zxing_flash = 2131297309;
-			
-			// aapt resource value: 0x7F09041E
-			public const int tv_zxing_scan = 2131297310;
-			
-			// aapt resource value: 0x7F09041F
-			public const int two_button_layout = 2131297311;
-			
-			// aapt resource value: 0x7F090420
-			public const int @unchecked = 2131297312;
-			
-			// aapt resource value: 0x7F090421
-			public const int uniform = 2131297313;
-			
-			// aapt resource value: 0x7F090422
-			public const int unlabeled = 2131297314;
-			
-			// aapt resource value: 0x7F090423
-			public const int up = 2131297315;
-			
-			// aapt resource value: 0x7F090424
-			public const int useLogo = 2131297316;
-			
-			// aapt resource value: 0x7F090425
-			public const int user_layout = 2131297317;
-			
-			// aapt resource value: 0x7F090426
-			public const int user_register = 2131297318;
-			
-			// aapt resource value: 0x7F090427
-			public const int uvc = 2131297319;
-			
-			// aapt resource value: 0x7F090428
-			public const int v21 = 2131297320;
-			
-			// aapt resource value: 0x7F09042A
-			public const int vertical_only = 2131297322;
-			
-			// aapt resource value: 0x7F09042B
-			public const int videoBackImg = 2131297323;
-			
-			// aapt resource value: 0x7F09042C
-			public const int videoParent = 2131297324;
-			
-			// aapt resource value: 0x7F09042D
-			public const int video_lp_rendering = 2131297325;
-			
-			// aapt resource value: 0x7F09042E
-			public const int video_lp_rendering2 = 2131297326;
-			
-			// aapt resource value: 0x7F09042F
-			public const int view_offset_helper = 2131297327;
-			
-			// aapt resource value: 0x7F090430
-			public const int view_split = 2131297328;
-			
-			// aapt resource value: 0x7F090431
-			public const int view_transition = 2131297329;
-			
-			// aapt resource value: 0x7F090432
-			public const int view_tree_lifecycle_owner = 2131297330;
-			
-			// aapt resource value: 0x7F090433
-			public const int view_tree_on_back_pressed_dispatcher_owner = 2131297331;
-			
-			// aapt resource value: 0x7F090434
-			public const int view_tree_saved_state_registry_owner = 2131297332;
-			
-			// aapt resource value: 0x7F090435
-			public const int view_tree_view_model_store_owner = 2131297333;
-			
-			// aapt resource value: 0x7F090436
-			public const int visible = 2131297334;
-			
-			// aapt resource value: 0x7F090437
-			public const int visible_removing_fragment_view_tag = 2131297335;
-			
-			// aapt resource value: 0x7F090429
-			public const int v_bottom_line = 2131297321;
-			
-			// aapt resource value: 0x7F090439
-			public const int webview = 2131297337;
-			
-			// aapt resource value: 0x7F090438
-			public const int webView1 = 2131297336;
-			
-			// aapt resource value: 0x7F09043A
-			public const int webview_back_img = 2131297338;
-			
-			// aapt resource value: 0x7F09043B
-			public const int webview_back_ll = 2131297339;
-			
-			// aapt resource value: 0x7F09043C
-			public const int west = 2131297340;
-			
-			// aapt resource value: 0x7F09043D
-			public const int wheel_vertical_view = 2131297341;
-			
-			// aapt resource value: 0x7F09043E
-			public const int wifi_animation_view = 2131297342;
-			
-			// aapt resource value: 0x7F09043F
-			public const int wifi_img = 2131297343;
-			
-			// aapt resource value: 0x7F090440
-			public const int wifi_list = 2131297344;
-			
-			// aapt resource value: 0x7F090441
-			public const int wifi_list_container = 2131297345;
-			
-			// aapt resource value: 0x7F090442
-			public const int wifi_name = 2131297346;
-			
-			// aapt resource value: 0x7F090443
-			public const int wifi_psw = 2131297347;
-			
-			// aapt resource value: 0x7F090444
-			public const int wifi_pwd = 2131297348;
-			
-			// aapt resource value: 0x7F090445
-			public const int wifi_pwd_check = 2131297349;
-			
-			// aapt resource value: 0x7F090446
-			public const int wifi_quality_icon = 2131297350;
-			
-			// aapt resource value: 0x7F090447
-			public const int wifi_ssid = 2131297351;
-			
-			// aapt resource value: 0x7F09044A
-			public const int withinBounds = 2131297354;
-			
-			// aapt resource value: 0x7F090448
-			public const int withText = 2131297352;
-			
-			// aapt resource value: 0x7F090449
-			public const int with_icon = 2131297353;
-			
-			// aapt resource value: 0x7F09044B
-			public const int wlan_len = 2131297355;
-			
-			// aapt resource value: 0x7F09044C
-			public const int wlan_mode = 2131297356;
-			
-			// aapt resource value: 0x7F09044D
-			public const int wlan_name = 2131297357;
-			
-			// aapt resource value: 0x7F09044E
-			public const int wrap = 2131297358;
-			
-			// aapt resource value: 0x7F09044F
-			public const int wrap_content = 2131297359;
-			
-			// aapt resource value: 0x7F090450
-			public const int wrap_content_constrained = 2131297360;
-			
-			// aapt resource value: 0x7F090451
-			public const int wvPopwin = 2131297361;
-			
-			// aapt resource value: 0x7F090452
-			public const int x_left = 2131297362;
-			
-			// aapt resource value: 0x7F090453
-			public const int x_right = 2131297363;
-			
-			// aapt resource value: 0x7F090454
-			public const int year = 2131297364;
-			
-			// aapt resource value: 0x7F090455
-			public const int zoomin = 2131297365;
-			
-			// aapt resource value: 0x7F090456
-			public const int zoomout = 2131297366;
-			
-			// aapt resource value: 0x7F090457
-			public const int zxing_back_button = 2131297367;
-			
-			// aapt resource value: 0x7F090458
-			public const int zxing_barcode_scanner = 2131297368;
-			
-			// aapt resource value: 0x7F090459
-			public const int zxing_barcode_surface = 2131297369;
-			
-			// aapt resource value: 0x7F09045A
-			public const int zxing_camera_closed = 2131297370;
-			
-			// aapt resource value: 0x7F09045B
-			public const int zxing_camera_error = 2131297371;
-			
-			// aapt resource value: 0x7F09045C
-			public const int zxing_decode = 2131297372;
-			
-			// aapt resource value: 0x7F09045D
-			public const int zxing_decode_failed = 2131297373;
-			
-			// aapt resource value: 0x7F09045E
-			public const int zxing_decode_succeeded = 2131297374;
-			
-			// aapt resource value: 0x7F09045F
-			public const int zxing_possible_result_points = 2131297375;
-			
-			// aapt resource value: 0x7F090460
-			public const int zxing_preview_failed = 2131297376;
-			
-			// aapt resource value: 0x7F090461
-			public const int zxing_prewiew_size_ready = 2131297377;
-			
-			// aapt resource value: 0x7F090462
-			public const int zxing_status_view = 2131297378;
-			
-			// aapt resource value: 0x7F090463
-			public const int zxing_viewfinder_view = 2131297379;
+			public const int zxing_viewfinder_view = 2131297305;
 			
 			static Id()
 			{
@@ -18747,652 +18295,604 @@
 			public const int activity_device_wifi_password = 2131492901;
 			
 			// aapt resource value: 0x7F0C0026
-			public const int activity_endisable_service = 2131492902;
+			public const int activity_environment_guide = 2131492902;
 			
 			// aapt resource value: 0x7F0C0027
-			public const int activity_environment_guide = 2131492903;
+			public const int activity_error_tip = 2131492903;
 			
 			// aapt resource value: 0x7F0C0028
-			public const int activity_error_tip = 2131492904;
+			public const int activity_hdllinphone_intercom = 2131492904;
 			
 			// aapt resource value: 0x7F0C0029
-			public const int activity_hdllinphone_intercom = 2131492905;
+			public const int activity_hdllinphone_monitor = 2131492905;
 			
 			// aapt resource value: 0x7F0C002A
-			public const int activity_hdllinphone_monitor = 2131492906;
+			public const int activity_main = 2131492906;
 			
 			// aapt resource value: 0x7F0C002B
-			public const int activity_main = 2131492907;
+			public const int activity_splash = 2131492907;
 			
 			// aapt resource value: 0x7F0C002C
-			public const int activity_splash = 2131492908;
+			public const int activity_video_phone = 2131492908;
 			
 			// aapt resource value: 0x7F0C002D
-			public const int activity_video_phone = 2131492909;
+			public const int activity_webview = 2131492909;
 			
 			// aapt resource value: 0x7F0C002E
-			public const int activity_webview = 2131492910;
+			public const int activity_zxing_layout = 2131492910;
 			
 			// aapt resource value: 0x7F0C002F
-			public const int activity_zxing_layout = 2131492911;
+			public const int biometric_prompt_dialog_content = 2131492911;
 			
 			// aapt resource value: 0x7F0C0030
-			public const int biometric_prompt_dialog_content = 2131492912;
+			public const int box_add_tip = 2131492912;
 			
 			// aapt resource value: 0x7F0C0031
-			public const int box_add_tip = 2131492913;
+			public const int browser_actions_context_menu_page = 2131492913;
 			
 			// aapt resource value: 0x7F0C0032
-			public const int browser_actions_context_menu_page = 2131492914;
+			public const int browser_actions_context_menu_row = 2131492914;
 			
 			// aapt resource value: 0x7F0C0033
-			public const int browser_actions_context_menu_row = 2131492915;
+			public const int cc_activity_widget_countrycode = 2131492915;
 			
 			// aapt resource value: 0x7F0C0034
-			public const int cc_activity_widget_countrycode = 2131492916;
+			public const int cc_activity_widget_sortselection = 2131492916;
 			
 			// aapt resource value: 0x7F0C0035
-			public const int cc_activity_widget_sortselection = 2131492917;
+			public const int cc_country_list_item = 2131492917;
 			
 			// aapt resource value: 0x7F0C0036
-			public const int cc_country_list_item = 2131492918;
+			public const int chose_type_layout = 2131492918;
 			
 			// aapt resource value: 0x7F0C0037
-			public const int chose_type_layout = 2131492919;
+			public const int common_progressdialog_layout1 = 2131492919;
 			
 			// aapt resource value: 0x7F0C0038
-			public const int common_progressdialog_layout1 = 2131492920;
+			public const int custom_dialog = 2131492920;
 			
 			// aapt resource value: 0x7F0C0039
-			public const int custom_dialog = 2131492921;
+			public const int design_bottom_navigation_item = 2131492921;
 			
 			// aapt resource value: 0x7F0C003A
-			public const int design_bottom_navigation_item = 2131492922;
+			public const int design_bottom_sheet_dialog = 2131492922;
 			
 			// aapt resource value: 0x7F0C003B
-			public const int design_bottom_sheet_dialog = 2131492923;
+			public const int design_layout_snackbar = 2131492923;
 			
 			// aapt resource value: 0x7F0C003C
-			public const int design_layout_snackbar = 2131492924;
+			public const int design_layout_snackbar_include = 2131492924;
 			
 			// aapt resource value: 0x7F0C003D
-			public const int design_layout_snackbar_include = 2131492925;
+			public const int design_layout_tab_icon = 2131492925;
 			
 			// aapt resource value: 0x7F0C003E
-			public const int design_layout_tab_icon = 2131492926;
+			public const int design_layout_tab_text = 2131492926;
 			
 			// aapt resource value: 0x7F0C003F
-			public const int design_layout_tab_text = 2131492927;
+			public const int design_menu_item_action_area = 2131492927;
 			
 			// aapt resource value: 0x7F0C0040
-			public const int design_menu_item_action_area = 2131492928;
+			public const int design_navigation_item = 2131492928;
 			
 			// aapt resource value: 0x7F0C0041
-			public const int design_navigation_item = 2131492929;
+			public const int design_navigation_item_header = 2131492929;
 			
 			// aapt resource value: 0x7F0C0042
-			public const int design_navigation_item_header = 2131492930;
+			public const int design_navigation_item_separator = 2131492930;
 			
 			// aapt resource value: 0x7F0C0043
-			public const int design_navigation_item_separator = 2131492931;
+			public const int design_navigation_item_subheader = 2131492931;
 			
 			// aapt resource value: 0x7F0C0044
-			public const int design_navigation_item_subheader = 2131492932;
+			public const int design_navigation_menu = 2131492932;
 			
 			// aapt resource value: 0x7F0C0045
-			public const int design_navigation_menu = 2131492933;
+			public const int design_navigation_menu_item = 2131492933;
 			
 			// aapt resource value: 0x7F0C0046
-			public const int design_navigation_menu_item = 2131492934;
+			public const int design_text_input_end_icon = 2131492934;
 			
 			// aapt resource value: 0x7F0C0047
-			public const int design_text_input_end_icon = 2131492935;
+			public const int design_text_input_start_icon = 2131492935;
 			
 			// aapt resource value: 0x7F0C0048
-			public const int design_text_input_start_icon = 2131492936;
+			public const int device_add_wifi_list_item = 2131492936;
 			
 			// aapt resource value: 0x7F0C0049
-			public const int device_add_wifi_list_item = 2131492937;
+			public const int device_add_wifi_list_item_more = 2131492937;
 			
 			// aapt resource value: 0x7F0C004A
-			public const int device_add_wifi_list_item_more = 2131492938;
+			public const int dialog_choose_net = 2131492938;
 			
 			// aapt resource value: 0x7F0C004B
-			public const int dialog_choose_net = 2131492939;
+			public const int dialog_device_update = 2131492939;
 			
 			// aapt resource value: 0x7F0C004C
-			public const int dialog_device_update = 2131492940;
+			public const int dialog_encryptkey_input = 2131492940;
 			
 			// aapt resource value: 0x7F0C004D
-			public const int dialog_encryptkey_input = 2131492941;
+			public const int dialog_loading_view = 2131492941;
 			
 			// aapt resource value: 0x7F0C004E
-			public const int dialog_loading_view = 2131492942;
+			public const int dialog_lpsdk_time_select = 2131492942;
 			
 			// aapt resource value: 0x7F0C004F
-			public const int dialog_lpsdk_time_select = 2131492943;
+			public const int dialog_lpsdk_tip = 2131492943;
 			
 			// aapt resource value: 0x7F0C0050
-			public const int dialog_lpsdk_tip = 2131492944;
+			public const int dialog_sd_card_reconver = 2131492944;
 			
 			// aapt resource value: 0x7F0C0051
-			public const int dialog_sd_card_reconver = 2131492945;
+			public const int dialog_tip = 2131492945;
 			
 			// aapt resource value: 0x7F0C0052
-			public const int dialog_tip = 2131492946;
+			public const int fragment_ap_bind_success = 2131492946;
 			
 			// aapt resource value: 0x7F0C0053
-			public const int fragment_ap_bind_success = 2131492947;
+			public const int fragment_ap_pair = 2131492947;
 			
 			// aapt resource value: 0x7F0C0054
-			public const int fragment_ap_pair = 2131492948;
+			public const int fragment_base_tip = 2131492948;
 			
 			// aapt resource value: 0x7F0C0055
-			public const int fragment_base_tip = 2131492949;
+			public const int fragment_bind_success = 2131492949;
 			
 			// aapt resource value: 0x7F0C0056
-			public const int fragment_bind_success = 2131492950;
+			public const int fragment_call = 2131492950;
 			
 			// aapt resource value: 0x7F0C0057
-			public const int fragment_call = 2131492951;
-			
-			// aapt resource value: 0x7F0C0058
-			public const int fragment_connect_process = 2131492952;
-			
-			// aapt resource value: 0x7F0C005C
-			public const int fragment_device_cloud_list = 2131492956;
-			
-			// aapt resource value: 0x7F0C005D
-			public const int fragment_device_detail_deployment = 2131492957;
-			
-			// aapt resource value: 0x7F0C005E
-			public const int fragment_device_detail_main = 2131492958;
-			
-			// aapt resource value: 0x7F0C005F
-			public const int fragment_device_detail_name = 2131492959;
-			
-			// aapt resource value: 0x7F0C0060
-			public const int fragment_device_dispatch = 2131492960;
-			
-			// aapt resource value: 0x7F0C0061
-			public const int fragment_device_modify_name = 2131492961;
-			
-			// aapt resource value: 0x7F0C0062
-			public const int fragment_device_version = 2131492962;
-			
-			// aapt resource value: 0x7F0C0059
-			public const int fragment_dev_login = 2131492953;
-			
-			// aapt resource value: 0x7F0C005A
-			public const int fragment_dev_sec_code = 2131492954;
+			public const int fragment_connect_process = 2131492951;
 			
 			// aapt resource value: 0x7F0C005B
-			public const int fragment_dev_wifi_list = 2131492955;
+			public const int fragment_device_cloud_list = 2131492955;
+			
+			// aapt resource value: 0x7F0C005C
+			public const int fragment_device_detail_deployment = 2131492956;
+			
+			// aapt resource value: 0x7F0C005D
+			public const int fragment_device_detail_main = 2131492957;
+			
+			// aapt resource value: 0x7F0C005E
+			public const int fragment_device_detail_name = 2131492958;
+			
+			// aapt resource value: 0x7F0C005F
+			public const int fragment_device_dispatch = 2131492959;
+			
+			// aapt resource value: 0x7F0C0060
+			public const int fragment_device_modify_name = 2131492960;
+			
+			// aapt resource value: 0x7F0C0061
+			public const int fragment_device_version = 2131492961;
+			
+			// aapt resource value: 0x7F0C0058
+			public const int fragment_dev_login = 2131492952;
+			
+			// aapt resource value: 0x7F0C0059
+			public const int fragment_dev_sec_code = 2131492953;
+			
+			// aapt resource value: 0x7F0C005A
+			public const int fragment_dev_wifi_list = 2131492954;
+			
+			// aapt resource value: 0x7F0C0062
+			public const int fragment_error_tip = 2131492962;
 			
 			// aapt resource value: 0x7F0C0063
-			public const int fragment_error_tip = 2131492963;
+			public const int fragment_gateway_list = 2131492963;
 			
 			// aapt resource value: 0x7F0C0064
-			public const int fragment_gateway_list = 2131492964;
+			public const int fragment_hidden_wifi = 2131492964;
 			
 			// aapt resource value: 0x7F0C0065
-			public const int fragment_hidden_wifi = 2131492965;
+			public const int fragment_imei_input = 2131492965;
 			
 			// aapt resource value: 0x7F0C0066
-			public const int fragment_imei_input = 2131492966;
+			public const int fragment_init = 2131492966;
 			
 			// aapt resource value: 0x7F0C0067
-			public const int fragment_init = 2131492967;
+			public const int fragment_manual_input = 2131492967;
 			
 			// aapt resource value: 0x7F0C0068
-			public const int fragment_manual_input = 2131492968;
+			public const int fragment_monitor = 2131492968;
 			
 			// aapt resource value: 0x7F0C0069
-			public const int fragment_monitor = 2131492969;
+			public const int fragment_scan = 2131492969;
 			
 			// aapt resource value: 0x7F0C006A
-			public const int fragment_scan = 2131492970;
+			public const int fragment_security_check = 2131492970;
 			
 			// aapt resource value: 0x7F0C006B
-			public const int fragment_security_check = 2131492971;
+			public const int fragment_smart_config = 2131492971;
 			
 			// aapt resource value: 0x7F0C006C
-			public const int fragment_smart_config = 2131492972;
+			public const int fragment_tip_about_wifi_pwd = 2131492972;
 			
 			// aapt resource value: 0x7F0C006D
-			public const int fragment_tip_about_wifi_pwd = 2131492973;
+			public const int fragment_tip_connect_fail = 2131492973;
 			
 			// aapt resource value: 0x7F0C006E
-			public const int fragment_tip_connect_fail = 2131492974;
+			public const int fragment_tip_not_support_5g = 2131492974;
 			
 			// aapt resource value: 0x7F0C006F
-			public const int fragment_tip_not_support_5g = 2131492975;
+			public const int fragment_tip_soft_ap_connect_wifi = 2131492975;
 			
 			// aapt resource value: 0x7F0C0070
-			public const int fragment_tip_soft_ap_connect_wifi = 2131492976;
+			public const int fragment_tip_timeout = 2131492976;
 			
 			// aapt resource value: 0x7F0C0071
-			public const int fragment_tip_timeout = 2131492977;
+			public const int fragment_tip_user_bind = 2131492977;
 			
 			// aapt resource value: 0x7F0C0072
-			public const int fragment_tip_user_bind = 2131492978;
+			public const int fragment_tip_wifi_name = 2131492978;
 			
 			// aapt resource value: 0x7F0C0073
-			public const int fragment_tip_wifi_name = 2131492979;
+			public const int fragment_type_input = 2131492979;
 			
 			// aapt resource value: 0x7F0C0074
-			public const int fragment_type_input = 2131492980;
+			public const int fragment_wifi_connect_tip = 2131492980;
 			
 			// aapt resource value: 0x7F0C0075
-			public const int fragment_wifi_connect_tip = 2131492981;
+			public const int fragment_wifi_pwd = 2131492981;
 			
 			// aapt resource value: 0x7F0C0076
-			public const int fragment_wifi_pwd = 2131492982;
+			public const int gateway_list_item = 2131492982;
 			
 			// aapt resource value: 0x7F0C0077
-			public const int gateway_list_item = 2131492983;
+			public const int hdl_gallery_banner_view_layout = 2131492983;
 			
 			// aapt resource value: 0x7F0C0078
-			public const int hdl_gallery_banner_view_layout = 2131492984;
+			public const int hdl_widget_activity_crop_image = 2131492984;
 			
 			// aapt resource value: 0x7F0C0079
-			public const int hdl_widget_activity_crop_image = 2131492985;
+			public const int hdl_widget_activity_geofence_round = 2131492985;
 			
 			// aapt resource value: 0x7F0C007A
-			public const int hdl_widget_activity_geofence_round = 2131492986;
+			public const int hdl_widget_air_button = 2131492986;
 			
 			// aapt resource value: 0x7F0C007B
-			public const int hdl_widget_air_button = 2131492987;
+			public const int hdl_widget_include_pickerview_topbar = 2131492987;
 			
 			// aapt resource value: 0x7F0C007C
-			public const int hdl_widget_include_pickerview_topbar = 2131492988;
+			public const int hdl_widget_layout_basepickerview = 2131492988;
 			
 			// aapt resource value: 0x7F0C007D
-			public const int hdl_widget_layout_basepickerview = 2131492989;
+			public const int hdl_widget_pickerview = 2131492989;
 			
 			// aapt resource value: 0x7F0C007E
-			public const int hdl_widget_pickerview = 2131492990;
+			public const int hdl_widget_pickerview_options = 2131492990;
 			
 			// aapt resource value: 0x7F0C007F
-			public const int hdl_widget_pickerview_options = 2131492991;
+			public const int hdl_widget_pickerview_time = 2131492991;
 			
 			// aapt resource value: 0x7F0C0080
-			public const int hdl_widget_pickerview_time = 2131492992;
+			public const int ime_base_split_test_activity = 2131492992;
 			
 			// aapt resource value: 0x7F0C0081
-			public const int hwpush_trans_activity = 2131492993;
+			public const int ime_secondary_split_test_activity = 2131492993;
 			
 			// aapt resource value: 0x7F0C0082
-			public const int ime_base_split_test_activity = 2131492994;
+			public const int include_device_wifi_list_item = 2131492994;
 			
 			// aapt resource value: 0x7F0C0083
-			public const int ime_secondary_split_test_activity = 2131492995;
+			public const int item_channel_list = 2131492995;
 			
 			// aapt resource value: 0x7F0C0084
-			public const int include_device_wifi_list_item = 2131492996;
+			public const int item_device_list = 2131492996;
 			
 			// aapt resource value: 0x7F0C0085
-			public const int item_channel_list = 2131492997;
+			public const int item_media_play_record = 2131492997;
 			
 			// aapt resource value: 0x7F0C0086
-			public const int item_device_list = 2131492998;
+			public const int item_pixel_list = 2131492998;
 			
 			// aapt resource value: 0x7F0C0087
-			public const int item_media_play_record = 2131492999;
+			public const int item_record = 2131492999;
 			
 			// aapt resource value: 0x7F0C0088
-			public const int item_pixel_list = 2131493000;
+			public const int item_record_list = 2131493000;
 			
 			// aapt resource value: 0x7F0C0089
-			public const int item_record = 2131493001;
+			public const int item_wifi_list_more = 2131493001;
 			
 			// aapt resource value: 0x7F0C008A
-			public const int item_record_list = 2131493002;
+			public const int linphone_dialog_content_and_twobutton = 2131493002;
 			
 			// aapt resource value: 0x7F0C008B
-			public const int item_wifi_list_more = 2131493003;
+			public const int login_activity = 2131493003;
 			
 			// aapt resource value: 0x7F0C008C
-			public const int jpush_inapp_banner = 2131493004;
+			public const int m3_alert_dialog = 2131493004;
 			
 			// aapt resource value: 0x7F0C008D
-			public const int jpush_popwin_layout = 2131493005;
+			public const int m3_alert_dialog_actions = 2131493005;
 			
 			// aapt resource value: 0x7F0C008E
-			public const int jpush_webview_layout = 2131493006;
+			public const int m3_alert_dialog_title = 2131493006;
 			
 			// aapt resource value: 0x7F0C008F
-			public const int linphone_dialog_content_and_twobutton = 2131493007;
+			public const int m3_auto_complete_simple_item = 2131493007;
 			
 			// aapt resource value: 0x7F0C0090
-			public const int login_activity = 2131493008;
+			public const int m3_side_sheet_dialog = 2131493008;
 			
 			// aapt resource value: 0x7F0C0091
-			public const int m3_alert_dialog = 2131493009;
-			
-			// aapt resource value: 0x7F0C0092
-			public const int m3_alert_dialog_actions = 2131493010;
-			
-			// aapt resource value: 0x7F0C0093
-			public const int m3_alert_dialog_title = 2131493011;
-			
-			// aapt resource value: 0x7F0C0094
-			public const int m3_auto_complete_simple_item = 2131493012;
-			
-			// aapt resource value: 0x7F0C0095
-			public const int m3_side_sheet_dialog = 2131493013;
+			public const int material_chip_input_combo = 2131493009;
 			
 			// aapt resource value: 0x7F0C0096
-			public const int material_chip_input_combo = 2131493014;
-			
-			// aapt resource value: 0x7F0C009B
-			public const int material_clockface_textview = 2131493019;
-			
-			// aapt resource value: 0x7F0C009C
-			public const int material_clockface_view = 2131493020;
+			public const int material_clockface_textview = 2131493014;
 			
 			// aapt resource value: 0x7F0C0097
-			public const int material_clock_display = 2131493015;
+			public const int material_clockface_view = 2131493015;
+			
+			// aapt resource value: 0x7F0C0092
+			public const int material_clock_display = 2131493010;
+			
+			// aapt resource value: 0x7F0C0093
+			public const int material_clock_display_divider = 2131493011;
+			
+			// aapt resource value: 0x7F0C0094
+			public const int material_clock_period_toggle = 2131493012;
+			
+			// aapt resource value: 0x7F0C0095
+			public const int material_clock_period_toggle_land = 2131493013;
 			
 			// aapt resource value: 0x7F0C0098
-			public const int material_clock_display_divider = 2131493016;
+			public const int material_radial_view_group = 2131493016;
 			
 			// aapt resource value: 0x7F0C0099
-			public const int material_clock_period_toggle = 2131493017;
+			public const int material_textinput_timepicker = 2131493017;
 			
-			// aapt resource value: 0x7F0C009A
-			public const int material_clock_period_toggle_land = 2131493018;
+			// aapt resource value: 0x7F0C009C
+			public const int material_timepicker = 2131493020;
 			
 			// aapt resource value: 0x7F0C009D
-			public const int material_radial_view_group = 2131493021;
+			public const int material_timepicker_dialog = 2131493021;
 			
 			// aapt resource value: 0x7F0C009E
-			public const int material_textinput_timepicker = 2131493022;
+			public const int material_timepicker_textinput_display = 2131493022;
 			
-			// aapt resource value: 0x7F0C00A1
-			public const int material_timepicker = 2131493025;
+			// aapt resource value: 0x7F0C009A
+			public const int material_time_chip = 2131493018;
 			
-			// aapt resource value: 0x7F0C00A2
-			public const int material_timepicker_dialog = 2131493026;
-			
-			// aapt resource value: 0x7F0C00A3
-			public const int material_timepicker_textinput_display = 2131493027;
+			// aapt resource value: 0x7F0C009B
+			public const int material_time_input = 2131493019;
 			
 			// aapt resource value: 0x7F0C009F
-			public const int material_time_chip = 2131493023;
+			public const int mobile_common_comment = 2131493023;
 			
 			// aapt resource value: 0x7F0C00A0
-			public const int material_time_input = 2131493024;
+			public const int mobile_common_lc_alert_dialog_layout = 2131493024;
+			
+			// aapt resource value: 0x7F0C00A1
+			public const int mobile_common_progressdialog_layout = 2131493025;
+			
+			// aapt resource value: 0x7F0C00A2
+			public const int mobile_common_roll_select_dialog = 2131493026;
+			
+			// aapt resource value: 0x7F0C00A3
+			public const int mobile_common_search_view = 2131493027;
 			
 			// aapt resource value: 0x7F0C00A4
-			public const int mobile_common_comment = 2131493028;
+			public const int mobile_common_widget_common_title = 2131493028;
 			
 			// aapt resource value: 0x7F0C00A5
-			public const int mobile_common_lc_alert_dialog_layout = 2131493029;
+			public const int mobile_common_widget_switch_title = 2131493029;
 			
 			// aapt resource value: 0x7F0C00A6
-			public const int mobile_common_progressdialog_layout = 2131493030;
+			public const int more_options_layout = 2131493030;
 			
 			// aapt resource value: 0x7F0C00A7
-			public const int mobile_common_roll_select_dialog = 2131493031;
+			public const int mtrl_alert_dialog = 2131493031;
 			
 			// aapt resource value: 0x7F0C00A8
-			public const int mobile_common_search_view = 2131493032;
+			public const int mtrl_alert_dialog_actions = 2131493032;
 			
 			// aapt resource value: 0x7F0C00A9
-			public const int mobile_common_widget_common_title = 2131493033;
+			public const int mtrl_alert_dialog_title = 2131493033;
 			
 			// aapt resource value: 0x7F0C00AA
-			public const int mobile_common_widget_switch_title = 2131493034;
+			public const int mtrl_alert_select_dialog_item = 2131493034;
 			
 			// aapt resource value: 0x7F0C00AB
-			public const int more_options_layout = 2131493035;
+			public const int mtrl_alert_select_dialog_multichoice = 2131493035;
 			
 			// aapt resource value: 0x7F0C00AC
-			public const int mtrl_alert_dialog = 2131493036;
+			public const int mtrl_alert_select_dialog_singlechoice = 2131493036;
 			
 			// aapt resource value: 0x7F0C00AD
-			public const int mtrl_alert_dialog_actions = 2131493037;
+			public const int mtrl_auto_complete_simple_item = 2131493037;
 			
 			// aapt resource value: 0x7F0C00AE
-			public const int mtrl_alert_dialog_title = 2131493038;
-			
-			// aapt resource value: 0x7F0C00AF
-			public const int mtrl_alert_select_dialog_item = 2131493039;
+			public const int mtrl_calendar_day = 2131493038;
 			
 			// aapt resource value: 0x7F0C00B0
-			public const int mtrl_alert_select_dialog_multichoice = 2131493040;
+			public const int mtrl_calendar_days_of_week = 2131493040;
+			
+			// aapt resource value: 0x7F0C00AF
+			public const int mtrl_calendar_day_of_week = 2131493039;
 			
 			// aapt resource value: 0x7F0C00B1
-			public const int mtrl_alert_select_dialog_singlechoice = 2131493041;
+			public const int mtrl_calendar_horizontal = 2131493041;
 			
 			// aapt resource value: 0x7F0C00B2
-			public const int mtrl_auto_complete_simple_item = 2131493042;
-			
-			// aapt resource value: 0x7F0C00B3
-			public const int mtrl_calendar_day = 2131493043;
+			public const int mtrl_calendar_month = 2131493042;
 			
 			// aapt resource value: 0x7F0C00B5
-			public const int mtrl_calendar_days_of_week = 2131493045;
+			public const int mtrl_calendar_months = 2131493045;
+			
+			// aapt resource value: 0x7F0C00B3
+			public const int mtrl_calendar_month_labeled = 2131493043;
 			
 			// aapt resource value: 0x7F0C00B4
-			public const int mtrl_calendar_day_of_week = 2131493044;
+			public const int mtrl_calendar_month_navigation = 2131493044;
 			
 			// aapt resource value: 0x7F0C00B6
-			public const int mtrl_calendar_horizontal = 2131493046;
+			public const int mtrl_calendar_vertical = 2131493046;
 			
 			// aapt resource value: 0x7F0C00B7
-			public const int mtrl_calendar_month = 2131493047;
-			
-			// aapt resource value: 0x7F0C00BA
-			public const int mtrl_calendar_months = 2131493050;
+			public const int mtrl_calendar_year = 2131493047;
 			
 			// aapt resource value: 0x7F0C00B8
-			public const int mtrl_calendar_month_labeled = 2131493048;
+			public const int mtrl_layout_snackbar = 2131493048;
 			
 			// aapt resource value: 0x7F0C00B9
-			public const int mtrl_calendar_month_navigation = 2131493049;
+			public const int mtrl_layout_snackbar_include = 2131493049;
+			
+			// aapt resource value: 0x7F0C00BA
+			public const int mtrl_navigation_rail_item = 2131493050;
 			
 			// aapt resource value: 0x7F0C00BB
-			public const int mtrl_calendar_vertical = 2131493051;
+			public const int mtrl_picker_actions = 2131493051;
 			
 			// aapt resource value: 0x7F0C00BC
-			public const int mtrl_calendar_year = 2131493052;
+			public const int mtrl_picker_dialog = 2131493052;
 			
 			// aapt resource value: 0x7F0C00BD
-			public const int mtrl_layout_snackbar = 2131493053;
+			public const int mtrl_picker_fullscreen = 2131493053;
 			
 			// aapt resource value: 0x7F0C00BE
-			public const int mtrl_layout_snackbar_include = 2131493054;
+			public const int mtrl_picker_header_dialog = 2131493054;
 			
 			// aapt resource value: 0x7F0C00BF
-			public const int mtrl_navigation_rail_item = 2131493055;
+			public const int mtrl_picker_header_fullscreen = 2131493055;
 			
 			// aapt resource value: 0x7F0C00C0
-			public const int mtrl_picker_actions = 2131493056;
+			public const int mtrl_picker_header_selection_text = 2131493056;
 			
 			// aapt resource value: 0x7F0C00C1
-			public const int mtrl_picker_dialog = 2131493057;
+			public const int mtrl_picker_header_title_text = 2131493057;
 			
 			// aapt resource value: 0x7F0C00C2
-			public const int mtrl_picker_fullscreen = 2131493058;
+			public const int mtrl_picker_header_toggle = 2131493058;
 			
 			// aapt resource value: 0x7F0C00C3
-			public const int mtrl_picker_header_dialog = 2131493059;
+			public const int mtrl_picker_text_input_date = 2131493059;
 			
 			// aapt resource value: 0x7F0C00C4
-			public const int mtrl_picker_header_fullscreen = 2131493060;
+			public const int mtrl_picker_text_input_date_range = 2131493060;
 			
 			// aapt resource value: 0x7F0C00C5
-			public const int mtrl_picker_header_selection_text = 2131493061;
+			public const int mtrl_search_bar = 2131493061;
 			
 			// aapt resource value: 0x7F0C00C6
-			public const int mtrl_picker_header_title_text = 2131493062;
+			public const int mtrl_search_view = 2131493062;
 			
 			// aapt resource value: 0x7F0C00C7
-			public const int mtrl_picker_header_toggle = 2131493063;
+			public const int notification_action = 2131493063;
 			
 			// aapt resource value: 0x7F0C00C8
-			public const int mtrl_picker_text_input_date = 2131493064;
+			public const int notification_action_tombstone = 2131493064;
 			
 			// aapt resource value: 0x7F0C00C9
-			public const int mtrl_picker_text_input_date_range = 2131493065;
+			public const int notification_media_action = 2131493065;
 			
 			// aapt resource value: 0x7F0C00CA
-			public const int mtrl_search_bar = 2131493066;
+			public const int notification_media_cancel_action = 2131493066;
 			
 			// aapt resource value: 0x7F0C00CB
-			public const int mtrl_search_view = 2131493067;
+			public const int notification_template_big_media = 2131493067;
 			
 			// aapt resource value: 0x7F0C00CC
-			public const int notification_action = 2131493068;
+			public const int notification_template_big_media_custom = 2131493068;
 			
 			// aapt resource value: 0x7F0C00CD
-			public const int notification_action_tombstone = 2131493069;
+			public const int notification_template_big_media_narrow = 2131493069;
 			
 			// aapt resource value: 0x7F0C00CE
-			public const int notification_media_action = 2131493070;
+			public const int notification_template_big_media_narrow_custom = 2131493070;
 			
 			// aapt resource value: 0x7F0C00CF
-			public const int notification_media_cancel_action = 2131493071;
+			public const int notification_template_custom_big = 2131493071;
 			
 			// aapt resource value: 0x7F0C00D0
-			public const int notification_template_big_media = 2131493072;
+			public const int notification_template_icon_group = 2131493072;
 			
 			// aapt resource value: 0x7F0C00D1
-			public const int notification_template_big_media_custom = 2131493073;
+			public const int notification_template_lines_media = 2131493073;
 			
 			// aapt resource value: 0x7F0C00D2
-			public const int notification_template_big_media_narrow = 2131493074;
+			public const int notification_template_media = 2131493074;
 			
 			// aapt resource value: 0x7F0C00D3
-			public const int notification_template_big_media_narrow_custom = 2131493075;
+			public const int notification_template_media_custom = 2131493075;
 			
 			// aapt resource value: 0x7F0C00D4
-			public const int notification_template_custom_big = 2131493076;
+			public const int notification_template_part_chronometer = 2131493076;
 			
 			// aapt resource value: 0x7F0C00D5
-			public const int notification_template_icon_group = 2131493077;
+			public const int notification_template_part_time = 2131493077;
 			
 			// aapt resource value: 0x7F0C00D6
-			public const int notification_template_lines_media = 2131493078;
+			public const int option_item = 2131493078;
 			
 			// aapt resource value: 0x7F0C00D7
-			public const int notification_template_media = 2131493079;
+			public const int pull_to_refresh_header_horizontal = 2131493079;
 			
 			// aapt resource value: 0x7F0C00D8
-			public const int notification_template_media_custom = 2131493080;
+			public const int pull_to_refresh_header_vertical = 2131493080;
 			
 			// aapt resource value: 0x7F0C00D9
-			public const int notification_template_part_chronometer = 2131493081;
+			public const int select_dialog_item_material = 2131493081;
 			
 			// aapt resource value: 0x7F0C00DA
-			public const int notification_template_part_time = 2131493082;
+			public const int select_dialog_multichoice_material = 2131493082;
 			
 			// aapt resource value: 0x7F0C00DB
-			public const int option_item = 2131493083;
+			public const int select_dialog_singlechoice_material = 2131493083;
 			
 			// aapt resource value: 0x7F0C00DC
-			public const int pull_to_refresh_header_horizontal = 2131493084;
+			public const int simple_demo = 2131493084;
 			
 			// aapt resource value: 0x7F0C00DD
-			public const int pull_to_refresh_header_vertical = 2131493085;
+			public const int sms_valid_view = 2131493085;
 			
 			// aapt resource value: 0x7F0C00DE
-			public const int push_download_notification_layout = 2131493086;
+			public const int srl_classics_footer = 2131493086;
 			
 			// aapt resource value: 0x7F0C00DF
-			public const int push_expandable_big_image_notification = 2131493087;
+			public const int srl_classics_header = 2131493087;
 			
 			// aapt resource value: 0x7F0C00E0
-			public const int push_expandable_big_text_notification = 2131493088;
+			public const int support_simple_spinner_dropdown_item = 2131493088;
 			
 			// aapt resource value: 0x7F0C00E1
-			public const int push_notification = 2131493089;
+			public const int test_surfaceview = 2131493089;
 			
 			// aapt resource value: 0x7F0C00E2
-			public const int push_notification_large = 2131493090;
+			public const int toolbar = 2131493090;
 			
 			// aapt resource value: 0x7F0C00E3
-			public const int push_notification_middle = 2131493091;
+			public const int user_regesiter_activity = 2131493091;
 			
 			// aapt resource value: 0x7F0C00E4
-			public const int push_pure_pic_notification_f6 = 2131493092;
+			public const int video_device = 2131493092;
 			
 			// aapt resource value: 0x7F0C00E5
-			public const int push_pure_pic_notification_f7 = 2131493093;
+			public const int view_pixel_popwindow = 2131493093;
 			
 			// aapt resource value: 0x7F0C00E6
-			public const int push_pure_pic_notification_f8 = 2131493094;
+			public const int wheel_text = 2131493094;
 			
 			// aapt resource value: 0x7F0C00E7
-			public const int push_pure_pic_notification_f9 = 2131493095;
+			public const int widget_common_itme = 2131493095;
 			
 			// aapt resource value: 0x7F0C00E8
-			public const int push_pure_pic_notification_f9_275 = 2131493096;
-			
-			// aapt resource value: 0x7F0C00E9
-			public const int select_dialog_item_material = 2131493097;
-			
-			// aapt resource value: 0x7F0C00EA
-			public const int select_dialog_multichoice_material = 2131493098;
-			
-			// aapt resource value: 0x7F0C00EB
-			public const int select_dialog_singlechoice_material = 2131493099;
+			public const int widget_common_sub_title = 2131493096;
 			
 			// aapt resource value: 0x7F0C00EC
-			public const int simple_demo = 2131493100;
+			public const int zxingscanneractivitylayout = 2131493100;
 			
 			// aapt resource value: 0x7F0C00ED
-			public const int sms_valid_view = 2131493101;
+			public const int zxingscannerfragmentlayout = 2131493101;
 			
-			// aapt resource value: 0x7F0C00EE
-			public const int srl_classics_footer = 2131493102;
+			// aapt resource value: 0x7F0C00E9
+			public const int zxing_barcode_scanner = 2131493097;
 			
-			// aapt resource value: 0x7F0C00EF
-			public const int srl_classics_header = 2131493103;
+			// aapt resource value: 0x7F0C00EA
+			public const int zxing_capture = 2131493098;
 			
-			// aapt resource value: 0x7F0C00F0
-			public const int support_simple_spinner_dropdown_item = 2131493104;
-			
-			// aapt resource value: 0x7F0C00F1
-			public const int test_surfaceview = 2131493105;
-			
-			// aapt resource value: 0x7F0C00F2
-			public const int toolbar = 2131493106;
-			
-			// aapt resource value: 0x7F0C00F3
-			public const int user_regesiter_activity = 2131493107;
-			
-			// aapt resource value: 0x7F0C00F4
-			public const int video_device = 2131493108;
-			
-			// aapt resource value: 0x7F0C00F5
-			public const int view_pixel_popwindow = 2131493109;
-			
-			// aapt resource value: 0x7F0C00F6
-			public const int wheel_text = 2131493110;
-			
-			// aapt resource value: 0x7F0C00F7
-			public const int widget_common_itme = 2131493111;
-			
-			// aapt resource value: 0x7F0C00F8
-			public const int widget_common_sub_title = 2131493112;
-			
-			// aapt resource value: 0x7F0C00FC
-			public const int zxingscanneractivitylayout = 2131493116;
-			
-			// aapt resource value: 0x7F0C00FD
-			public const int zxingscannerfragmentlayout = 2131493117;
-			
-			// aapt resource value: 0x7F0C00F9
-			public const int zxing_barcode_scanner = 2131493113;
-			
-			// aapt resource value: 0x7F0C00FA
-			public const int zxing_capture = 2131493114;
-			
-			// aapt resource value: 0x7F0C00FB
-			public const int zxing_layout = 2131493115;
+			// aapt resource value: 0x7F0C00EB
+			public const int zxing_layout = 2131493099;
 			
 			static Layout()
 			{
@@ -20600,988 +20100,940 @@
 			public const int hide_bottom_view_on_scroll_behavior = 2131886366;
 			
 			// aapt resource value: 0x7F12011F
-			public const int hms_apk_not_installed_hints = 2131886367;
+			public const int host = 2131886367;
 			
 			// aapt resource value: 0x7F120120
-			public const int hms_bindfaildlg_message = 2131886368;
+			public const int icon_content_description = 2131886368;
 			
 			// aapt resource value: 0x7F120121
-			public const int hms_bindfaildlg_title = 2131886369;
+			public const int item_view_role_description = 2131886369;
 			
 			// aapt resource value: 0x7F120122
-			public const int hms_confirm = 2131886370;
+			public const int lc_demo_choose_env_ak = 2131886370;
 			
 			// aapt resource value: 0x7F120123
-			public const int hms_is_spoof = 2131886371;
+			public const int lc_demo_choose_env_ak_tip = 2131886371;
 			
 			// aapt resource value: 0x7F120124
-			public const int hms_push_channel = 2131886372;
+			public const int lc_demo_choose_env_sk = 2131886372;
 			
 			// aapt resource value: 0x7F120125
-			public const int hms_push_google = 2131886373;
+			public const int lc_demo_choose_env_sk_tip = 2131886373;
 			
 			// aapt resource value: 0x7F120126
-			public const int hms_push_vmall = 2131886374;
+			public const int lc_demo_choose_env_tip1 = 2131886374;
 			
 			// aapt resource value: 0x7F120127
-			public const int hms_spoof_hints = 2131886375;
+			public const int lc_demo_choose_env_tip2 = 2131886375;
 			
 			// aapt resource value: 0x7F120128
-			public const int host = 2131886376;
+			public const int lc_demo_choose_env_tip3 = 2131886376;
 			
 			// aapt resource value: 0x7F120129
-			public const int icon_content_description = 2131886377;
+			public const int lc_demo_choose_env_tip4 = 2131886377;
 			
 			// aapt resource value: 0x7F12012A
-			public const int item_view_role_description = 2131886378;
+			public const int lc_demo_choose_env_tip5 = 2131886378;
 			
 			// aapt resource value: 0x7F12012B
-			public const int jg_channel_name_p_default = 2131886379;
+			public const int lc_demo_cn = 2131886379;
 			
 			// aapt resource value: 0x7F12012C
-			public const int jg_channel_name_p_high = 2131886380;
+			public const int lc_demo_cn_title_tip = 2131886380;
 			
 			// aapt resource value: 0x7F12012D
-			public const int jg_channel_name_p_low = 2131886381;
+			public const int lc_demo_device_begin_update = 2131886381;
 			
 			// aapt resource value: 0x7F12012E
-			public const int jg_channel_name_p_min = 2131886382;
+			public const int lc_demo_device_cancel = 2131886382;
 			
 			// aapt resource value: 0x7F12012F
-			public const int lc_demo_choose_env_ak = 2131886383;
+			public const int lc_demo_device_capture_failed = 2131886383;
 			
 			// aapt resource value: 0x7F120130
-			public const int lc_demo_choose_env_ak_tip = 2131886384;
+			public const int lc_demo_device_capture_success = 2131886384;
 			
 			// aapt resource value: 0x7F120131
-			public const int lc_demo_choose_env_sk = 2131886385;
+			public const int lc_demo_device_cloud_not_open = 2131886385;
 			
 			// aapt resource value: 0x7F120132
-			public const int lc_demo_choose_env_sk_tip = 2131886386;
+			public const int lc_demo_device_cloud_state_expired = 2131886386;
 			
 			// aapt resource value: 0x7F120133
-			public const int lc_demo_choose_env_tip1 = 2131886387;
+			public const int lc_demo_device_cloud_state_not_opened = 2131886387;
 			
 			// aapt resource value: 0x7F120134
-			public const int lc_demo_choose_env_tip2 = 2131886388;
+			public const int lc_demo_device_cloud_state_suspended = 2131886388;
 			
 			// aapt resource value: 0x7F120135
-			public const int lc_demo_choose_env_tip3 = 2131886389;
+			public const int lc_demo_device_cloud_video = 2131886389;
 			
 			// aapt resource value: 0x7F120136
-			public const int lc_demo_choose_env_tip4 = 2131886390;
+			public const int lc_demo_device_cur_wifi = 2131886390;
 			
 			// aapt resource value: 0x7F120137
-			public const int lc_demo_choose_env_tip5 = 2131886391;
+			public const int lc_demo_device_delete = 2131886391;
 			
 			// aapt resource value: 0x7F120138
-			public const int lc_demo_cn = 2131886392;
+			public const int lc_demo_device_delete_choose_all = 2131886392;
 			
 			// aapt resource value: 0x7F120139
-			public const int lc_demo_cn_title_tip = 2131886393;
+			public const int lc_demo_device_delete_exit = 2131886393;
 			
 			// aapt resource value: 0x7F12013A
-			public const int lc_demo_device_begin_update = 2131886394;
+			public const int lc_demo_device_delete_exit_tip = 2131886394;
 			
 			// aapt resource value: 0x7F12013B
-			public const int lc_demo_device_cancel = 2131886395;
+			public const int lc_demo_device_delete_sure = 2131886395;
 			
 			// aapt resource value: 0x7F12013C
-			public const int lc_demo_device_capture_failed = 2131886396;
+			public const int lc_demo_device_deployment_setting = 2131886396;
 			
 			// aapt resource value: 0x7F12013D
-			public const int lc_demo_device_capture_success = 2131886397;
+			public const int lc_demo_device_deployment_tip = 2131886397;
 			
 			// aapt resource value: 0x7F12013E
-			public const int lc_demo_device_cloud_not_open = 2131886398;
+			public const int lc_demo_device_deployment_title = 2131886398;
 			
 			// aapt resource value: 0x7F12013F
-			public const int lc_demo_device_cloud_state_expired = 2131886399;
+			public const int lc_demo_device_detail_title = 2131886399;
 			
 			// aapt resource value: 0x7F120140
-			public const int lc_demo_device_cloud_state_not_opened = 2131886400;
+			public const int lc_demo_device_encrypt_device_password_tip = 2131886400;
 			
 			// aapt resource value: 0x7F120141
-			public const int lc_demo_device_cloud_state_suspended = 2131886401;
+			public const int lc_demo_device_encrypt_key_tip = 2131886401;
 			
 			// aapt resource value: 0x7F120142
-			public const int lc_demo_device_cloud_video = 2131886402;
+			public const int lc_demo_device_local_sd = 2131886402;
 			
 			// aapt resource value: 0x7F120143
-			public const int lc_demo_device_cur_wifi = 2131886403;
+			public const int lc_demo_device_local_video = 2131886403;
 			
 			// aapt resource value: 0x7F120144
-			public const int lc_demo_device_delete = 2131886404;
+			public const int lc_demo_device_modify_success = 2131886404;
 			
 			// aapt resource value: 0x7F120145
-			public const int lc_demo_device_delete_choose_all = 2131886405;
+			public const int lc_demo_device_more_video = 2131886405;
 			
 			// aapt resource value: 0x7F120146
-			public const int lc_demo_device_delete_exit = 2131886406;
+			public const int lc_demo_device_move_check = 2131886406;
 			
 			// aapt resource value: 0x7F120147
-			public const int lc_demo_device_delete_exit_tip = 2131886407;
+			public const int lc_demo_device_name = 2131886407;
 			
 			// aapt resource value: 0x7F120148
-			public const int lc_demo_device_delete_sure = 2131886408;
+			public const int lc_demo_device_name_hint = 2131886408;
 			
 			// aapt resource value: 0x7F120149
-			public const int lc_demo_device_deployment_setting = 2131886409;
+			public const int lc_demo_device_nvr_no_channel = 2131886409;
 			
 			// aapt resource value: 0x7F12014A
-			public const int lc_demo_device_deployment_tip = 2131886410;
+			public const int lc_demo_device_record_begin = 2131886410;
 			
 			// aapt resource value: 0x7F12014B
-			public const int lc_demo_device_deployment_title = 2131886411;
+			public const int lc_demo_device_record_delete_success = 2131886411;
 			
 			// aapt resource value: 0x7F12014C
-			public const int lc_demo_device_detail_title = 2131886412;
+			public const int lc_demo_device_record_download = 2131886412;
 			
 			// aapt resource value: 0x7F12014D
-			public const int lc_demo_device_encrypt_device_password_tip = 2131886413;
+			public const int lc_demo_device_record_download_begin = 2131886413;
 			
 			// aapt resource value: 0x7F12014E
-			public const int lc_demo_device_encrypt_key_tip = 2131886414;
+			public const int lc_demo_device_record_download_error = 2131886414;
 			
 			// aapt resource value: 0x7F12014F
-			public const int lc_demo_device_local_sd = 2131886415;
+			public const int lc_demo_device_record_download_finish = 2131886415;
 			
 			// aapt resource value: 0x7F120150
-			public const int lc_demo_device_local_video = 2131886416;
+			public const int lc_demo_device_record_edit = 2131886416;
 			
 			// aapt resource value: 0x7F120151
-			public const int lc_demo_device_modify_success = 2131886417;
+			public const int lc_demo_device_record_edit_finish = 2131886417;
 			
 			// aapt resource value: 0x7F120152
-			public const int lc_demo_device_more_video = 2131886418;
+			public const int lc_demo_device_record_loading_more = 2131886418;
 			
 			// aapt resource value: 0x7F120153
-			public const int lc_demo_device_move_check = 2131886419;
+			public const int lc_demo_device_record_stop = 2131886419;
 			
 			// aapt resource value: 0x7F120154
-			public const int lc_demo_device_name = 2131886420;
+			public const int lc_demo_device_serial_tip = 2131886420;
 			
 			// aapt resource value: 0x7F120155
-			public const int lc_demo_device_name_hint = 2131886421;
+			public const int lc_demo_device_sure = 2131886421;
 			
 			// aapt resource value: 0x7F120156
-			public const int lc_demo_device_nvr_no_channel = 2131886422;
+			public const int lc_demo_device_talk_close_success = 2131886422;
 			
 			// aapt resource value: 0x7F120157
-			public const int lc_demo_device_record_begin = 2131886423;
+			public const int lc_demo_device_talk_open_failed = 2131886423;
 			
 			// aapt resource value: 0x7F120158
-			public const int lc_demo_device_record_delete_success = 2131886424;
+			public const int lc_demo_device_talk_open_success = 2131886424;
 			
 			// aapt resource value: 0x7F120159
-			public const int lc_demo_device_record_download = 2131886425;
+			public const int lc_demo_device_today_no_record = 2131886425;
 			
 			// aapt resource value: 0x7F12015A
-			public const int lc_demo_device_record_download_begin = 2131886426;
+			public const int lc_demo_device_type_tip = 2131886426;
 			
 			// aapt resource value: 0x7F12015B
-			public const int lc_demo_device_record_download_error = 2131886427;
+			public const int lc_demo_device_unbind_success = 2131886427;
 			
 			// aapt resource value: 0x7F12015C
-			public const int lc_demo_device_record_download_finish = 2131886428;
-			
-			// aapt resource value: 0x7F12015D
-			public const int lc_demo_device_record_edit = 2131886429;
-			
-			// aapt resource value: 0x7F12015E
-			public const int lc_demo_device_record_edit_finish = 2131886430;
-			
-			// aapt resource value: 0x7F12015F
-			public const int lc_demo_device_record_loading_more = 2131886431;
+			public const int lc_demo_device_update = 2131886428;
 			
 			// aapt resource value: 0x7F120160
-			public const int lc_demo_device_record_stop = 2131886432;
+			public const int lc_demo_device_updateing = 2131886432;
+			
+			// aapt resource value: 0x7F12015D
+			public const int lc_demo_device_update_msg = 2131886429;
+			
+			// aapt resource value: 0x7F12015E
+			public const int lc_demo_device_update_success = 2131886430;
+			
+			// aapt resource value: 0x7F12015F
+			public const int lc_demo_device_update_tip = 2131886431;
 			
 			// aapt resource value: 0x7F120161
-			public const int lc_demo_device_serial_tip = 2131886433;
+			public const int lc_demo_device_version_current = 2131886433;
 			
 			// aapt resource value: 0x7F120162
-			public const int lc_demo_device_sure = 2131886434;
+			public const int lc_demo_device_version_new = 2131886434;
 			
 			// aapt resource value: 0x7F120163
-			public const int lc_demo_device_talk_close_success = 2131886435;
+			public const int lc_demo_device_version_new_tip = 2131886435;
 			
 			// aapt resource value: 0x7F120164
-			public const int lc_demo_device_talk_open_failed = 2131886436;
+			public const int lc_demo_device_version_tip = 2131886436;
 			
 			// aapt resource value: 0x7F120165
-			public const int lc_demo_device_talk_open_success = 2131886437;
+			public const int lc_demo_device_version_title = 2131886437;
 			
 			// aapt resource value: 0x7F120166
-			public const int lc_demo_device_today_no_record = 2131886438;
+			public const int lc_demo_device_video_play_change = 2131886438;
 			
 			// aapt resource value: 0x7F120167
-			public const int lc_demo_device_type_tip = 2131886439;
+			public const int lc_demo_device_video_play_error = 2131886439;
 			
 			// aapt resource value: 0x7F120168
-			public const int lc_demo_device_unbind_success = 2131886440;
+			public const int lc_demo_device_video_play_loading = 2131886440;
 			
 			// aapt resource value: 0x7F120169
-			public const int lc_demo_device_update = 2131886441;
-			
-			// aapt resource value: 0x7F12016D
-			public const int lc_demo_device_updateing = 2131886445;
+			public const int lc_demo_device_warn_setting = 2131886441;
 			
 			// aapt resource value: 0x7F12016A
-			public const int lc_demo_device_update_msg = 2131886442;
+			public const int lc_demo_main_no_device = 2131886442;
 			
 			// aapt resource value: 0x7F12016B
-			public const int lc_demo_device_update_success = 2131886443;
+			public const int lc_demo_main_offline = 2131886443;
 			
 			// aapt resource value: 0x7F12016C
-			public const int lc_demo_device_update_tip = 2131886444;
+			public const int lc_demo_main_title = 2131886444;
+			
+			// aapt resource value: 0x7F12016D
+			public const int lc_demo_overseas = 2131886445;
 			
 			// aapt resource value: 0x7F12016E
-			public const int lc_demo_device_version_current = 2131886446;
+			public const int lc_demo_overseas_title_tip = 2131886446;
 			
 			// aapt resource value: 0x7F12016F
-			public const int lc_demo_device_version_new = 2131886447;
+			public const int lc_demo_sure = 2131886447;
 			
 			// aapt resource value: 0x7F120170
-			public const int lc_demo_device_version_new_tip = 2131886448;
+			public const int linphone_sdk_branch = 2131886448;
 			
 			// aapt resource value: 0x7F120171
-			public const int lc_demo_device_version_tip = 2131886449;
+			public const int linphone_sdk_version = 2131886449;
 			
 			// aapt resource value: 0x7F120172
-			public const int lc_demo_device_version_title = 2131886450;
+			public const int login_privacy_policy = 2131886450;
 			
 			// aapt resource value: 0x7F120173
-			public const int lc_demo_device_video_play_change = 2131886451;
+			public const int login_user_service_agreement = 2131886451;
 			
 			// aapt resource value: 0x7F120174
-			public const int lc_demo_device_video_play_error = 2131886452;
+			public const int lp_answerStr = 2131886452;
 			
 			// aapt resource value: 0x7F120175
-			public const int lc_demo_device_video_play_loading = 2131886453;
+			public const int lp_callingStr = 2131886453;
 			
 			// aapt resource value: 0x7F120176
-			public const int lc_demo_device_warn_setting = 2131886454;
+			public const int lp_cancel = 2131886454;
 			
 			// aapt resource value: 0x7F120177
-			public const int lc_demo_main_no_device = 2131886455;
+			public const int lp_confirm = 2131886455;
 			
 			// aapt resource value: 0x7F120178
-			public const int lc_demo_main_offline = 2131886456;
+			public const int lp_endMonitoringStr = 2131886456;
 			
 			// aapt resource value: 0x7F120179
-			public const int lc_demo_main_title = 2131886457;
+			public const int lp_endOfCallStr = 2131886457;
 			
 			// aapt resource value: 0x7F12017A
-			public const int lc_demo_overseas = 2131886458;
+			public const int lp_hangupStr = 2131886458;
 			
 			// aapt resource value: 0x7F12017B
-			public const int lc_demo_overseas_title_tip = 2131886459;
+			public const int lp_okStr = 2131886459;
 			
 			// aapt resource value: 0x7F12017C
-			public const int lc_demo_sure = 2131886460;
+			public const int lp_operationFailedStr = 2131886460;
 			
 			// aapt resource value: 0x7F12017D
-			public const int linphone_sdk_branch = 2131886461;
+			public const int lp_outdoorUnitStr = 2131886461;
 			
 			// aapt resource value: 0x7F12017E
-			public const int linphone_sdk_version = 2131886462;
+			public const int lp_refuseStr = 2131886462;
 			
 			// aapt resource value: 0x7F12017F
-			public const int login_privacy_policy = 2131886463;
+			public const int lp_saveToTheAlbumsStr = 2131886463;
 			
 			// aapt resource value: 0x7F120180
-			public const int login_user_service_agreement = 2131886464;
+			public const int lp_screenshotStr = 2131886464;
 			
 			// aapt resource value: 0x7F120181
-			public const int lp_answerStr = 2131886465;
+			public const int lp_sipAccount_null = 2131886465;
 			
 			// aapt resource value: 0x7F120182
-			public const int lp_callingStr = 2131886466;
-			
-			// aapt resource value: 0x7F120183
-			public const int lp_cancel = 2131886467;
-			
-			// aapt resource value: 0x7F120184
-			public const int lp_confirm = 2131886468;
+			public const int lp_tipStr = 2131886466;
 			
 			// aapt resource value: 0x7F120185
-			public const int lp_endMonitoringStr = 2131886469;
+			public const int lp_unlockfailureStr = 2131886469;
+			
+			// aapt resource value: 0x7F120183
+			public const int lp_unlockStr = 2131886467;
+			
+			// aapt resource value: 0x7F120184
+			public const int lp_unlockSuccessfullyStr = 2131886468;
 			
 			// aapt resource value: 0x7F120186
-			public const int lp_endOfCallStr = 2131886470;
+			public const int m3_exceed_max_badge_text_suffix = 2131886470;
 			
 			// aapt resource value: 0x7F120187
-			public const int lp_hangupStr = 2131886471;
+			public const int m3_ref_typeface_brand_medium = 2131886471;
 			
 			// aapt resource value: 0x7F120188
-			public const int lp_okStr = 2131886472;
+			public const int m3_ref_typeface_brand_regular = 2131886472;
 			
 			// aapt resource value: 0x7F120189
-			public const int lp_operationFailedStr = 2131886473;
+			public const int m3_ref_typeface_plain_medium = 2131886473;
 			
 			// aapt resource value: 0x7F12018A
-			public const int lp_outdoorUnitStr = 2131886474;
+			public const int m3_ref_typeface_plain_regular = 2131886474;
 			
 			// aapt resource value: 0x7F12018B
-			public const int lp_refuseStr = 2131886475;
+			public const int m3_sys_motion_easing_emphasized = 2131886475;
 			
 			// aapt resource value: 0x7F12018C
-			public const int lp_saveToTheAlbumsStr = 2131886476;
+			public const int m3_sys_motion_easing_emphasized_accelerate = 2131886476;
 			
 			// aapt resource value: 0x7F12018D
-			public const int lp_screenshotStr = 2131886477;
+			public const int m3_sys_motion_easing_emphasized_decelerate = 2131886477;
 			
 			// aapt resource value: 0x7F12018E
-			public const int lp_sipAccount_null = 2131886478;
+			public const int m3_sys_motion_easing_emphasized_path_data = 2131886478;
 			
 			// aapt resource value: 0x7F12018F
-			public const int lp_tipStr = 2131886479;
-			
-			// aapt resource value: 0x7F120192
-			public const int lp_unlockfailureStr = 2131886482;
+			public const int m3_sys_motion_easing_legacy = 2131886479;
 			
 			// aapt resource value: 0x7F120190
-			public const int lp_unlockStr = 2131886480;
+			public const int m3_sys_motion_easing_legacy_accelerate = 2131886480;
 			
 			// aapt resource value: 0x7F120191
-			public const int lp_unlockSuccessfullyStr = 2131886481;
+			public const int m3_sys_motion_easing_legacy_decelerate = 2131886481;
+			
+			// aapt resource value: 0x7F120192
+			public const int m3_sys_motion_easing_linear = 2131886482;
 			
 			// aapt resource value: 0x7F120193
-			public const int m3_exceed_max_badge_text_suffix = 2131886483;
+			public const int m3_sys_motion_easing_standard = 2131886483;
 			
 			// aapt resource value: 0x7F120194
-			public const int m3_ref_typeface_brand_medium = 2131886484;
+			public const int m3_sys_motion_easing_standard_accelerate = 2131886484;
 			
 			// aapt resource value: 0x7F120195
-			public const int m3_ref_typeface_brand_regular = 2131886485;
+			public const int m3_sys_motion_easing_standard_decelerate = 2131886485;
 			
 			// aapt resource value: 0x7F120196
-			public const int m3_ref_typeface_plain_medium = 2131886486;
+			public const int material_clock_display_divider = 2131886486;
 			
 			// aapt resource value: 0x7F120197
-			public const int m3_ref_typeface_plain_regular = 2131886487;
+			public const int material_clock_toggle_content_description = 2131886487;
 			
 			// aapt resource value: 0x7F120198
-			public const int m3_sys_motion_easing_emphasized = 2131886488;
+			public const int material_hour_24h_suffix = 2131886488;
 			
 			// aapt resource value: 0x7F120199
-			public const int m3_sys_motion_easing_emphasized_accelerate = 2131886489;
+			public const int material_hour_selection = 2131886489;
 			
 			// aapt resource value: 0x7F12019A
-			public const int m3_sys_motion_easing_emphasized_decelerate = 2131886490;
+			public const int material_hour_suffix = 2131886490;
 			
 			// aapt resource value: 0x7F12019B
-			public const int m3_sys_motion_easing_emphasized_path_data = 2131886491;
+			public const int material_minute_selection = 2131886491;
 			
 			// aapt resource value: 0x7F12019C
-			public const int m3_sys_motion_easing_legacy = 2131886492;
+			public const int material_minute_suffix = 2131886492;
 			
 			// aapt resource value: 0x7F12019D
-			public const int m3_sys_motion_easing_legacy_accelerate = 2131886493;
+			public const int material_motion_easing_accelerated = 2131886493;
 			
 			// aapt resource value: 0x7F12019E
-			public const int m3_sys_motion_easing_legacy_decelerate = 2131886494;
+			public const int material_motion_easing_decelerated = 2131886494;
 			
 			// aapt resource value: 0x7F12019F
-			public const int m3_sys_motion_easing_linear = 2131886495;
+			public const int material_motion_easing_emphasized = 2131886495;
 			
 			// aapt resource value: 0x7F1201A0
-			public const int m3_sys_motion_easing_standard = 2131886496;
+			public const int material_motion_easing_linear = 2131886496;
 			
 			// aapt resource value: 0x7F1201A1
-			public const int m3_sys_motion_easing_standard_accelerate = 2131886497;
+			public const int material_motion_easing_standard = 2131886497;
 			
 			// aapt resource value: 0x7F1201A2
-			public const int m3_sys_motion_easing_standard_decelerate = 2131886498;
+			public const int material_slider_range_end = 2131886498;
 			
 			// aapt resource value: 0x7F1201A3
-			public const int material_clock_display_divider = 2131886499;
+			public const int material_slider_range_start = 2131886499;
 			
 			// aapt resource value: 0x7F1201A4
-			public const int material_clock_toggle_content_description = 2131886500;
+			public const int material_slider_value = 2131886500;
 			
 			// aapt resource value: 0x7F1201A5
-			public const int material_hour_24h_suffix = 2131886501;
+			public const int material_timepicker_am = 2131886501;
 			
 			// aapt resource value: 0x7F1201A6
-			public const int material_hour_selection = 2131886502;
+			public const int material_timepicker_clock_mode_description = 2131886502;
 			
 			// aapt resource value: 0x7F1201A7
-			public const int material_hour_suffix = 2131886503;
+			public const int material_timepicker_hour = 2131886503;
 			
 			// aapt resource value: 0x7F1201A8
-			public const int material_minute_selection = 2131886504;
+			public const int material_timepicker_minute = 2131886504;
 			
 			// aapt resource value: 0x7F1201A9
-			public const int material_minute_suffix = 2131886505;
+			public const int material_timepicker_pm = 2131886505;
 			
 			// aapt resource value: 0x7F1201AA
-			public const int material_motion_easing_accelerated = 2131886506;
+			public const int material_timepicker_select_time = 2131886506;
 			
 			// aapt resource value: 0x7F1201AB
-			public const int material_motion_easing_decelerated = 2131886507;
+			public const int material_timepicker_text_input_mode_description = 2131886507;
 			
 			// aapt resource value: 0x7F1201AC
-			public const int material_motion_easing_emphasized = 2131886508;
+			public const int mobile_common_bec_add_device_valid_error = 2131886508;
 			
 			// aapt resource value: 0x7F1201AD
-			public const int material_motion_easing_linear = 2131886509;
+			public const int mobile_common_bec_common_network_exception = 2131886509;
 			
 			// aapt resource value: 0x7F1201AE
-			public const int material_motion_easing_standard = 2131886510;
+			public const int mobile_common_bec_common_timeout = 2131886510;
 			
 			// aapt resource value: 0x7F1201AF
-			public const int material_slider_range_end = 2131886511;
+			public const int mobile_common_bec_device_locked = 2131886511;
 			
 			// aapt resource value: 0x7F1201B0
-			public const int material_slider_range_start = 2131886512;
+			public const int mobile_common_common_ignore = 2131886512;
 			
 			// aapt resource value: 0x7F1201B1
-			public const int material_slider_value = 2131886513;
+			public const int mobile_common_common_never_remind = 2131886513;
 			
 			// aapt resource value: 0x7F1201B2
-			public const int material_timepicker_am = 2131886514;
+			public const int mobile_common_device = 2131886514;
 			
 			// aapt resource value: 0x7F1201B3
-			public const int material_timepicker_clock_mode_description = 2131886515;
+			public const int mobile_common_device_pwd_rule = 2131886515;
 			
 			// aapt resource value: 0x7F1201B4
-			public const int material_timepicker_hour = 2131886516;
+			public const int mobile_common_device_timezone = 2131886516;
 			
 			// aapt resource value: 0x7F1201B5
-			public const int material_timepicker_minute = 2131886517;
+			public const int mobile_common_get_info_failed = 2131886517;
 			
 			// aapt resource value: 0x7F1201B6
-			public const int material_timepicker_pm = 2131886518;
+			public const int mobile_common_how_modify_device_pwd = 2131886518;
 			
 			// aapt resource value: 0x7F1201B7
-			public const int material_timepicker_select_time = 2131886519;
+			public const int mobile_common_lack_permission_then_exit = 2131886519;
 			
 			// aapt resource value: 0x7F1201B8
-			public const int material_timepicker_text_input_mode_description = 2131886520;
+			public const int mobile_common_later = 2131886520;
 			
 			// aapt resource value: 0x7F1201B9
-			public const int mobile_common_bec_add_device_valid_error = 2131886521;
+			public const int mobile_common_modify_device_pwd = 2131886521;
 			
 			// aapt resource value: 0x7F1201BA
-			public const int mobile_common_bec_common_network_exception = 2131886522;
+			public const int mobile_common_modify_device_pwd_tip = 2131886522;
 			
 			// aapt resource value: 0x7F1201BB
-			public const int mobile_common_bec_common_timeout = 2131886523;
+			public const int mobile_common_network_config = 2131886523;
 			
 			// aapt resource value: 0x7F1201BC
-			public const int mobile_common_bec_device_locked = 2131886524;
+			public const int mobile_common_no_google_play_detection = 2131886524;
 			
 			// aapt resource value: 0x7F1201BD
-			public const int mobile_common_common_ignore = 2131886525;
+			public const int mobile_common_no_huawei_play_detection = 2131886525;
 			
 			// aapt resource value: 0x7F1201BE
-			public const int mobile_common_common_never_remind = 2131886526;
+			public const int mobile_common_password_too_simple = 2131886526;
 			
 			// aapt resource value: 0x7F1201BF
-			public const int mobile_common_device = 2131886527;
+			public const int mobile_common_permission_apply = 2131886527;
 			
 			// aapt resource value: 0x7F1201C0
-			public const int mobile_common_device_pwd_rule = 2131886528;
+			public const int mobile_common_permission_explain_access_location_usage = 2131886528;
 			
 			// aapt resource value: 0x7F1201C1
-			public const int mobile_common_device_timezone = 2131886529;
+			public const int mobile_common_permission_explain_camera = 2131886529;
 			
 			// aapt resource value: 0x7F1201C2
-			public const int mobile_common_get_info_failed = 2131886530;
+			public const int mobile_common_permission_explain_external_storage = 2131886530;
 			
 			// aapt resource value: 0x7F1201C3
-			public const int mobile_common_how_modify_device_pwd = 2131886531;
+			public const int mobile_common_permission_explain_get_accounts = 2131886531;
 			
 			// aapt resource value: 0x7F1201C4
-			public const int mobile_common_lack_permission_then_exit = 2131886532;
+			public const int mobile_common_permission_explain_read_phone_state = 2131886532;
 			
 			// aapt resource value: 0x7F1201C5
-			public const int mobile_common_later = 2131886533;
+			public const int mobile_common_permission_explain_record_audio = 2131886533;
 			
 			// aapt resource value: 0x7F1201C6
-			public const int mobile_common_modify_device_pwd = 2131886534;
+			public const int mobile_common_permission_explain_write_accounts = 2131886534;
 			
 			// aapt resource value: 0x7F1201C7
-			public const int mobile_common_modify_device_pwd_tip = 2131886535;
+			public const int mobile_common_retry = 2131886535;
 			
 			// aapt resource value: 0x7F1201C8
-			public const int mobile_common_network_config = 2131886536;
+			public const int mobile_common_tap_to_view = 2131886536;
 			
 			// aapt resource value: 0x7F1201C9
-			public const int mobile_common_no_google_play_detection = 2131886537;
+			public const int more_settings = 2131886537;
 			
 			// aapt resource value: 0x7F1201CA
-			public const int mobile_common_no_huawei_play_detection = 2131886538;
+			public const int mtrl_badge_numberless_content_description = 2131886538;
 			
 			// aapt resource value: 0x7F1201CB
-			public const int mobile_common_password_too_simple = 2131886539;
+			public const int mtrl_checkbox_button_icon_path_checked = 2131886539;
 			
 			// aapt resource value: 0x7F1201CC
-			public const int mobile_common_permission_apply = 2131886540;
+			public const int mtrl_checkbox_button_icon_path_group_name = 2131886540;
 			
 			// aapt resource value: 0x7F1201CD
-			public const int mobile_common_permission_explain_access_location_usage = 2131886541;
+			public const int mtrl_checkbox_button_icon_path_indeterminate = 2131886541;
 			
 			// aapt resource value: 0x7F1201CE
-			public const int mobile_common_permission_explain_camera = 2131886542;
+			public const int mtrl_checkbox_button_icon_path_name = 2131886542;
 			
 			// aapt resource value: 0x7F1201CF
-			public const int mobile_common_permission_explain_external_storage = 2131886543;
+			public const int mtrl_checkbox_button_path_checked = 2131886543;
 			
 			// aapt resource value: 0x7F1201D0
-			public const int mobile_common_permission_explain_get_accounts = 2131886544;
+			public const int mtrl_checkbox_button_path_group_name = 2131886544;
 			
 			// aapt resource value: 0x7F1201D1
-			public const int mobile_common_permission_explain_read_phone_state = 2131886545;
+			public const int mtrl_checkbox_button_path_name = 2131886545;
 			
 			// aapt resource value: 0x7F1201D2
-			public const int mobile_common_permission_explain_record_audio = 2131886546;
+			public const int mtrl_checkbox_button_path_unchecked = 2131886546;
 			
 			// aapt resource value: 0x7F1201D3
-			public const int mobile_common_permission_explain_write_accounts = 2131886547;
+			public const int mtrl_checkbox_state_description_checked = 2131886547;
 			
 			// aapt resource value: 0x7F1201D4
-			public const int mobile_common_retry = 2131886548;
+			public const int mtrl_checkbox_state_description_indeterminate = 2131886548;
 			
 			// aapt resource value: 0x7F1201D5
-			public const int mobile_common_tap_to_view = 2131886549;
+			public const int mtrl_checkbox_state_description_unchecked = 2131886549;
 			
 			// aapt resource value: 0x7F1201D6
-			public const int more_settings = 2131886550;
+			public const int mtrl_chip_close_icon_content_description = 2131886550;
 			
 			// aapt resource value: 0x7F1201D7
-			public const int mtrl_badge_numberless_content_description = 2131886551;
+			public const int mtrl_exceed_max_badge_number_content_description = 2131886551;
 			
 			// aapt resource value: 0x7F1201D8
-			public const int mtrl_checkbox_button_icon_path_checked = 2131886552;
+			public const int mtrl_exceed_max_badge_number_suffix = 2131886552;
 			
 			// aapt resource value: 0x7F1201D9
-			public const int mtrl_checkbox_button_icon_path_group_name = 2131886553;
+			public const int mtrl_picker_a11y_next_month = 2131886553;
 			
 			// aapt resource value: 0x7F1201DA
-			public const int mtrl_checkbox_button_icon_path_indeterminate = 2131886554;
+			public const int mtrl_picker_a11y_prev_month = 2131886554;
 			
 			// aapt resource value: 0x7F1201DB
-			public const int mtrl_checkbox_button_icon_path_name = 2131886555;
+			public const int mtrl_picker_announce_current_range_selection = 2131886555;
 			
 			// aapt resource value: 0x7F1201DC
-			public const int mtrl_checkbox_button_path_checked = 2131886556;
+			public const int mtrl_picker_announce_current_selection = 2131886556;
 			
 			// aapt resource value: 0x7F1201DD
-			public const int mtrl_checkbox_button_path_group_name = 2131886557;
+			public const int mtrl_picker_announce_current_selection_none = 2131886557;
 			
 			// aapt resource value: 0x7F1201DE
-			public const int mtrl_checkbox_button_path_name = 2131886558;
+			public const int mtrl_picker_cancel = 2131886558;
 			
 			// aapt resource value: 0x7F1201DF
-			public const int mtrl_checkbox_button_path_unchecked = 2131886559;
+			public const int mtrl_picker_confirm = 2131886559;
 			
 			// aapt resource value: 0x7F1201E0
-			public const int mtrl_checkbox_state_description_checked = 2131886560;
+			public const int mtrl_picker_date_header_selected = 2131886560;
 			
 			// aapt resource value: 0x7F1201E1
-			public const int mtrl_checkbox_state_description_indeterminate = 2131886561;
+			public const int mtrl_picker_date_header_title = 2131886561;
 			
 			// aapt resource value: 0x7F1201E2
-			public const int mtrl_checkbox_state_description_unchecked = 2131886562;
+			public const int mtrl_picker_date_header_unselected = 2131886562;
 			
 			// aapt resource value: 0x7F1201E3
-			public const int mtrl_chip_close_icon_content_description = 2131886563;
+			public const int mtrl_picker_day_of_week_column_header = 2131886563;
 			
 			// aapt resource value: 0x7F1201E4
-			public const int mtrl_exceed_max_badge_number_content_description = 2131886564;
+			public const int mtrl_picker_end_date_description = 2131886564;
 			
 			// aapt resource value: 0x7F1201E5
-			public const int mtrl_exceed_max_badge_number_suffix = 2131886565;
+			public const int mtrl_picker_invalid_format = 2131886565;
 			
 			// aapt resource value: 0x7F1201E6
-			public const int mtrl_picker_a11y_next_month = 2131886566;
+			public const int mtrl_picker_invalid_format_example = 2131886566;
 			
 			// aapt resource value: 0x7F1201E7
-			public const int mtrl_picker_a11y_prev_month = 2131886567;
+			public const int mtrl_picker_invalid_format_use = 2131886567;
 			
 			// aapt resource value: 0x7F1201E8
-			public const int mtrl_picker_announce_current_range_selection = 2131886568;
+			public const int mtrl_picker_invalid_range = 2131886568;
 			
 			// aapt resource value: 0x7F1201E9
-			public const int mtrl_picker_announce_current_selection = 2131886569;
+			public const int mtrl_picker_navigate_to_current_year_description = 2131886569;
 			
 			// aapt resource value: 0x7F1201EA
-			public const int mtrl_picker_announce_current_selection_none = 2131886570;
+			public const int mtrl_picker_navigate_to_year_description = 2131886570;
 			
 			// aapt resource value: 0x7F1201EB
-			public const int mtrl_picker_cancel = 2131886571;
+			public const int mtrl_picker_out_of_range = 2131886571;
 			
 			// aapt resource value: 0x7F1201EC
-			public const int mtrl_picker_confirm = 2131886572;
+			public const int mtrl_picker_range_header_only_end_selected = 2131886572;
 			
 			// aapt resource value: 0x7F1201ED
-			public const int mtrl_picker_date_header_selected = 2131886573;
+			public const int mtrl_picker_range_header_only_start_selected = 2131886573;
 			
 			// aapt resource value: 0x7F1201EE
-			public const int mtrl_picker_date_header_title = 2131886574;
+			public const int mtrl_picker_range_header_selected = 2131886574;
 			
 			// aapt resource value: 0x7F1201EF
-			public const int mtrl_picker_date_header_unselected = 2131886575;
+			public const int mtrl_picker_range_header_title = 2131886575;
 			
 			// aapt resource value: 0x7F1201F0
-			public const int mtrl_picker_day_of_week_column_header = 2131886576;
+			public const int mtrl_picker_range_header_unselected = 2131886576;
 			
 			// aapt resource value: 0x7F1201F1
-			public const int mtrl_picker_end_date_description = 2131886577;
+			public const int mtrl_picker_save = 2131886577;
 			
 			// aapt resource value: 0x7F1201F2
-			public const int mtrl_picker_invalid_format = 2131886578;
+			public const int mtrl_picker_start_date_description = 2131886578;
 			
 			// aapt resource value: 0x7F1201F3
-			public const int mtrl_picker_invalid_format_example = 2131886579;
+			public const int mtrl_picker_text_input_date_hint = 2131886579;
 			
 			// aapt resource value: 0x7F1201F4
-			public const int mtrl_picker_invalid_format_use = 2131886580;
+			public const int mtrl_picker_text_input_date_range_end_hint = 2131886580;
 			
 			// aapt resource value: 0x7F1201F5
-			public const int mtrl_picker_invalid_range = 2131886581;
+			public const int mtrl_picker_text_input_date_range_start_hint = 2131886581;
 			
 			// aapt resource value: 0x7F1201F6
-			public const int mtrl_picker_navigate_to_current_year_description = 2131886582;
+			public const int mtrl_picker_text_input_day_abbr = 2131886582;
 			
 			// aapt resource value: 0x7F1201F7
-			public const int mtrl_picker_navigate_to_year_description = 2131886583;
+			public const int mtrl_picker_text_input_month_abbr = 2131886583;
 			
 			// aapt resource value: 0x7F1201F8
-			public const int mtrl_picker_out_of_range = 2131886584;
+			public const int mtrl_picker_text_input_year_abbr = 2131886584;
 			
 			// aapt resource value: 0x7F1201F9
-			public const int mtrl_picker_range_header_only_end_selected = 2131886585;
+			public const int mtrl_picker_today_description = 2131886585;
 			
 			// aapt resource value: 0x7F1201FA
-			public const int mtrl_picker_range_header_only_start_selected = 2131886586;
+			public const int mtrl_picker_toggle_to_calendar_input_mode = 2131886586;
 			
 			// aapt resource value: 0x7F1201FB
-			public const int mtrl_picker_range_header_selected = 2131886587;
+			public const int mtrl_picker_toggle_to_day_selection = 2131886587;
 			
 			// aapt resource value: 0x7F1201FC
-			public const int mtrl_picker_range_header_title = 2131886588;
+			public const int mtrl_picker_toggle_to_text_input_mode = 2131886588;
 			
 			// aapt resource value: 0x7F1201FD
-			public const int mtrl_picker_range_header_unselected = 2131886589;
+			public const int mtrl_picker_toggle_to_year_selection = 2131886589;
 			
 			// aapt resource value: 0x7F1201FE
-			public const int mtrl_picker_save = 2131886590;
+			public const int mtrl_switch_thumb_group_name = 2131886590;
 			
 			// aapt resource value: 0x7F1201FF
-			public const int mtrl_picker_start_date_description = 2131886591;
+			public const int mtrl_switch_thumb_path_checked = 2131886591;
 			
 			// aapt resource value: 0x7F120200
-			public const int mtrl_picker_text_input_date_hint = 2131886592;
+			public const int mtrl_switch_thumb_path_morphing = 2131886592;
 			
 			// aapt resource value: 0x7F120201
-			public const int mtrl_picker_text_input_date_range_end_hint = 2131886593;
+			public const int mtrl_switch_thumb_path_name = 2131886593;
 			
 			// aapt resource value: 0x7F120202
-			public const int mtrl_picker_text_input_date_range_start_hint = 2131886594;
+			public const int mtrl_switch_thumb_path_pressed = 2131886594;
 			
 			// aapt resource value: 0x7F120203
-			public const int mtrl_picker_text_input_day_abbr = 2131886595;
+			public const int mtrl_switch_thumb_path_unchecked = 2131886595;
 			
 			// aapt resource value: 0x7F120204
-			public const int mtrl_picker_text_input_month_abbr = 2131886596;
+			public const int mtrl_switch_track_decoration_path = 2131886596;
 			
 			// aapt resource value: 0x7F120205
-			public const int mtrl_picker_text_input_year_abbr = 2131886597;
+			public const int mtrl_switch_track_path = 2131886597;
 			
 			// aapt resource value: 0x7F120206
-			public const int mtrl_picker_today_description = 2131886598;
+			public const int mtrl_timepicker_cancel = 2131886598;
 			
 			// aapt resource value: 0x7F120207
-			public const int mtrl_picker_toggle_to_calendar_input_mode = 2131886599;
+			public const int mtrl_timepicker_confirm = 2131886599;
 			
 			// aapt resource value: 0x7F120208
-			public const int mtrl_picker_toggle_to_day_selection = 2131886600;
+			public const int not_recognized_fingerprint_hint = 2131886600;
 			
 			// aapt resource value: 0x7F120209
-			public const int mtrl_picker_toggle_to_text_input_mode = 2131886601;
+			public const int on_the_phone = 2131886601;
 			
 			// aapt resource value: 0x7F12020A
-			public const int mtrl_picker_toggle_to_year_selection = 2131886602;
+			public const int password_toggle_content_description = 2131886602;
 			
 			// aapt resource value: 0x7F12020B
-			public const int mtrl_switch_thumb_group_name = 2131886603;
+			public const int path_password_eye = 2131886603;
 			
 			// aapt resource value: 0x7F12020C
-			public const int mtrl_switch_thumb_path_checked = 2131886604;
+			public const int path_password_eye_mask_strike_through = 2131886604;
 			
 			// aapt resource value: 0x7F12020D
-			public const int mtrl_switch_thumb_path_morphing = 2131886605;
+			public const int path_password_eye_mask_visible = 2131886605;
 			
 			// aapt resource value: 0x7F12020E
-			public const int mtrl_switch_thumb_path_name = 2131886606;
+			public const int path_password_strike_through = 2131886606;
 			
 			// aapt resource value: 0x7F12020F
-			public const int mtrl_switch_thumb_path_pressed = 2131886607;
+			public const int phone_not_match_tip = 2131886607;
 			
 			// aapt resource value: 0x7F120210
-			public const int mtrl_switch_thumb_path_unchecked = 2131886608;
+			public const int pickerview_cancel = 2131886608;
 			
 			// aapt resource value: 0x7F120211
-			public const int mtrl_switch_track_decoration_path = 2131886609;
+			public const int pickerview_day = 2131886609;
 			
 			// aapt resource value: 0x7F120212
-			public const int mtrl_switch_track_path = 2131886610;
+			public const int pickerview_hours = 2131886610;
 			
 			// aapt resource value: 0x7F120213
-			public const int mtrl_timepicker_cancel = 2131886611;
+			public const int pickerview_minutes = 2131886611;
 			
 			// aapt resource value: 0x7F120214
-			public const int mtrl_timepicker_confirm = 2131886612;
+			public const int pickerview_month = 2131886612;
 			
 			// aapt resource value: 0x7F120215
-			public const int not_recognized_fingerprint_hint = 2131886613;
+			public const int pickerview_seconds = 2131886613;
 			
 			// aapt resource value: 0x7F120216
-			public const int on_the_phone = 2131886614;
+			public const int pickerview_submit = 2131886614;
 			
 			// aapt resource value: 0x7F120217
-			public const int password_toggle_content_description = 2131886615;
+			public const int pickerview_year = 2131886615;
 			
 			// aapt resource value: 0x7F120218
-			public const int path_password_eye = 2131886616;
+			public const int privacy_policy_and_service_agreement = 2131886616;
 			
 			// aapt resource value: 0x7F120219
-			public const int path_password_eye_mask_strike_through = 2131886617;
+			public const int pull_to_refresh_from_bottom_pull_label = 2131886617;
 			
 			// aapt resource value: 0x7F12021A
-			public const int path_password_eye_mask_visible = 2131886618;
+			public const int pull_to_refresh_from_bottom_refreshing_label = 2131886618;
 			
 			// aapt resource value: 0x7F12021B
-			public const int path_password_strike_through = 2131886619;
+			public const int pull_to_refresh_from_bottom_release_label = 2131886619;
 			
 			// aapt resource value: 0x7F12021C
-			public const int phone_not_match_tip = 2131886620;
+			public const int pull_to_refresh_pull_label = 2131886620;
 			
 			// aapt resource value: 0x7F12021D
-			public const int pickerview_cancel = 2131886621;
+			public const int pull_to_refresh_refreshing_label = 2131886621;
 			
 			// aapt resource value: 0x7F12021E
-			public const int pickerview_day = 2131886622;
+			public const int pull_to_refresh_release_label = 2131886622;
 			
 			// aapt resource value: 0x7F12021F
-			public const int pickerview_hours = 2131886623;
+			public const int read_privacy_policy_and_service_agreement_tip = 2131886623;
 			
 			// aapt resource value: 0x7F120220
-			public const int pickerview_minutes = 2131886624;
+			public const int scan_title = 2131886624;
 			
 			// aapt resource value: 0x7F120221
-			public const int pickerview_month = 2131886625;
+			public const int screenshot_fail = 2131886625;
 			
 			// aapt resource value: 0x7F120222
-			public const int pickerview_seconds = 2131886626;
-			
-			// aapt resource value: 0x7F120223
-			public const int pickerview_submit = 2131886627;
+			public const int screenshot_success = 2131886626;
 			
 			// aapt resource value: 0x7F120224
-			public const int pickerview_year = 2131886628;
+			public const int searchbar_scrolling_view_behavior = 2131886628;
 			
 			// aapt resource value: 0x7F120225
-			public const int privacy_policy_and_service_agreement = 2131886629;
+			public const int searchview_clear_text_content_description = 2131886629;
 			
 			// aapt resource value: 0x7F120226
-			public const int pull_to_refresh_from_bottom_pull_label = 2131886630;
+			public const int searchview_navigation_content_description = 2131886630;
+			
+			// aapt resource value: 0x7F120223
+			public const int search_menu_title = 2131886627;
 			
 			// aapt resource value: 0x7F120227
-			public const int pull_to_refresh_from_bottom_refreshing_label = 2131886631;
+			public const int side_sheet_accessibility_pane_title = 2131886631;
 			
 			// aapt resource value: 0x7F120228
-			public const int pull_to_refresh_from_bottom_release_label = 2131886632;
+			public const int side_sheet_behavior = 2131886632;
 			
 			// aapt resource value: 0x7F120229
-			public const int pull_to_refresh_pull_label = 2131886633;
+			public const int srl_component_falsify = 2131886633;
 			
 			// aapt resource value: 0x7F12022A
-			public const int pull_to_refresh_refreshing_label = 2131886634;
+			public const int srl_content_empty = 2131886634;
 			
 			// aapt resource value: 0x7F12022B
-			public const int pull_to_refresh_release_label = 2131886635;
+			public const int srl_footer_failed = 2131886635;
 			
 			// aapt resource value: 0x7F12022C
-			public const int push_cat_body = 2131886636;
+			public const int srl_footer_finish = 2131886636;
 			
 			// aapt resource value: 0x7F12022D
-			public const int push_cat_head = 2131886637;
+			public const int srl_footer_loading = 2131886637;
 			
 			// aapt resource value: 0x7F12022E
-			public const int read_privacy_policy_and_service_agreement_tip = 2131886638;
+			public const int srl_footer_nothing = 2131886638;
 			
 			// aapt resource value: 0x7F12022F
-			public const int scan_title = 2131886639;
+			public const int srl_footer_pulling = 2131886639;
 			
 			// aapt resource value: 0x7F120230
-			public const int screenshot_fail = 2131886640;
+			public const int srl_footer_refreshing = 2131886640;
 			
 			// aapt resource value: 0x7F120231
-			public const int screenshot_success = 2131886641;
-			
-			// aapt resource value: 0x7F120233
-			public const int searchbar_scrolling_view_behavior = 2131886643;
-			
-			// aapt resource value: 0x7F120234
-			public const int searchview_clear_text_content_description = 2131886644;
-			
-			// aapt resource value: 0x7F120235
-			public const int searchview_navigation_content_description = 2131886645;
+			public const int srl_footer_release = 2131886641;
 			
 			// aapt resource value: 0x7F120232
-			public const int search_menu_title = 2131886642;
+			public const int srl_header_failed = 2131886642;
+			
+			// aapt resource value: 0x7F120233
+			public const int srl_header_finish = 2131886643;
+			
+			// aapt resource value: 0x7F120234
+			public const int srl_header_loading = 2131886644;
+			
+			// aapt resource value: 0x7F120235
+			public const int srl_header_pulling = 2131886645;
 			
 			// aapt resource value: 0x7F120236
-			public const int side_sheet_accessibility_pane_title = 2131886646;
+			public const int srl_header_refreshing = 2131886646;
 			
 			// aapt resource value: 0x7F120237
-			public const int side_sheet_behavior = 2131886647;
+			public const int srl_header_release = 2131886647;
 			
 			// aapt resource value: 0x7F120238
-			public const int srl_component_falsify = 2131886648;
+			public const int srl_header_secondary = 2131886648;
 			
 			// aapt resource value: 0x7F120239
-			public const int srl_content_empty = 2131886649;
+			public const int srl_header_update = 2131886649;
 			
 			// aapt resource value: 0x7F12023A
-			public const int srl_footer_failed = 2131886650;
+			public const int status_bar_notification_info_overflow = 2131886650;
 			
 			// aapt resource value: 0x7F12023B
-			public const int srl_footer_finish = 2131886651;
+			public const int talk_open_failed = 2131886651;
 			
 			// aapt resource value: 0x7F12023C
-			public const int srl_footer_loading = 2131886652;
+			public const int talk_open_success = 2131886652;
 			
 			// aapt resource value: 0x7F12023D
-			public const int srl_footer_nothing = 2131886653;
+			public const int tip_confirm_unlock = 2131886653;
 			
 			// aapt resource value: 0x7F12023E
-			public const int srl_footer_pulling = 2131886654;
+			public const int touch_fingerprint_sensor_hint = 2131886654;
 			
 			// aapt resource value: 0x7F12023F
-			public const int srl_footer_refreshing = 2131886655;
+			public const int unlock_fail = 2131886655;
 			
 			// aapt resource value: 0x7F120240
-			public const int srl_footer_release = 2131886656;
+			public const int unlock_success = 2131886656;
 			
 			// aapt resource value: 0x7F120241
-			public const int srl_header_failed = 2131886657;
+			public const int user_input_name = 2131886657;
 			
 			// aapt resource value: 0x7F120242
-			public const int srl_header_finish = 2131886658;
+			public const int user_login_title = 2131886658;
 			
 			// aapt resource value: 0x7F120243
-			public const int srl_header_loading = 2131886659;
+			public const int user_pwd_login_login = 2131886659;
 			
 			// aapt resource value: 0x7F120244
-			public const int srl_header_pulling = 2131886660;
+			public const int user_register = 2131886660;
 			
 			// aapt resource value: 0x7F120245
-			public const int srl_header_refreshing = 2131886661;
+			public const int user_register_btn = 2131886661;
 			
 			// aapt resource value: 0x7F120246
-			public const int srl_header_release = 2131886662;
+			public const int valid_code_retrieve_valid_num = 2131886662;
 			
 			// aapt resource value: 0x7F120247
-			public const int srl_header_secondary = 2131886663;
+			public const int video_answer = 2131886663;
 			
 			// aapt resource value: 0x7F120248
-			public const int srl_header_update = 2131886664;
+			public const int video_confirm = 2131886664;
 			
 			// aapt resource value: 0x7F120249
-			public const int status_bar_notification_info_overflow = 2131886665;
+			public const int video_device = 2131886665;
 			
 			// aapt resource value: 0x7F12024A
-			public const int system_default_channel = 2131886666;
+			public const int video_fail = 2131886666;
 			
 			// aapt resource value: 0x7F12024B
-			public const int talk_open_failed = 2131886667;
+			public const int video_hang_up = 2131886667;
 			
 			// aapt resource value: 0x7F12024C
-			public const int talk_open_success = 2131886668;
+			public const int video_icon = 2131886668;
 			
 			// aapt resource value: 0x7F12024D
-			public const int tip_confirm_unlock = 2131886669;
+			public const int video_not_answer = 2131886669;
 			
 			// aapt resource value: 0x7F12024E
-			public const int touch_fingerprint_sensor_hint = 2131886670;
+			public const int video_screenshot = 2131886670;
 			
 			// aapt resource value: 0x7F12024F
-			public const int unlock_fail = 2131886671;
+			public const int video_success = 2131886671;
 			
 			// aapt resource value: 0x7F120250
-			public const int unlock_success = 2131886672;
+			public const int video_tip = 2131886672;
 			
 			// aapt resource value: 0x7F120251
-			public const int user_input_name = 2131886673;
+			public const int video_unlock = 2131886673;
 			
 			// aapt resource value: 0x7F120252
-			public const int user_login_title = 2131886674;
+			public const int zxing_app_name = 2131886674;
 			
 			// aapt resource value: 0x7F120253
-			public const int user_pwd_login_login = 2131886675;
+			public const int zxing_button_ok = 2131886675;
 			
 			// aapt resource value: 0x7F120254
-			public const int user_register = 2131886676;
+			public const int zxing_msg_camera_framework_bug = 2131886676;
 			
 			// aapt resource value: 0x7F120255
-			public const int user_register_btn = 2131886677;
+			public const int zxing_msg_default_status = 2131886677;
 			
 			// aapt resource value: 0x7F120256
-			public const int valid_code_retrieve_valid_num = 2131886678;
-			
-			// aapt resource value: 0x7F120257
-			public const int video_answer = 2131886679;
-			
-			// aapt resource value: 0x7F120258
-			public const int video_confirm = 2131886680;
-			
-			// aapt resource value: 0x7F120259
-			public const int video_device = 2131886681;
-			
-			// aapt resource value: 0x7F12025A
-			public const int video_fail = 2131886682;
-			
-			// aapt resource value: 0x7F12025B
-			public const int video_hang_up = 2131886683;
-			
-			// aapt resource value: 0x7F12025C
-			public const int video_icon = 2131886684;
-			
-			// aapt resource value: 0x7F12025D
-			public const int video_not_answer = 2131886685;
-			
-			// aapt resource value: 0x7F12025E
-			public const int video_screenshot = 2131886686;
-			
-			// aapt resource value: 0x7F12025F
-			public const int video_success = 2131886687;
-			
-			// aapt resource value: 0x7F120260
-			public const int video_tip = 2131886688;
-			
-			// aapt resource value: 0x7F120261
-			public const int video_unlock = 2131886689;
-			
-			// aapt resource value: 0x7F120262
-			public const int zxing_app_name = 2131886690;
-			
-			// aapt resource value: 0x7F120263
-			public const int zxing_button_ok = 2131886691;
-			
-			// aapt resource value: 0x7F120264
-			public const int zxing_msg_camera_framework_bug = 2131886692;
-			
-			// aapt resource value: 0x7F120265
-			public const int zxing_msg_default_status = 2131886693;
-			
-			// aapt resource value: 0x7F120266
-			public const int zxing_scan_tips = 2131886694;
+			public const int zxing_scan_tips = 2131886678;
 			
 			static String()
 			{
@@ -21596,17 +21048,17 @@
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7F130472
-			public const int add_device_btn_style = 2131952754;
-			
-			// aapt resource value: 0x7F130473
-			public const int add_device_common_16dp_2c2c2c = 2131952755;
-			
-			// aapt resource value: 0x7F130474
-			public const int add_device_help_style = 2131952756;
+			// aapt resource value: 0x7F130470
+			public const int add_device_btn_style = 2131952752;
 			
 			// aapt resource value: 0x7F130471
-			public const int add_Device_timeout_btn_style = 2131952753;
+			public const int add_device_common_16dp_2c2c2c = 2131952753;
+			
+			// aapt resource value: 0x7F130472
+			public const int add_device_help_style = 2131952754;
+			
+			// aapt resource value: 0x7F13046F
+			public const int add_Device_timeout_btn_style = 2131952751;
 			
 			// aapt resource value: 0x7F130000
 			public const int AlertDialog_AppCompat = 2131951616;
@@ -22030,9 +21482,6 @@
 			
 			// aapt resource value: 0x7F13007A
 			public const int Base_Theme_MaterialComponents_Light_Dialog_MinWidth = 2131951738;
-			
-			// aapt resource value: 0x7F130123
-			public const int Base_Translucent = 2131951907;
 			
 			// aapt resource value: 0x7F13009E
 			public const int Base_V14_ThemeOverlay_Material3_BottomSheetDialog = 2131951774;
@@ -22484,2633 +21933,2630 @@
 			// aapt resource value: 0x7F130122
 			public const int Base_Widget_MaterialComponents_TextView = 2131951906;
 			
+			// aapt resource value: 0x7F130123
+			public const int BottomSheetDialogAnimation = 2131951907;
+			
 			// aapt resource value: 0x7F130124
-			public const int BottomSheetDialogAnimation = 2131951908;
+			public const int CardView = 2131951908;
 			
 			// aapt resource value: 0x7F130125
-			public const int CardView = 2131951909;
+			public const int CardView_Dark = 2131951909;
 			
 			// aapt resource value: 0x7F130126
-			public const int CardView_Dark = 2131951910;
+			public const int CardView_Light = 2131951910;
 			
-			// aapt resource value: 0x7F130127
-			public const int CardView_Light = 2131951911;
+			// aapt resource value: 0x7F130473
+			public const int cc_line_long = 2131952755;
+			
+			// aapt resource value: 0x7F130474
+			public const int checks_dialog = 2131952756;
 			
 			// aapt resource value: 0x7F130475
-			public const int cc_line_long = 2131952757;
+			public const int common_dialog = 2131952757;
 			
 			// aapt resource value: 0x7F130476
-			public const int checks_dialog = 2131952758;
+			public const int common_horizontal_line_style = 2131952758;
 			
 			// aapt resource value: 0x7F130477
-			public const int common_dialog = 2131952759;
+			public const int common_input_style = 2131952759;
+			
+			// aapt resource value: 0x7F130127
+			public const int CustomAlertDialog = 2131951911;
 			
 			// aapt resource value: 0x7F130478
-			public const int common_horizontal_line_style = 2131952760;
+			public const int custom_dialog = 2131952760;
 			
 			// aapt resource value: 0x7F130479
-			public const int common_input_style = 2131952761;
-			
-			// aapt resource value: 0x7F130128
-			public const int CustomAlertDialog = 2131951912;
+			public const int custom_dialog2 = 2131952761;
 			
 			// aapt resource value: 0x7F13047A
-			public const int custom_dialog = 2131952762;
+			public const int dahua_wight_progressBar = 2131952762;
 			
 			// aapt resource value: 0x7F13047B
-			public const int custom_dialog2 = 2131952763;
+			public const int dev_detail_relativeLayout = 2131952763;
+			
+			// aapt resource value: 0x7F130128
+			public const int DialogTheme = 2131951912;
 			
 			// aapt resource value: 0x7F13047C
-			public const int dahua_wight_progressBar = 2131952764;
+			public const int lc_bottom_button_style = 2131952764;
 			
 			// aapt resource value: 0x7F13047D
-			public const int dev_detail_relativeLayout = 2131952765;
+			public const int lc_demo_loading = 2131952765;
 			
 			// aapt resource value: 0x7F130129
-			public const int DialogTheme = 2131951913;
+			public const int List = 2131951913;
 			
 			// aapt resource value: 0x7F13012A
-			public const int JPushTheme = 2131951914;
-			
-			// aapt resource value: 0x7F13047E
-			public const int lc_bottom_button_style = 2131952766;
-			
-			// aapt resource value: 0x7F13047F
-			public const int lc_demo_loading = 2131952767;
+			public const int MaterialAlertDialog_Material3 = 2131951914;
 			
 			// aapt resource value: 0x7F13012B
-			public const int List = 2131951915;
+			public const int MaterialAlertDialog_Material3_Animation = 2131951915;
 			
 			// aapt resource value: 0x7F13012C
-			public const int MaterialAlertDialog_Material3 = 2131951916;
+			public const int MaterialAlertDialog_Material3_Body_Text = 2131951916;
 			
 			// aapt resource value: 0x7F13012D
-			public const int MaterialAlertDialog_Material3_Animation = 2131951917;
+			public const int MaterialAlertDialog_Material3_Body_Text_CenterStacked = 2131951917;
 			
 			// aapt resource value: 0x7F13012E
-			public const int MaterialAlertDialog_Material3_Body_Text = 2131951918;
+			public const int MaterialAlertDialog_Material3_Title_Icon = 2131951918;
 			
 			// aapt resource value: 0x7F13012F
-			public const int MaterialAlertDialog_Material3_Body_Text_CenterStacked = 2131951919;
+			public const int MaterialAlertDialog_Material3_Title_Icon_CenterStacked = 2131951919;
 			
 			// aapt resource value: 0x7F130130
-			public const int MaterialAlertDialog_Material3_Title_Icon = 2131951920;
+			public const int MaterialAlertDialog_Material3_Title_Panel = 2131951920;
 			
 			// aapt resource value: 0x7F130131
-			public const int MaterialAlertDialog_Material3_Title_Icon_CenterStacked = 2131951921;
+			public const int MaterialAlertDialog_Material3_Title_Panel_CenterStacked = 2131951921;
 			
 			// aapt resource value: 0x7F130132
-			public const int MaterialAlertDialog_Material3_Title_Panel = 2131951922;
+			public const int MaterialAlertDialog_Material3_Title_Text = 2131951922;
 			
 			// aapt resource value: 0x7F130133
-			public const int MaterialAlertDialog_Material3_Title_Panel_CenterStacked = 2131951923;
+			public const int MaterialAlertDialog_Material3_Title_Text_CenterStacked = 2131951923;
 			
 			// aapt resource value: 0x7F130134
-			public const int MaterialAlertDialog_Material3_Title_Text = 2131951924;
+			public const int MaterialAlertDialog_MaterialComponents = 2131951924;
 			
 			// aapt resource value: 0x7F130135
-			public const int MaterialAlertDialog_Material3_Title_Text_CenterStacked = 2131951925;
+			public const int MaterialAlertDialog_MaterialComponents_Body_Text = 2131951925;
 			
 			// aapt resource value: 0x7F130136
-			public const int MaterialAlertDialog_MaterialComponents = 2131951926;
+			public const int MaterialAlertDialog_MaterialComponents_Picker_Date_Calendar = 2131951926;
 			
 			// aapt resource value: 0x7F130137
-			public const int MaterialAlertDialog_MaterialComponents_Body_Text = 2131951927;
+			public const int MaterialAlertDialog_MaterialComponents_Picker_Date_Spinner = 2131951927;
 			
 			// aapt resource value: 0x7F130138
-			public const int MaterialAlertDialog_MaterialComponents_Picker_Date_Calendar = 2131951928;
+			public const int MaterialAlertDialog_MaterialComponents_Title_Icon = 2131951928;
 			
 			// aapt resource value: 0x7F130139
-			public const int MaterialAlertDialog_MaterialComponents_Picker_Date_Spinner = 2131951929;
+			public const int MaterialAlertDialog_MaterialComponents_Title_Icon_CenterStacked = 2131951929;
 			
 			// aapt resource value: 0x7F13013A
-			public const int MaterialAlertDialog_MaterialComponents_Title_Icon = 2131951930;
+			public const int MaterialAlertDialog_MaterialComponents_Title_Panel = 2131951930;
 			
 			// aapt resource value: 0x7F13013B
-			public const int MaterialAlertDialog_MaterialComponents_Title_Icon_CenterStacked = 2131951931;
+			public const int MaterialAlertDialog_MaterialComponents_Title_Panel_CenterStacked = 2131951931;
 			
 			// aapt resource value: 0x7F13013C
-			public const int MaterialAlertDialog_MaterialComponents_Title_Panel = 2131951932;
+			public const int MaterialAlertDialog_MaterialComponents_Title_Text = 2131951932;
 			
 			// aapt resource value: 0x7F13013D
-			public const int MaterialAlertDialog_MaterialComponents_Title_Panel_CenterStacked = 2131951933;
+			public const int MaterialAlertDialog_MaterialComponents_Title_Text_CenterStacked = 2131951933;
 			
-			// aapt resource value: 0x7F13013E
-			public const int MaterialAlertDialog_MaterialComponents_Title_Text = 2131951934;
-			
-			// aapt resource value: 0x7F13013F
-			public const int MaterialAlertDialog_MaterialComponents_Title_Text_CenterStacked = 2131951935;
-			
-			// aapt resource value: 0x7F130481
-			public const int mobile_common_cam_text_edit = 2131952769;
-			
-			// aapt resource value: 0x7F130482
-			public const int mobile_common_cam_text_edit_enabled = 2131952770;
-			
-			// aapt resource value: 0x7F130483
-			public const int mobile_common_cam_text_name = 2131952771;
-			
-			// aapt resource value: 0x7F130484
-			public const int mobile_common_cam_text_name_enabled = 2131952772;
-			
-			// aapt resource value: 0x7F130485
-			public const int mobile_common_cam_text_sub = 2131952773;
-			
-			// aapt resource value: 0x7F130486
-			public const int mobile_common_checks_dialog = 2131952774;
-			
-			// aapt resource value: 0x7F130487
-			public const int mobile_common_common_title = 2131952775;
-			
-			// aapt resource value: 0x7F130488
-			public const int mobile_common_custom_dialog = 2131952776;
-			
-			// aapt resource value: 0x7F130489
-			public const int mobile_common_dahua_wight_progressBar = 2131952777;
-			
-			// aapt resource value: 0x7F13048A
-			public const int mobile_common_dahua_wight_progressBar_Small = 2131952778;
-			
-			// aapt resource value: 0x7F13048B
-			public const int mobile_common_dialog_anima = 2131952779;
+			// aapt resource value: 0x7F13047F
+			public const int mobile_common_cam_text_edit = 2131952767;
 			
 			// aapt resource value: 0x7F130480
-			public const int mobile_common_TextAppearance_22sp_black_bold = 2131952768;
+			public const int mobile_common_cam_text_edit_enabled = 2131952768;
+			
+			// aapt resource value: 0x7F130481
+			public const int mobile_common_cam_text_name = 2131952769;
+			
+			// aapt resource value: 0x7F130482
+			public const int mobile_common_cam_text_name_enabled = 2131952770;
+			
+			// aapt resource value: 0x7F130483
+			public const int mobile_common_cam_text_sub = 2131952771;
+			
+			// aapt resource value: 0x7F130484
+			public const int mobile_common_checks_dialog = 2131952772;
+			
+			// aapt resource value: 0x7F130485
+			public const int mobile_common_common_title = 2131952773;
+			
+			// aapt resource value: 0x7F130486
+			public const int mobile_common_custom_dialog = 2131952774;
+			
+			// aapt resource value: 0x7F130487
+			public const int mobile_common_dahua_wight_progressBar = 2131952775;
+			
+			// aapt resource value: 0x7F130488
+			public const int mobile_common_dahua_wight_progressBar_Small = 2131952776;
+			
+			// aapt resource value: 0x7F130489
+			public const int mobile_common_dialog_anima = 2131952777;
+			
+			// aapt resource value: 0x7F13047E
+			public const int mobile_common_TextAppearance_22sp_black_bold = 2131952766;
+			
+			// aapt resource value: 0x7F13013E
+			public const int MyDialogStyle = 2131951934;
+			
+			// aapt resource value: 0x7F13013F
+			public const int MyTheme = 2131951935;
 			
 			// aapt resource value: 0x7F130140
-			public const int MyDialogStyle = 2131951936;
+			public const int MyTheme1 = 2131951936;
+			
+			// aapt resource value: 0x7F13048A
+			public const int picker_view_scale_anim = 2131952778;
+			
+			// aapt resource value: 0x7F13048B
+			public const int picker_view_slide_anim = 2131952779;
 			
 			// aapt resource value: 0x7F130141
-			public const int MyTheme = 2131951937;
+			public const int Platform_AppCompat = 2131951937;
 			
 			// aapt resource value: 0x7F130142
-			public const int MyTheme1 = 2131951938;
-			
-			// aapt resource value: 0x7F13048C
-			public const int picker_view_scale_anim = 2131952780;
-			
-			// aapt resource value: 0x7F13048D
-			public const int picker_view_slide_anim = 2131952781;
+			public const int Platform_AppCompat_Light = 2131951938;
 			
 			// aapt resource value: 0x7F130143
-			public const int Platform_AppCompat = 2131951939;
+			public const int Platform_MaterialComponents = 2131951939;
 			
 			// aapt resource value: 0x7F130144
-			public const int Platform_AppCompat_Light = 2131951940;
+			public const int Platform_MaterialComponents_Dialog = 2131951940;
 			
 			// aapt resource value: 0x7F130145
-			public const int Platform_MaterialComponents = 2131951941;
+			public const int Platform_MaterialComponents_Light = 2131951941;
 			
 			// aapt resource value: 0x7F130146
-			public const int Platform_MaterialComponents_Dialog = 2131951942;
+			public const int Platform_MaterialComponents_Light_Dialog = 2131951942;
 			
 			// aapt resource value: 0x7F130147
-			public const int Platform_MaterialComponents_Light = 2131951943;
+			public const int Platform_ThemeOverlay_AppCompat = 2131951943;
 			
 			// aapt resource value: 0x7F130148
-			public const int Platform_MaterialComponents_Light_Dialog = 2131951944;
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131951944;
 			
 			// aapt resource value: 0x7F130149
-			public const int Platform_ThemeOverlay_AppCompat = 2131951945;
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131951945;
 			
 			// aapt resource value: 0x7F13014A
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131951946;
+			public const int Platform_V21_AppCompat = 2131951946;
 			
 			// aapt resource value: 0x7F13014B
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131951947;
+			public const int Platform_V21_AppCompat_Light = 2131951947;
 			
 			// aapt resource value: 0x7F13014C
-			public const int Platform_V21_AppCompat = 2131951948;
+			public const int Platform_V25_AppCompat = 2131951948;
 			
 			// aapt resource value: 0x7F13014D
-			public const int Platform_V21_AppCompat_Light = 2131951949;
+			public const int Platform_V25_AppCompat_Light = 2131951949;
 			
 			// aapt resource value: 0x7F13014E
-			public const int Platform_V25_AppCompat = 2131951950;
+			public const int Platform_Widget_AppCompat_Spinner = 2131951950;
 			
 			// aapt resource value: 0x7F13014F
-			public const int Platform_V25_AppCompat_Light = 2131951951;
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131951951;
 			
 			// aapt resource value: 0x7F130150
-			public const int Platform_Widget_AppCompat_Spinner = 2131951952;
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131951952;
 			
 			// aapt resource value: 0x7F130151
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131951953;
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131951953;
 			
 			// aapt resource value: 0x7F130152
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131951954;
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131951954;
 			
 			// aapt resource value: 0x7F130153
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131951955;
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131951955;
 			
 			// aapt resource value: 0x7F130154
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131951956;
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut = 2131951956;
 			
 			// aapt resource value: 0x7F130155
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131951957;
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow = 2131951957;
 			
 			// aapt resource value: 0x7F130156
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut = 2131951958;
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131951958;
 			
 			// aapt resource value: 0x7F130157
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow = 2131951959;
-			
-			// aapt resource value: 0x7F130158
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131951960;
-			
-			// aapt resource value: 0x7F130159
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Title = 2131951961;
-			
-			// aapt resource value: 0x7F13015F
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131951967;
-			
-			// aapt resource value: 0x7F13015A
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131951962;
-			
-			// aapt resource value: 0x7F13015B
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131951963;
-			
-			// aapt resource value: 0x7F13015C
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131951964;
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Title = 2131951959;
 			
 			// aapt resource value: 0x7F13015D
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131951965;
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131951965;
+			
+			// aapt resource value: 0x7F130158
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131951960;
+			
+			// aapt resource value: 0x7F130159
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131951961;
+			
+			// aapt resource value: 0x7F13015A
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131951962;
+			
+			// aapt resource value: 0x7F13015B
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131951963;
+			
+			// aapt resource value: 0x7F13015C
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131951964;
 			
 			// aapt resource value: 0x7F13015E
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131951966;
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131951966;
 			
-			// aapt resource value: 0x7F130160
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131951968;
-			
-			// aapt resource value: 0x7F130161
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131951969;
-			
-			// aapt resource value: 0x7F13018D
-			public const int ShapeAppearanceOverlay_Material3_Button = 2131952013;
-			
-			// aapt resource value: 0x7F13018E
-			public const int ShapeAppearanceOverlay_Material3_Chip = 2131952014;
-			
-			// aapt resource value: 0x7F13018F
-			public const int ShapeAppearanceOverlay_Material3_Corner_Bottom = 2131952015;
-			
-			// aapt resource value: 0x7F130190
-			public const int ShapeAppearanceOverlay_Material3_Corner_Left = 2131952016;
-			
-			// aapt resource value: 0x7F130191
-			public const int ShapeAppearanceOverlay_Material3_Corner_Right = 2131952017;
-			
-			// aapt resource value: 0x7F130192
-			public const int ShapeAppearanceOverlay_Material3_Corner_Top = 2131952018;
-			
-			// aapt resource value: 0x7F130193
-			public const int ShapeAppearanceOverlay_Material3_FloatingActionButton = 2131952019;
-			
-			// aapt resource value: 0x7F130194
-			public const int ShapeAppearanceOverlay_Material3_NavigationView_Item = 2131952020;
-			
-			// aapt resource value: 0x7F130195
-			public const int ShapeAppearanceOverlay_Material3_SearchBar = 2131952021;
-			
-			// aapt resource value: 0x7F130196
-			public const int ShapeAppearanceOverlay_Material3_SearchView = 2131952022;
-			
-			// aapt resource value: 0x7F130197
-			public const int ShapeAppearanceOverlay_MaterialAlertDialog_Material3 = 2131952023;
-			
-			// aapt resource value: 0x7F130198
-			public const int ShapeAppearanceOverlay_MaterialComponents_BottomSheet = 2131952024;
-			
-			// aapt resource value: 0x7F130199
-			public const int ShapeAppearanceOverlay_MaterialComponents_Chip = 2131952025;
-			
-			// aapt resource value: 0x7F13019A
-			public const int ShapeAppearanceOverlay_MaterialComponents_ExtendedFloatingActionButton = 2131952026;
-			
-			// aapt resource value: 0x7F13019B
-			public const int ShapeAppearanceOverlay_MaterialComponents_FloatingActionButton = 2131952027;
-			
-			// aapt resource value: 0x7F13019C
-			public const int ShapeAppearanceOverlay_MaterialComponents_MaterialCalendar_Day = 2131952028;
-			
-			// aapt resource value: 0x7F13019D
-			public const int ShapeAppearanceOverlay_MaterialComponents_MaterialCalendar_Window_Fullscreen = 2131952029;
-			
-			// aapt resource value: 0x7F13019E
-			public const int ShapeAppearanceOverlay_MaterialComponents_MaterialCalendar_Year = 2131952030;
-			
-			// aapt resource value: 0x7F13019F
-			public const int ShapeAppearanceOverlay_MaterialComponents_TextInputLayout_FilledBox = 2131952031;
-			
-			// aapt resource value: 0x7F130162
-			public const int ShapeAppearance_M3_Comp_Badge_Large_Shape = 2131951970;
-			
-			// aapt resource value: 0x7F130163
-			public const int ShapeAppearance_M3_Comp_Badge_Shape = 2131951971;
-			
-			// aapt resource value: 0x7F130164
-			public const int ShapeAppearance_M3_Comp_BottomAppBar_Container_Shape = 2131951972;
-			
-			// aapt resource value: 0x7F130165
-			public const int ShapeAppearance_M3_Comp_DatePicker_Modal_Date_Container_Shape = 2131951973;
-			
-			// aapt resource value: 0x7F130166
-			public const int ShapeAppearance_M3_Comp_FilledButton_Container_Shape = 2131951974;
-			
-			// aapt resource value: 0x7F130167
-			public const int ShapeAppearance_M3_Comp_NavigationBar_ActiveIndicator_Shape = 2131951975;
-			
-			// aapt resource value: 0x7F130168
-			public const int ShapeAppearance_M3_Comp_NavigationBar_Container_Shape = 2131951976;
-			
-			// aapt resource value: 0x7F130169
-			public const int ShapeAppearance_M3_Comp_NavigationDrawer_ActiveIndicator_Shape = 2131951977;
-			
-			// aapt resource value: 0x7F13016A
-			public const int ShapeAppearance_M3_Comp_NavigationRail_ActiveIndicator_Shape = 2131951978;
-			
-			// aapt resource value: 0x7F13016B
-			public const int ShapeAppearance_M3_Comp_NavigationRail_Container_Shape = 2131951979;
-			
-			// aapt resource value: 0x7F13016C
-			public const int ShapeAppearance_M3_Comp_SearchBar_Avatar_Shape = 2131951980;
-			
-			// aapt resource value: 0x7F13016D
-			public const int ShapeAppearance_M3_Comp_SearchBar_Container_Shape = 2131951981;
-			
-			// aapt resource value: 0x7F13016E
-			public const int ShapeAppearance_M3_Comp_SearchView_FullScreen_Container_Shape = 2131951982;
-			
-			// aapt resource value: 0x7F13016F
-			public const int ShapeAppearance_M3_Comp_Sheet_Side_Docked_Container_Shape = 2131951983;
-			
-			// aapt resource value: 0x7F130170
-			public const int ShapeAppearance_M3_Comp_Switch_Handle_Shape = 2131951984;
-			
-			// aapt resource value: 0x7F130171
-			public const int ShapeAppearance_M3_Comp_Switch_StateLayer_Shape = 2131951985;
-			
-			// aapt resource value: 0x7F130172
-			public const int ShapeAppearance_M3_Comp_Switch_Track_Shape = 2131951986;
-			
-			// aapt resource value: 0x7F130173
-			public const int ShapeAppearance_M3_Comp_TextButton_Container_Shape = 2131951987;
-			
-			// aapt resource value: 0x7F130174
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_ExtraLarge = 2131951988;
-			
-			// aapt resource value: 0x7F130175
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_ExtraSmall = 2131951989;
-			
-			// aapt resource value: 0x7F130176
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_Full = 2131951990;
-			
-			// aapt resource value: 0x7F130177
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_Large = 2131951991;
-			
-			// aapt resource value: 0x7F130178
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_Medium = 2131951992;
-			
-			// aapt resource value: 0x7F130179
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_None = 2131951993;
-			
-			// aapt resource value: 0x7F13017A
-			public const int ShapeAppearance_M3_Sys_Shape_Corner_Small = 2131951994;
-			
-			// aapt resource value: 0x7F13017B
-			public const int ShapeAppearance_Material3_Corner_ExtraLarge = 2131951995;
-			
-			// aapt resource value: 0x7F13017C
-			public const int ShapeAppearance_Material3_Corner_ExtraSmall = 2131951996;
-			
-			// aapt resource value: 0x7F13017D
-			public const int ShapeAppearance_Material3_Corner_Full = 2131951997;
-			
-			// aapt resource value: 0x7F13017E
-			public const int ShapeAppearance_Material3_Corner_Large = 2131951998;
-			
-			// aapt resource value: 0x7F13017F
-			public const int ShapeAppearance_Material3_Corner_Medium = 2131951999;
-			
-			// aapt resource value: 0x7F130180
-			public const int ShapeAppearance_Material3_Corner_None = 2131952000;
-			
-			// aapt resource value: 0x7F130181
-			public const int ShapeAppearance_Material3_Corner_Small = 2131952001;
-			
-			// aapt resource value: 0x7F130182
-			public const int ShapeAppearance_Material3_LargeComponent = 2131952002;
-			
-			// aapt resource value: 0x7F130183
-			public const int ShapeAppearance_Material3_MediumComponent = 2131952003;
-			
-			// aapt resource value: 0x7F130184
-			public const int ShapeAppearance_Material3_NavigationBarView_ActiveIndicator = 2131952004;
-			
-			// aapt resource value: 0x7F130185
-			public const int ShapeAppearance_Material3_SmallComponent = 2131952005;
-			
-			// aapt resource value: 0x7F130186
-			public const int ShapeAppearance_Material3_Tooltip = 2131952006;
-			
-			// aapt resource value: 0x7F130187
-			public const int ShapeAppearance_MaterialComponents = 2131952007;
-			
-			// aapt resource value: 0x7F130188
-			public const int ShapeAppearance_MaterialComponents_Badge = 2131952008;
-			
-			// aapt resource value: 0x7F130189
-			public const int ShapeAppearance_MaterialComponents_LargeComponent = 2131952009;
-			
-			// aapt resource value: 0x7F13018A
-			public const int ShapeAppearance_MaterialComponents_MediumComponent = 2131952010;
+			// aapt resource value: 0x7F13015F
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131951967;
 			
 			// aapt resource value: 0x7F13018B
-			public const int ShapeAppearance_MaterialComponents_SmallComponent = 2131952011;
+			public const int ShapeAppearanceOverlay_Material3_Button = 2131952011;
 			
 			// aapt resource value: 0x7F13018C
-			public const int ShapeAppearance_MaterialComponents_Tooltip = 2131952012;
+			public const int ShapeAppearanceOverlay_Material3_Chip = 2131952012;
 			
-			// aapt resource value: 0x7F13048E
-			public const int sign_dialog = 2131952782;
+			// aapt resource value: 0x7F13018D
+			public const int ShapeAppearanceOverlay_Material3_Corner_Bottom = 2131952013;
+			
+			// aapt resource value: 0x7F13018E
+			public const int ShapeAppearanceOverlay_Material3_Corner_Left = 2131952014;
+			
+			// aapt resource value: 0x7F13018F
+			public const int ShapeAppearanceOverlay_Material3_Corner_Right = 2131952015;
+			
+			// aapt resource value: 0x7F130190
+			public const int ShapeAppearanceOverlay_Material3_Corner_Top = 2131952016;
+			
+			// aapt resource value: 0x7F130191
+			public const int ShapeAppearanceOverlay_Material3_FloatingActionButton = 2131952017;
+			
+			// aapt resource value: 0x7F130192
+			public const int ShapeAppearanceOverlay_Material3_NavigationView_Item = 2131952018;
+			
+			// aapt resource value: 0x7F130193
+			public const int ShapeAppearanceOverlay_Material3_SearchBar = 2131952019;
+			
+			// aapt resource value: 0x7F130194
+			public const int ShapeAppearanceOverlay_Material3_SearchView = 2131952020;
+			
+			// aapt resource value: 0x7F130195
+			public const int ShapeAppearanceOverlay_MaterialAlertDialog_Material3 = 2131952021;
+			
+			// aapt resource value: 0x7F130196
+			public const int ShapeAppearanceOverlay_MaterialComponents_BottomSheet = 2131952022;
+			
+			// aapt resource value: 0x7F130197
+			public const int ShapeAppearanceOverlay_MaterialComponents_Chip = 2131952023;
+			
+			// aapt resource value: 0x7F130198
+			public const int ShapeAppearanceOverlay_MaterialComponents_ExtendedFloatingActionButton = 2131952024;
+			
+			// aapt resource value: 0x7F130199
+			public const int ShapeAppearanceOverlay_MaterialComponents_FloatingActionButton = 2131952025;
+			
+			// aapt resource value: 0x7F13019A
+			public const int ShapeAppearanceOverlay_MaterialComponents_MaterialCalendar_Day = 2131952026;
+			
+			// aapt resource value: 0x7F13019B
+			public const int ShapeAppearanceOverlay_MaterialComponents_MaterialCalendar_Window_Fullscreen = 2131952027;
+			
+			// aapt resource value: 0x7F13019C
+			public const int ShapeAppearanceOverlay_MaterialComponents_MaterialCalendar_Year = 2131952028;
+			
+			// aapt resource value: 0x7F13019D
+			public const int ShapeAppearanceOverlay_MaterialComponents_TextInputLayout_FilledBox = 2131952029;
+			
+			// aapt resource value: 0x7F130160
+			public const int ShapeAppearance_M3_Comp_Badge_Large_Shape = 2131951968;
+			
+			// aapt resource value: 0x7F130161
+			public const int ShapeAppearance_M3_Comp_Badge_Shape = 2131951969;
+			
+			// aapt resource value: 0x7F130162
+			public const int ShapeAppearance_M3_Comp_BottomAppBar_Container_Shape = 2131951970;
+			
+			// aapt resource value: 0x7F130163
+			public const int ShapeAppearance_M3_Comp_DatePicker_Modal_Date_Container_Shape = 2131951971;
+			
+			// aapt resource value: 0x7F130164
+			public const int ShapeAppearance_M3_Comp_FilledButton_Container_Shape = 2131951972;
+			
+			// aapt resource value: 0x7F130165
+			public const int ShapeAppearance_M3_Comp_NavigationBar_ActiveIndicator_Shape = 2131951973;
+			
+			// aapt resource value: 0x7F130166
+			public const int ShapeAppearance_M3_Comp_NavigationBar_Container_Shape = 2131951974;
+			
+			// aapt resource value: 0x7F130167
+			public const int ShapeAppearance_M3_Comp_NavigationDrawer_ActiveIndicator_Shape = 2131951975;
+			
+			// aapt resource value: 0x7F130168
+			public const int ShapeAppearance_M3_Comp_NavigationRail_ActiveIndicator_Shape = 2131951976;
+			
+			// aapt resource value: 0x7F130169
+			public const int ShapeAppearance_M3_Comp_NavigationRail_Container_Shape = 2131951977;
+			
+			// aapt resource value: 0x7F13016A
+			public const int ShapeAppearance_M3_Comp_SearchBar_Avatar_Shape = 2131951978;
+			
+			// aapt resource value: 0x7F13016B
+			public const int ShapeAppearance_M3_Comp_SearchBar_Container_Shape = 2131951979;
+			
+			// aapt resource value: 0x7F13016C
+			public const int ShapeAppearance_M3_Comp_SearchView_FullScreen_Container_Shape = 2131951980;
+			
+			// aapt resource value: 0x7F13016D
+			public const int ShapeAppearance_M3_Comp_Sheet_Side_Docked_Container_Shape = 2131951981;
+			
+			// aapt resource value: 0x7F13016E
+			public const int ShapeAppearance_M3_Comp_Switch_Handle_Shape = 2131951982;
+			
+			// aapt resource value: 0x7F13016F
+			public const int ShapeAppearance_M3_Comp_Switch_StateLayer_Shape = 2131951983;
+			
+			// aapt resource value: 0x7F130170
+			public const int ShapeAppearance_M3_Comp_Switch_Track_Shape = 2131951984;
+			
+			// aapt resource value: 0x7F130171
+			public const int ShapeAppearance_M3_Comp_TextButton_Container_Shape = 2131951985;
+			
+			// aapt resource value: 0x7F130172
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_ExtraLarge = 2131951986;
+			
+			// aapt resource value: 0x7F130173
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_ExtraSmall = 2131951987;
+			
+			// aapt resource value: 0x7F130174
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_Full = 2131951988;
+			
+			// aapt resource value: 0x7F130175
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_Large = 2131951989;
+			
+			// aapt resource value: 0x7F130176
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_Medium = 2131951990;
+			
+			// aapt resource value: 0x7F130177
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_None = 2131951991;
+			
+			// aapt resource value: 0x7F130178
+			public const int ShapeAppearance_M3_Sys_Shape_Corner_Small = 2131951992;
+			
+			// aapt resource value: 0x7F130179
+			public const int ShapeAppearance_Material3_Corner_ExtraLarge = 2131951993;
+			
+			// aapt resource value: 0x7F13017A
+			public const int ShapeAppearance_Material3_Corner_ExtraSmall = 2131951994;
+			
+			// aapt resource value: 0x7F13017B
+			public const int ShapeAppearance_Material3_Corner_Full = 2131951995;
+			
+			// aapt resource value: 0x7F13017C
+			public const int ShapeAppearance_Material3_Corner_Large = 2131951996;
+			
+			// aapt resource value: 0x7F13017D
+			public const int ShapeAppearance_Material3_Corner_Medium = 2131951997;
+			
+			// aapt resource value: 0x7F13017E
+			public const int ShapeAppearance_Material3_Corner_None = 2131951998;
+			
+			// aapt resource value: 0x7F13017F
+			public const int ShapeAppearance_Material3_Corner_Small = 2131951999;
+			
+			// aapt resource value: 0x7F130180
+			public const int ShapeAppearance_Material3_LargeComponent = 2131952000;
+			
+			// aapt resource value: 0x7F130181
+			public const int ShapeAppearance_Material3_MediumComponent = 2131952001;
+			
+			// aapt resource value: 0x7F130182
+			public const int ShapeAppearance_Material3_NavigationBarView_ActiveIndicator = 2131952002;
+			
+			// aapt resource value: 0x7F130183
+			public const int ShapeAppearance_Material3_SmallComponent = 2131952003;
+			
+			// aapt resource value: 0x7F130184
+			public const int ShapeAppearance_Material3_Tooltip = 2131952004;
+			
+			// aapt resource value: 0x7F130185
+			public const int ShapeAppearance_MaterialComponents = 2131952005;
+			
+			// aapt resource value: 0x7F130186
+			public const int ShapeAppearance_MaterialComponents_Badge = 2131952006;
+			
+			// aapt resource value: 0x7F130187
+			public const int ShapeAppearance_MaterialComponents_LargeComponent = 2131952007;
+			
+			// aapt resource value: 0x7F130188
+			public const int ShapeAppearance_MaterialComponents_MediumComponent = 2131952008;
+			
+			// aapt resource value: 0x7F130189
+			public const int ShapeAppearance_MaterialComponents_SmallComponent = 2131952009;
+			
+			// aapt resource value: 0x7F13018A
+			public const int ShapeAppearance_MaterialComponents_Tooltip = 2131952010;
+			
+			// aapt resource value: 0x7F13048C
+			public const int sign_dialog = 2131952780;
+			
+			// aapt resource value: 0x7F13019E
+			public const int SplashTheme = 2131952030;
+			
+			// aapt resource value: 0x7F13019F
+			public const int TextAppearance_17sp_lc_black_color = 2131952031;
 			
 			// aapt resource value: 0x7F1301A0
-			public const int SplashTheme = 2131952032;
+			public const int TextAppearance_AppCompat = 2131952032;
 			
 			// aapt resource value: 0x7F1301A1
-			public const int TextAppearance_17sp_lc_black_color = 2131952033;
+			public const int TextAppearance_AppCompat_Body1 = 2131952033;
 			
 			// aapt resource value: 0x7F1301A2
-			public const int TextAppearance_AppCompat = 2131952034;
+			public const int TextAppearance_AppCompat_Body2 = 2131952034;
 			
 			// aapt resource value: 0x7F1301A3
-			public const int TextAppearance_AppCompat_Body1 = 2131952035;
+			public const int TextAppearance_AppCompat_Button = 2131952035;
 			
 			// aapt resource value: 0x7F1301A4
-			public const int TextAppearance_AppCompat_Body2 = 2131952036;
+			public const int TextAppearance_AppCompat_Caption = 2131952036;
 			
 			// aapt resource value: 0x7F1301A5
-			public const int TextAppearance_AppCompat_Button = 2131952037;
+			public const int TextAppearance_AppCompat_Display1 = 2131952037;
 			
 			// aapt resource value: 0x7F1301A6
-			public const int TextAppearance_AppCompat_Caption = 2131952038;
+			public const int TextAppearance_AppCompat_Display2 = 2131952038;
 			
 			// aapt resource value: 0x7F1301A7
-			public const int TextAppearance_AppCompat_Display1 = 2131952039;
+			public const int TextAppearance_AppCompat_Display3 = 2131952039;
 			
 			// aapt resource value: 0x7F1301A8
-			public const int TextAppearance_AppCompat_Display2 = 2131952040;
+			public const int TextAppearance_AppCompat_Display4 = 2131952040;
 			
 			// aapt resource value: 0x7F1301A9
-			public const int TextAppearance_AppCompat_Display3 = 2131952041;
+			public const int TextAppearance_AppCompat_Headline = 2131952041;
 			
 			// aapt resource value: 0x7F1301AA
-			public const int TextAppearance_AppCompat_Display4 = 2131952042;
+			public const int TextAppearance_AppCompat_Inverse = 2131952042;
 			
 			// aapt resource value: 0x7F1301AB
-			public const int TextAppearance_AppCompat_Headline = 2131952043;
+			public const int TextAppearance_AppCompat_Large = 2131952043;
 			
 			// aapt resource value: 0x7F1301AC
-			public const int TextAppearance_AppCompat_Inverse = 2131952044;
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131952044;
 			
 			// aapt resource value: 0x7F1301AD
-			public const int TextAppearance_AppCompat_Large = 2131952045;
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131952045;
 			
 			// aapt resource value: 0x7F1301AE
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131952046;
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131952046;
 			
 			// aapt resource value: 0x7F1301AF
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131952047;
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131952047;
 			
 			// aapt resource value: 0x7F1301B0
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131952048;
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131952048;
 			
 			// aapt resource value: 0x7F1301B1
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131952049;
+			public const int TextAppearance_AppCompat_Medium = 2131952049;
 			
 			// aapt resource value: 0x7F1301B2
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131952050;
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131952050;
 			
 			// aapt resource value: 0x7F1301B3
-			public const int TextAppearance_AppCompat_Medium = 2131952051;
+			public const int TextAppearance_AppCompat_Menu = 2131952051;
 			
 			// aapt resource value: 0x7F1301B4
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131952052;
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131952052;
 			
 			// aapt resource value: 0x7F1301B5
-			public const int TextAppearance_AppCompat_Menu = 2131952053;
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131952053;
 			
 			// aapt resource value: 0x7F1301B6
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131952054;
+			public const int TextAppearance_AppCompat_Small = 2131952054;
 			
 			// aapt resource value: 0x7F1301B7
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131952055;
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131952055;
 			
 			// aapt resource value: 0x7F1301B8
-			public const int TextAppearance_AppCompat_Small = 2131952056;
+			public const int TextAppearance_AppCompat_Subhead = 2131952056;
 			
 			// aapt resource value: 0x7F1301B9
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131952057;
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131952057;
 			
 			// aapt resource value: 0x7F1301BA
-			public const int TextAppearance_AppCompat_Subhead = 2131952058;
+			public const int TextAppearance_AppCompat_Title = 2131952058;
 			
 			// aapt resource value: 0x7F1301BB
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131952059;
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131952059;
 			
 			// aapt resource value: 0x7F1301BC
-			public const int TextAppearance_AppCompat_Title = 2131952060;
+			public const int TextAppearance_AppCompat_Tooltip = 2131952060;
 			
 			// aapt resource value: 0x7F1301BD
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131952061;
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131952061;
 			
 			// aapt resource value: 0x7F1301BE
-			public const int TextAppearance_AppCompat_Tooltip = 2131952062;
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131952062;
 			
 			// aapt resource value: 0x7F1301BF
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131952063;
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131952063;
 			
 			// aapt resource value: 0x7F1301C0
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131952064;
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131952064;
 			
 			// aapt resource value: 0x7F1301C1
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131952065;
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131952065;
 			
 			// aapt resource value: 0x7F1301C2
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131952066;
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131952066;
 			
 			// aapt resource value: 0x7F1301C3
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131952067;
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131952067;
 			
 			// aapt resource value: 0x7F1301C4
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131952068;
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131952068;
 			
 			// aapt resource value: 0x7F1301C5
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131952069;
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131952069;
 			
 			// aapt resource value: 0x7F1301C6
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131952070;
+			public const int TextAppearance_AppCompat_Widget_Button = 2131952070;
 			
 			// aapt resource value: 0x7F1301C7
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131952071;
+			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131952071;
 			
 			// aapt resource value: 0x7F1301C8
-			public const int TextAppearance_AppCompat_Widget_Button = 2131952072;
+			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131952072;
 			
 			// aapt resource value: 0x7F1301C9
-			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131952073;
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131952073;
 			
 			// aapt resource value: 0x7F1301CA
-			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131952074;
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131952074;
 			
 			// aapt resource value: 0x7F1301CB
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131952075;
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131952075;
 			
 			// aapt resource value: 0x7F1301CC
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131952076;
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131952076;
 			
 			// aapt resource value: 0x7F1301CD
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131952077;
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131952077;
 			
 			// aapt resource value: 0x7F1301CE
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131952078;
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131952078;
 			
 			// aapt resource value: 0x7F1301CF
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131952079;
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131952079;
 			
 			// aapt resource value: 0x7F1301D0
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131952080;
+			public const int TextAppearance_Compat_Notification = 2131952080;
 			
 			// aapt resource value: 0x7F1301D1
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131952081;
+			public const int TextAppearance_Compat_Notification_Info = 2131952081;
 			
 			// aapt resource value: 0x7F1301D2
-			public const int TextAppearance_Compat_Notification = 2131952082;
+			public const int TextAppearance_Compat_Notification_Info_Media = 2131952082;
 			
 			// aapt resource value: 0x7F1301D3
-			public const int TextAppearance_Compat_Notification_Info = 2131952083;
+			public const int TextAppearance_Compat_Notification_Line2 = 2131952083;
 			
 			// aapt resource value: 0x7F1301D4
-			public const int TextAppearance_Compat_Notification_Info_Media = 2131952084;
+			public const int TextAppearance_Compat_Notification_Line2_Media = 2131952084;
 			
 			// aapt resource value: 0x7F1301D5
-			public const int TextAppearance_Compat_Notification_Line2 = 2131952085;
+			public const int TextAppearance_Compat_Notification_Media = 2131952085;
 			
 			// aapt resource value: 0x7F1301D6
-			public const int TextAppearance_Compat_Notification_Line2_Media = 2131952086;
+			public const int TextAppearance_Compat_Notification_Time = 2131952086;
 			
 			// aapt resource value: 0x7F1301D7
-			public const int TextAppearance_Compat_Notification_Media = 2131952087;
+			public const int TextAppearance_Compat_Notification_Time_Media = 2131952087;
 			
 			// aapt resource value: 0x7F1301D8
-			public const int TextAppearance_Compat_Notification_Time = 2131952088;
+			public const int TextAppearance_Compat_Notification_Title = 2131952088;
 			
 			// aapt resource value: 0x7F1301D9
-			public const int TextAppearance_Compat_Notification_Time_Media = 2131952089;
+			public const int TextAppearance_Compat_Notification_Title_Media = 2131952089;
 			
 			// aapt resource value: 0x7F1301DA
-			public const int TextAppearance_Compat_Notification_Title = 2131952090;
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131952090;
 			
 			// aapt resource value: 0x7F1301DB
-			public const int TextAppearance_Compat_Notification_Title_Media = 2131952091;
+			public const int TextAppearance_Design_Counter = 2131952091;
 			
 			// aapt resource value: 0x7F1301DC
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131952092;
+			public const int TextAppearance_Design_Counter_Overflow = 2131952092;
 			
 			// aapt resource value: 0x7F1301DD
-			public const int TextAppearance_Design_Counter = 2131952093;
+			public const int TextAppearance_Design_Error = 2131952093;
 			
 			// aapt resource value: 0x7F1301DE
-			public const int TextAppearance_Design_Counter_Overflow = 2131952094;
+			public const int TextAppearance_Design_HelperText = 2131952094;
 			
 			// aapt resource value: 0x7F1301DF
-			public const int TextAppearance_Design_Error = 2131952095;
+			public const int TextAppearance_Design_Hint = 2131952095;
 			
 			// aapt resource value: 0x7F1301E0
-			public const int TextAppearance_Design_HelperText = 2131952096;
+			public const int TextAppearance_Design_Placeholder = 2131952096;
 			
 			// aapt resource value: 0x7F1301E1
-			public const int TextAppearance_Design_Hint = 2131952097;
+			public const int TextAppearance_Design_Prefix = 2131952097;
 			
 			// aapt resource value: 0x7F1301E2
-			public const int TextAppearance_Design_Placeholder = 2131952098;
+			public const int TextAppearance_Design_Snackbar_Message = 2131952098;
 			
 			// aapt resource value: 0x7F1301E3
-			public const int TextAppearance_Design_Prefix = 2131952099;
+			public const int TextAppearance_Design_Suffix = 2131952099;
 			
 			// aapt resource value: 0x7F1301E4
-			public const int TextAppearance_Design_Snackbar_Message = 2131952100;
+			public const int TextAppearance_Design_Tab = 2131952100;
 			
 			// aapt resource value: 0x7F1301E5
-			public const int TextAppearance_Design_Suffix = 2131952101;
+			public const int TextAppearance_M3_Sys_Typescale_BodyLarge = 2131952101;
 			
 			// aapt resource value: 0x7F1301E6
-			public const int TextAppearance_Design_Tab = 2131952102;
+			public const int TextAppearance_M3_Sys_Typescale_BodyMedium = 2131952102;
 			
 			// aapt resource value: 0x7F1301E7
-			public const int TextAppearance_M3_Sys_Typescale_BodyLarge = 2131952103;
+			public const int TextAppearance_M3_Sys_Typescale_BodySmall = 2131952103;
 			
 			// aapt resource value: 0x7F1301E8
-			public const int TextAppearance_M3_Sys_Typescale_BodyMedium = 2131952104;
+			public const int TextAppearance_M3_Sys_Typescale_DisplayLarge = 2131952104;
 			
 			// aapt resource value: 0x7F1301E9
-			public const int TextAppearance_M3_Sys_Typescale_BodySmall = 2131952105;
+			public const int TextAppearance_M3_Sys_Typescale_DisplayMedium = 2131952105;
 			
 			// aapt resource value: 0x7F1301EA
-			public const int TextAppearance_M3_Sys_Typescale_DisplayLarge = 2131952106;
+			public const int TextAppearance_M3_Sys_Typescale_DisplaySmall = 2131952106;
 			
 			// aapt resource value: 0x7F1301EB
-			public const int TextAppearance_M3_Sys_Typescale_DisplayMedium = 2131952107;
+			public const int TextAppearance_M3_Sys_Typescale_HeadlineLarge = 2131952107;
 			
 			// aapt resource value: 0x7F1301EC
-			public const int TextAppearance_M3_Sys_Typescale_DisplaySmall = 2131952108;
+			public const int TextAppearance_M3_Sys_Typescale_HeadlineMedium = 2131952108;
 			
 			// aapt resource value: 0x7F1301ED
-			public const int TextAppearance_M3_Sys_Typescale_HeadlineLarge = 2131952109;
+			public const int TextAppearance_M3_Sys_Typescale_HeadlineSmall = 2131952109;
 			
 			// aapt resource value: 0x7F1301EE
-			public const int TextAppearance_M3_Sys_Typescale_HeadlineMedium = 2131952110;
+			public const int TextAppearance_M3_Sys_Typescale_LabelLarge = 2131952110;
 			
 			// aapt resource value: 0x7F1301EF
-			public const int TextAppearance_M3_Sys_Typescale_HeadlineSmall = 2131952111;
+			public const int TextAppearance_M3_Sys_Typescale_LabelMedium = 2131952111;
 			
 			// aapt resource value: 0x7F1301F0
-			public const int TextAppearance_M3_Sys_Typescale_LabelLarge = 2131952112;
+			public const int TextAppearance_M3_Sys_Typescale_LabelSmall = 2131952112;
 			
 			// aapt resource value: 0x7F1301F1
-			public const int TextAppearance_M3_Sys_Typescale_LabelMedium = 2131952113;
+			public const int TextAppearance_M3_Sys_Typescale_TitleLarge = 2131952113;
 			
 			// aapt resource value: 0x7F1301F2
-			public const int TextAppearance_M3_Sys_Typescale_LabelSmall = 2131952114;
+			public const int TextAppearance_M3_Sys_Typescale_TitleMedium = 2131952114;
 			
 			// aapt resource value: 0x7F1301F3
-			public const int TextAppearance_M3_Sys_Typescale_TitleLarge = 2131952115;
+			public const int TextAppearance_M3_Sys_Typescale_TitleSmall = 2131952115;
 			
 			// aapt resource value: 0x7F1301F4
-			public const int TextAppearance_M3_Sys_Typescale_TitleMedium = 2131952116;
+			public const int TextAppearance_Material3_ActionBar_Subtitle = 2131952116;
 			
 			// aapt resource value: 0x7F1301F5
-			public const int TextAppearance_M3_Sys_Typescale_TitleSmall = 2131952117;
+			public const int TextAppearance_Material3_ActionBar_Title = 2131952117;
 			
 			// aapt resource value: 0x7F1301F6
-			public const int TextAppearance_Material3_ActionBar_Subtitle = 2131952118;
+			public const int TextAppearance_Material3_BodyLarge = 2131952118;
 			
 			// aapt resource value: 0x7F1301F7
-			public const int TextAppearance_Material3_ActionBar_Title = 2131952119;
+			public const int TextAppearance_Material3_BodyMedium = 2131952119;
 			
 			// aapt resource value: 0x7F1301F8
-			public const int TextAppearance_Material3_BodyLarge = 2131952120;
+			public const int TextAppearance_Material3_BodySmall = 2131952120;
 			
 			// aapt resource value: 0x7F1301F9
-			public const int TextAppearance_Material3_BodyMedium = 2131952121;
+			public const int TextAppearance_Material3_DisplayLarge = 2131952121;
 			
 			// aapt resource value: 0x7F1301FA
-			public const int TextAppearance_Material3_BodySmall = 2131952122;
+			public const int TextAppearance_Material3_DisplayMedium = 2131952122;
 			
 			// aapt resource value: 0x7F1301FB
-			public const int TextAppearance_Material3_DisplayLarge = 2131952123;
+			public const int TextAppearance_Material3_DisplaySmall = 2131952123;
 			
 			// aapt resource value: 0x7F1301FC
-			public const int TextAppearance_Material3_DisplayMedium = 2131952124;
+			public const int TextAppearance_Material3_HeadlineLarge = 2131952124;
 			
 			// aapt resource value: 0x7F1301FD
-			public const int TextAppearance_Material3_DisplaySmall = 2131952125;
+			public const int TextAppearance_Material3_HeadlineMedium = 2131952125;
 			
 			// aapt resource value: 0x7F1301FE
-			public const int TextAppearance_Material3_HeadlineLarge = 2131952126;
+			public const int TextAppearance_Material3_HeadlineSmall = 2131952126;
 			
 			// aapt resource value: 0x7F1301FF
-			public const int TextAppearance_Material3_HeadlineMedium = 2131952127;
+			public const int TextAppearance_Material3_LabelLarge = 2131952127;
 			
 			// aapt resource value: 0x7F130200
-			public const int TextAppearance_Material3_HeadlineSmall = 2131952128;
+			public const int TextAppearance_Material3_LabelMedium = 2131952128;
 			
 			// aapt resource value: 0x7F130201
-			public const int TextAppearance_Material3_LabelLarge = 2131952129;
+			public const int TextAppearance_Material3_LabelSmall = 2131952129;
 			
 			// aapt resource value: 0x7F130202
-			public const int TextAppearance_Material3_LabelMedium = 2131952130;
+			public const int TextAppearance_Material3_MaterialTimePicker_Title = 2131952130;
 			
 			// aapt resource value: 0x7F130203
-			public const int TextAppearance_Material3_LabelSmall = 2131952131;
+			public const int TextAppearance_Material3_SearchBar = 2131952131;
 			
 			// aapt resource value: 0x7F130204
-			public const int TextAppearance_Material3_MaterialTimePicker_Title = 2131952132;
+			public const int TextAppearance_Material3_SearchView = 2131952132;
 			
 			// aapt resource value: 0x7F130205
-			public const int TextAppearance_Material3_SearchBar = 2131952133;
+			public const int TextAppearance_Material3_SearchView_Prefix = 2131952133;
 			
 			// aapt resource value: 0x7F130206
-			public const int TextAppearance_Material3_SearchView = 2131952134;
+			public const int TextAppearance_Material3_TitleLarge = 2131952134;
 			
 			// aapt resource value: 0x7F130207
-			public const int TextAppearance_Material3_SearchView_Prefix = 2131952135;
+			public const int TextAppearance_Material3_TitleMedium = 2131952135;
 			
 			// aapt resource value: 0x7F130208
-			public const int TextAppearance_Material3_TitleLarge = 2131952136;
+			public const int TextAppearance_Material3_TitleSmall = 2131952136;
 			
 			// aapt resource value: 0x7F130209
-			public const int TextAppearance_Material3_TitleMedium = 2131952137;
+			public const int TextAppearance_MaterialComponents_Badge = 2131952137;
 			
 			// aapt resource value: 0x7F13020A
-			public const int TextAppearance_Material3_TitleSmall = 2131952138;
+			public const int TextAppearance_MaterialComponents_Body1 = 2131952138;
 			
 			// aapt resource value: 0x7F13020B
-			public const int TextAppearance_MaterialComponents_Badge = 2131952139;
+			public const int TextAppearance_MaterialComponents_Body2 = 2131952139;
 			
 			// aapt resource value: 0x7F13020C
-			public const int TextAppearance_MaterialComponents_Body1 = 2131952140;
+			public const int TextAppearance_MaterialComponents_Button = 2131952140;
 			
 			// aapt resource value: 0x7F13020D
-			public const int TextAppearance_MaterialComponents_Body2 = 2131952141;
+			public const int TextAppearance_MaterialComponents_Caption = 2131952141;
 			
 			// aapt resource value: 0x7F13020E
-			public const int TextAppearance_MaterialComponents_Button = 2131952142;
+			public const int TextAppearance_MaterialComponents_Chip = 2131952142;
 			
 			// aapt resource value: 0x7F13020F
-			public const int TextAppearance_MaterialComponents_Caption = 2131952143;
+			public const int TextAppearance_MaterialComponents_Headline1 = 2131952143;
 			
 			// aapt resource value: 0x7F130210
-			public const int TextAppearance_MaterialComponents_Chip = 2131952144;
+			public const int TextAppearance_MaterialComponents_Headline2 = 2131952144;
 			
 			// aapt resource value: 0x7F130211
-			public const int TextAppearance_MaterialComponents_Headline1 = 2131952145;
+			public const int TextAppearance_MaterialComponents_Headline3 = 2131952145;
 			
 			// aapt resource value: 0x7F130212
-			public const int TextAppearance_MaterialComponents_Headline2 = 2131952146;
+			public const int TextAppearance_MaterialComponents_Headline4 = 2131952146;
 			
 			// aapt resource value: 0x7F130213
-			public const int TextAppearance_MaterialComponents_Headline3 = 2131952147;
+			public const int TextAppearance_MaterialComponents_Headline5 = 2131952147;
 			
 			// aapt resource value: 0x7F130214
-			public const int TextAppearance_MaterialComponents_Headline4 = 2131952148;
+			public const int TextAppearance_MaterialComponents_Headline6 = 2131952148;
 			
 			// aapt resource value: 0x7F130215
-			public const int TextAppearance_MaterialComponents_Headline5 = 2131952149;
+			public const int TextAppearance_MaterialComponents_Overline = 2131952149;
 			
 			// aapt resource value: 0x7F130216
-			public const int TextAppearance_MaterialComponents_Headline6 = 2131952150;
+			public const int TextAppearance_MaterialComponents_Subtitle1 = 2131952150;
 			
 			// aapt resource value: 0x7F130217
-			public const int TextAppearance_MaterialComponents_Overline = 2131952151;
+			public const int TextAppearance_MaterialComponents_Subtitle2 = 2131952151;
 			
 			// aapt resource value: 0x7F130218
-			public const int TextAppearance_MaterialComponents_Subtitle1 = 2131952152;
+			public const int TextAppearance_MaterialComponents_TimePicker_Title = 2131952152;
 			
 			// aapt resource value: 0x7F130219
-			public const int TextAppearance_MaterialComponents_Subtitle2 = 2131952153;
+			public const int TextAppearance_MaterialComponents_Tooltip = 2131952153;
 			
 			// aapt resource value: 0x7F13021A
-			public const int TextAppearance_MaterialComponents_TimePicker_Title = 2131952154;
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131952154;
 			
 			// aapt resource value: 0x7F13021B
-			public const int TextAppearance_MaterialComponents_Tooltip = 2131952155;
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131952155;
 			
 			// aapt resource value: 0x7F13021C
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131952156;
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131952156;
 			
 			// aapt resource value: 0x7F13021D
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131952157;
-			
-			// aapt resource value: 0x7F13021E
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131952158;
-			
-			// aapt resource value: 0x7F13021F
-			public const int TextView = 2131952159;
-			
-			// aapt resource value: 0x7F130287
-			public const int ThemeOverlay_AppCompat = 2131952263;
-			
-			// aapt resource value: 0x7F130288
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131952264;
-			
-			// aapt resource value: 0x7F130289
-			public const int ThemeOverlay_AppCompat_Dark = 2131952265;
-			
-			// aapt resource value: 0x7F13028A
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131952266;
-			
-			// aapt resource value: 0x7F13028B
-			public const int ThemeOverlay_AppCompat_DayNight = 2131952267;
-			
-			// aapt resource value: 0x7F13028C
-			public const int ThemeOverlay_AppCompat_DayNight_ActionBar = 2131952268;
-			
-			// aapt resource value: 0x7F13028D
-			public const int ThemeOverlay_AppCompat_Dialog = 2131952269;
-			
-			// aapt resource value: 0x7F13028E
-			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131952270;
-			
-			// aapt resource value: 0x7F13028F
-			public const int ThemeOverlay_AppCompat_Light = 2131952271;
-			
-			// aapt resource value: 0x7F130290
-			public const int ThemeOverlay_Design_TextInputEditText = 2131952272;
-			
-			// aapt resource value: 0x7F130291
-			public const int ThemeOverlay_Material3 = 2131952273;
-			
-			// aapt resource value: 0x7F130292
-			public const int ThemeOverlay_Material3_ActionBar = 2131952274;
-			
-			// aapt resource value: 0x7F130293
-			public const int ThemeOverlay_Material3_AutoCompleteTextView = 2131952275;
-			
-			// aapt resource value: 0x7F130294
-			public const int ThemeOverlay_Material3_AutoCompleteTextView_FilledBox = 2131952276;
-			
-			// aapt resource value: 0x7F130295
-			public const int ThemeOverlay_Material3_AutoCompleteTextView_FilledBox_Dense = 2131952277;
-			
-			// aapt resource value: 0x7F130296
-			public const int ThemeOverlay_Material3_AutoCompleteTextView_OutlinedBox = 2131952278;
-			
-			// aapt resource value: 0x7F130297
-			public const int ThemeOverlay_Material3_AutoCompleteTextView_OutlinedBox_Dense = 2131952279;
-			
-			// aapt resource value: 0x7F130298
-			public const int ThemeOverlay_Material3_BottomAppBar = 2131952280;
-			
-			// aapt resource value: 0x7F130299
-			public const int ThemeOverlay_Material3_BottomAppBar_Legacy = 2131952281;
-			
-			// aapt resource value: 0x7F13029A
-			public const int ThemeOverlay_Material3_BottomNavigationView = 2131952282;
-			
-			// aapt resource value: 0x7F13029B
-			public const int ThemeOverlay_Material3_BottomSheetDialog = 2131952283;
-			
-			// aapt resource value: 0x7F13029C
-			public const int ThemeOverlay_Material3_Button = 2131952284;
-			
-			// aapt resource value: 0x7F13029D
-			public const int ThemeOverlay_Material3_Button_ElevatedButton = 2131952285;
-			
-			// aapt resource value: 0x7F13029E
-			public const int ThemeOverlay_Material3_Button_IconButton = 2131952286;
-			
-			// aapt resource value: 0x7F13029F
-			public const int ThemeOverlay_Material3_Button_IconButton_Filled = 2131952287;
-			
-			// aapt resource value: 0x7F1302A0
-			public const int ThemeOverlay_Material3_Button_IconButton_Filled_Tonal = 2131952288;
-			
-			// aapt resource value: 0x7F1302A1
-			public const int ThemeOverlay_Material3_Button_TextButton = 2131952289;
-			
-			// aapt resource value: 0x7F1302A2
-			public const int ThemeOverlay_Material3_Button_TextButton_Snackbar = 2131952290;
-			
-			// aapt resource value: 0x7F1302A3
-			public const int ThemeOverlay_Material3_Button_TonalButton = 2131952291;
-			
-			// aapt resource value: 0x7F1302A4
-			public const int ThemeOverlay_Material3_Chip = 2131952292;
-			
-			// aapt resource value: 0x7F1302A5
-			public const int ThemeOverlay_Material3_Chip_Assist = 2131952293;
-			
-			// aapt resource value: 0x7F1302A6
-			public const int ThemeOverlay_Material3_Dark = 2131952294;
-			
-			// aapt resource value: 0x7F1302A7
-			public const int ThemeOverlay_Material3_Dark_ActionBar = 2131952295;
-			
-			// aapt resource value: 0x7F1302A8
-			public const int ThemeOverlay_Material3_DayNight_BottomSheetDialog = 2131952296;
-			
-			// aapt resource value: 0x7F1302A9
-			public const int ThemeOverlay_Material3_DayNight_SideSheetDialog = 2131952297;
-			
-			// aapt resource value: 0x7F1302AA
-			public const int ThemeOverlay_Material3_Dialog = 2131952298;
-			
-			// aapt resource value: 0x7F1302AB
-			public const int ThemeOverlay_Material3_Dialog_Alert = 2131952299;
-			
-			// aapt resource value: 0x7F1302AC
-			public const int ThemeOverlay_Material3_Dialog_Alert_Framework = 2131952300;
-			
-			// aapt resource value: 0x7F1302AD
-			public const int ThemeOverlay_Material3_DynamicColors_Dark = 2131952301;
-			
-			// aapt resource value: 0x7F1302AE
-			public const int ThemeOverlay_Material3_DynamicColors_DayNight = 2131952302;
-			
-			// aapt resource value: 0x7F1302AF
-			public const int ThemeOverlay_Material3_DynamicColors_Light = 2131952303;
-			
-			// aapt resource value: 0x7F1302B0
-			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Primary = 2131952304;
-			
-			// aapt resource value: 0x7F1302B1
-			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Secondary = 2131952305;
-			
-			// aapt resource value: 0x7F1302B2
-			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Surface = 2131952306;
-			
-			// aapt resource value: 0x7F1302B3
-			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Tertiary = 2131952307;
-			
-			// aapt resource value: 0x7F1302B4
-			public const int ThemeOverlay_Material3_FloatingActionButton_Primary = 2131952308;
-			
-			// aapt resource value: 0x7F1302B5
-			public const int ThemeOverlay_Material3_FloatingActionButton_Secondary = 2131952309;
-			
-			// aapt resource value: 0x7F1302B6
-			public const int ThemeOverlay_Material3_FloatingActionButton_Surface = 2131952310;
-			
-			// aapt resource value: 0x7F1302B7
-			public const int ThemeOverlay_Material3_FloatingActionButton_Tertiary = 2131952311;
-			
-			// aapt resource value: 0x7F1302B8
-			public const int ThemeOverlay_Material3_HarmonizedColors = 2131952312;
-			
-			// aapt resource value: 0x7F1302B9
-			public const int ThemeOverlay_Material3_HarmonizedColors_Empty = 2131952313;
-			
-			// aapt resource value: 0x7F1302BA
-			public const int ThemeOverlay_Material3_Light = 2131952314;
-			
-			// aapt resource value: 0x7F1302BB
-			public const int ThemeOverlay_Material3_Light_Dialog_Alert_Framework = 2131952315;
-			
-			// aapt resource value: 0x7F1302BC
-			public const int ThemeOverlay_Material3_MaterialAlertDialog = 2131952316;
-			
-			// aapt resource value: 0x7F1302BD
-			public const int ThemeOverlay_Material3_MaterialAlertDialog_Centered = 2131952317;
-			
-			// aapt resource value: 0x7F1302BE
-			public const int ThemeOverlay_Material3_MaterialCalendar = 2131952318;
-			
-			// aapt resource value: 0x7F1302BF
-			public const int ThemeOverlay_Material3_MaterialCalendar_Fullscreen = 2131952319;
-			
-			// aapt resource value: 0x7F1302C0
-			public const int ThemeOverlay_Material3_MaterialCalendar_HeaderCancelButton = 2131952320;
-			
-			// aapt resource value: 0x7F1302C1
-			public const int ThemeOverlay_Material3_MaterialTimePicker = 2131952321;
-			
-			// aapt resource value: 0x7F1302C2
-			public const int ThemeOverlay_Material3_MaterialTimePicker_Display_TextInputEditText = 2131952322;
-			
-			// aapt resource value: 0x7F1302C3
-			public const int ThemeOverlay_Material3_NavigationRailView = 2131952323;
-			
-			// aapt resource value: 0x7F1302C4
-			public const int ThemeOverlay_Material3_NavigationView = 2131952324;
-			
-			// aapt resource value: 0x7F1302C5
-			public const int ThemeOverlay_Material3_PersonalizedColors = 2131952325;
-			
-			// aapt resource value: 0x7F1302C6
-			public const int ThemeOverlay_Material3_Search = 2131952326;
-			
-			// aapt resource value: 0x7F1302C7
-			public const int ThemeOverlay_Material3_SideSheetDialog = 2131952327;
-			
-			// aapt resource value: 0x7F1302C8
-			public const int ThemeOverlay_Material3_Snackbar = 2131952328;
-			
-			// aapt resource value: 0x7F1302C9
-			public const int ThemeOverlay_Material3_TabLayout = 2131952329;
-			
-			// aapt resource value: 0x7F1302CA
-			public const int ThemeOverlay_Material3_TextInputEditText = 2131952330;
-			
-			// aapt resource value: 0x7F1302CB
-			public const int ThemeOverlay_Material3_TextInputEditText_FilledBox = 2131952331;
-			
-			// aapt resource value: 0x7F1302CC
-			public const int ThemeOverlay_Material3_TextInputEditText_FilledBox_Dense = 2131952332;
-			
-			// aapt resource value: 0x7F1302CD
-			public const int ThemeOverlay_Material3_TextInputEditText_OutlinedBox = 2131952333;
-			
-			// aapt resource value: 0x7F1302CE
-			public const int ThemeOverlay_Material3_TextInputEditText_OutlinedBox_Dense = 2131952334;
-			
-			// aapt resource value: 0x7F1302CF
-			public const int ThemeOverlay_Material3_Toolbar_Surface = 2131952335;
-			
-			// aapt resource value: 0x7F1302D0
-			public const int ThemeOverlay_MaterialAlertDialog_Material3_Title_Icon = 2131952336;
-			
-			// aapt resource value: 0x7F1302D1
-			public const int ThemeOverlay_MaterialComponents = 2131952337;
-			
-			// aapt resource value: 0x7F1302D2
-			public const int ThemeOverlay_MaterialComponents_ActionBar = 2131952338;
-			
-			// aapt resource value: 0x7F1302D3
-			public const int ThemeOverlay_MaterialComponents_ActionBar_Primary = 2131952339;
-			
-			// aapt resource value: 0x7F1302D4
-			public const int ThemeOverlay_MaterialComponents_ActionBar_Surface = 2131952340;
-			
-			// aapt resource value: 0x7F1302D5
-			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView = 2131952341;
-			
-			// aapt resource value: 0x7F1302D6
-			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_FilledBox = 2131952342;
-			
-			// aapt resource value: 0x7F1302D7
-			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_FilledBox_Dense = 2131952343;
-			
-			// aapt resource value: 0x7F1302D8
-			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_OutlinedBox = 2131952344;
-			
-			// aapt resource value: 0x7F1302D9
-			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense = 2131952345;
-			
-			// aapt resource value: 0x7F1302DA
-			public const int ThemeOverlay_MaterialComponents_BottomAppBar_Primary = 2131952346;
-			
-			// aapt resource value: 0x7F1302DB
-			public const int ThemeOverlay_MaterialComponents_BottomAppBar_Surface = 2131952347;
-			
-			// aapt resource value: 0x7F1302DC
-			public const int ThemeOverlay_MaterialComponents_BottomSheetDialog = 2131952348;
-			
-			// aapt resource value: 0x7F1302DD
-			public const int ThemeOverlay_MaterialComponents_Dark = 2131952349;
-			
-			// aapt resource value: 0x7F1302DE
-			public const int ThemeOverlay_MaterialComponents_Dark_ActionBar = 2131952350;
-			
-			// aapt resource value: 0x7F1302DF
-			public const int ThemeOverlay_MaterialComponents_DayNight_BottomSheetDialog = 2131952351;
-			
-			// aapt resource value: 0x7F1302E0
-			public const int ThemeOverlay_MaterialComponents_Dialog = 2131952352;
-			
-			// aapt resource value: 0x7F1302E1
-			public const int ThemeOverlay_MaterialComponents_Dialog_Alert = 2131952353;
-			
-			// aapt resource value: 0x7F1302E2
-			public const int ThemeOverlay_MaterialComponents_Dialog_Alert_Framework = 2131952354;
-			
-			// aapt resource value: 0x7F1302E3
-			public const int ThemeOverlay_MaterialComponents_Light = 2131952355;
-			
-			// aapt resource value: 0x7F1302E4
-			public const int ThemeOverlay_MaterialComponents_Light_Dialog_Alert_Framework = 2131952356;
-			
-			// aapt resource value: 0x7F1302E5
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog = 2131952357;
-			
-			// aapt resource value: 0x7F1302E6
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Centered = 2131952358;
-			
-			// aapt resource value: 0x7F1302E7
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date = 2131952359;
-			
-			// aapt resource value: 0x7F1302E8
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Calendar = 2131952360;
-			
-			// aapt resource value: 0x7F1302E9
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Header_Text = 2131952361;
-			
-			// aapt resource value: 0x7F1302EA
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Header_Text_Day = 2131952362;
-			
-			// aapt resource value: 0x7F1302EB
-			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Spinner = 2131952363;
-			
-			// aapt resource value: 0x7F1302EC
-			public const int ThemeOverlay_MaterialComponents_MaterialCalendar = 2131952364;
-			
-			// aapt resource value: 0x7F1302ED
-			public const int ThemeOverlay_MaterialComponents_MaterialCalendar_Fullscreen = 2131952365;
-			
-			// aapt resource value: 0x7F1302EE
-			public const int ThemeOverlay_MaterialComponents_TextInputEditText = 2131952366;
-			
-			// aapt resource value: 0x7F1302EF
-			public const int ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox = 2131952367;
-			
-			// aapt resource value: 0x7F1302F0
-			public const int ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense = 2131952368;
-			
-			// aapt resource value: 0x7F1302F1
-			public const int ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox = 2131952369;
-			
-			// aapt resource value: 0x7F1302F2
-			public const int ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense = 2131952370;
-			
-			// aapt resource value: 0x7F1302F3
-			public const int ThemeOverlay_MaterialComponents_TimePicker = 2131952371;
-			
-			// aapt resource value: 0x7F1302F4
-			public const int ThemeOverlay_MaterialComponents_TimePicker_Display = 2131952372;
-			
-			// aapt resource value: 0x7F1302F5
-			public const int ThemeOverlay_MaterialComponents_TimePicker_Display_TextInputEditText = 2131952373;
-			
-			// aapt resource value: 0x7F1302F6
-			public const int ThemeOverlay_MaterialComponents_Toolbar_Popup_Primary = 2131952374;
-			
-			// aapt resource value: 0x7F1302F7
-			public const int ThemeOverlay_MaterialComponents_Toolbar_Primary = 2131952375;
-			
-			// aapt resource value: 0x7F1302F8
-			public const int ThemeOverlay_MaterialComponents_Toolbar_Surface = 2131952376;
-			
-			// aapt resource value: 0x7F130220
-			public const int Theme_AppCompat = 2131952160;
-			
-			// aapt resource value: 0x7F130221
-			public const int Theme_AppCompat_CompactMenu = 2131952161;
-			
-			// aapt resource value: 0x7F130222
-			public const int Theme_AppCompat_DayNight = 2131952162;
-			
-			// aapt resource value: 0x7F130223
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131952163;
-			
-			// aapt resource value: 0x7F130224
-			public const int Theme_AppCompat_DayNight_Dialog = 2131952164;
-			
-			// aapt resource value: 0x7F130227
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131952167;
-			
-			// aapt resource value: 0x7F130225
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131952165;
-			
-			// aapt resource value: 0x7F130226
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131952166;
-			
-			// aapt resource value: 0x7F130228
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131952168;
-			
-			// aapt resource value: 0x7F130229
-			public const int Theme_AppCompat_Dialog = 2131952169;
-			
-			// aapt resource value: 0x7F13022C
-			public const int Theme_AppCompat_DialogWhenLarge = 2131952172;
-			
-			// aapt resource value: 0x7F13022A
-			public const int Theme_AppCompat_Dialog_Alert = 2131952170;
-			
-			// aapt resource value: 0x7F13022B
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131952171;
-			
-			// aapt resource value: 0x7F13022D
-			public const int Theme_AppCompat_Empty = 2131952173;
-			
-			// aapt resource value: 0x7F13022E
-			public const int Theme_AppCompat_Light = 2131952174;
-			
-			// aapt resource value: 0x7F13022F
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131952175;
-			
-			// aapt resource value: 0x7F130230
-			public const int Theme_AppCompat_Light_Dialog = 2131952176;
-			
-			// aapt resource value: 0x7F130233
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131952179;
-			
-			// aapt resource value: 0x7F130231
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131952177;
-			
-			// aapt resource value: 0x7F130232
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131952178;
-			
-			// aapt resource value: 0x7F130234
-			public const int Theme_AppCompat_Light_NoActionBar = 2131952180;
-			
-			// aapt resource value: 0x7F130235
-			public const int Theme_AppCompat_NoActionBar = 2131952181;
-			
-			// aapt resource value: 0x7F130236
-			public const int Theme_BiometricPromptDialog = 2131952182;
-			
-			// aapt resource value: 0x7F130237
-			public const int Theme_Design = 2131952183;
-			
-			// aapt resource value: 0x7F130238
-			public const int Theme_Design_BottomSheetDialog = 2131952184;
-			
-			// aapt resource value: 0x7F130239
-			public const int Theme_Design_Light = 2131952185;
-			
-			// aapt resource value: 0x7F13023A
-			public const int Theme_Design_Light_BottomSheetDialog = 2131952186;
-			
-			// aapt resource value: 0x7F13023B
-			public const int Theme_Design_Light_NoActionBar = 2131952187;
-			
-			// aapt resource value: 0x7F13023C
-			public const int Theme_Design_NoActionBar = 2131952188;
-			
-			// aapt resource value: 0x7F13023D
-			public const int Theme_Material3_Dark = 2131952189;
-			
-			// aapt resource value: 0x7F13023E
-			public const int Theme_Material3_Dark_BottomSheetDialog = 2131952190;
-			
-			// aapt resource value: 0x7F13023F
-			public const int Theme_Material3_Dark_Dialog = 2131952191;
-			
-			// aapt resource value: 0x7F130242
-			public const int Theme_Material3_Dark_DialogWhenLarge = 2131952194;
-			
-			// aapt resource value: 0x7F130240
-			public const int Theme_Material3_Dark_Dialog_Alert = 2131952192;
-			
-			// aapt resource value: 0x7F130241
-			public const int Theme_Material3_Dark_Dialog_MinWidth = 2131952193;
-			
-			// aapt resource value: 0x7F130243
-			public const int Theme_Material3_Dark_NoActionBar = 2131952195;
-			
-			// aapt resource value: 0x7F130244
-			public const int Theme_Material3_Dark_SideSheetDialog = 2131952196;
-			
-			// aapt resource value: 0x7F130245
-			public const int Theme_Material3_DayNight = 2131952197;
-			
-			// aapt resource value: 0x7F130246
-			public const int Theme_Material3_DayNight_BottomSheetDialog = 2131952198;
-			
-			// aapt resource value: 0x7F130247
-			public const int Theme_Material3_DayNight_Dialog = 2131952199;
-			
-			// aapt resource value: 0x7F13024A
-			public const int Theme_Material3_DayNight_DialogWhenLarge = 2131952202;
-			
-			// aapt resource value: 0x7F130248
-			public const int Theme_Material3_DayNight_Dialog_Alert = 2131952200;
-			
-			// aapt resource value: 0x7F130249
-			public const int Theme_Material3_DayNight_Dialog_MinWidth = 2131952201;
-			
-			// aapt resource value: 0x7F13024B
-			public const int Theme_Material3_DayNight_NoActionBar = 2131952203;
-			
-			// aapt resource value: 0x7F13024C
-			public const int Theme_Material3_DayNight_SideSheetDialog = 2131952204;
-			
-			// aapt resource value: 0x7F13024D
-			public const int Theme_Material3_DynamicColors_Dark = 2131952205;
-			
-			// aapt resource value: 0x7F13024E
-			public const int Theme_Material3_DynamicColors_DayNight = 2131952206;
-			
-			// aapt resource value: 0x7F13024F
-			public const int Theme_Material3_DynamicColors_Light = 2131952207;
-			
-			// aapt resource value: 0x7F130250
-			public const int Theme_Material3_Light = 2131952208;
-			
-			// aapt resource value: 0x7F130251
-			public const int Theme_Material3_Light_BottomSheetDialog = 2131952209;
-			
-			// aapt resource value: 0x7F130252
-			public const int Theme_Material3_Light_Dialog = 2131952210;
-			
-			// aapt resource value: 0x7F130255
-			public const int Theme_Material3_Light_DialogWhenLarge = 2131952213;
-			
-			// aapt resource value: 0x7F130253
-			public const int Theme_Material3_Light_Dialog_Alert = 2131952211;
-			
-			// aapt resource value: 0x7F130254
-			public const int Theme_Material3_Light_Dialog_MinWidth = 2131952212;
-			
-			// aapt resource value: 0x7F130256
-			public const int Theme_Material3_Light_NoActionBar = 2131952214;
-			
-			// aapt resource value: 0x7F130257
-			public const int Theme_Material3_Light_SideSheetDialog = 2131952215;
-			
-			// aapt resource value: 0x7F130258
-			public const int Theme_MaterialComponents = 2131952216;
-			
-			// aapt resource value: 0x7F130259
-			public const int Theme_MaterialComponents_BottomSheetDialog = 2131952217;
-			
-			// aapt resource value: 0x7F13025A
-			public const int Theme_MaterialComponents_Bridge = 2131952218;
-			
-			// aapt resource value: 0x7F13025B
-			public const int Theme_MaterialComponents_CompactMenu = 2131952219;
-			
-			// aapt resource value: 0x7F13025C
-			public const int Theme_MaterialComponents_DayNight = 2131952220;
-			
-			// aapt resource value: 0x7F13025D
-			public const int Theme_MaterialComponents_DayNight_BottomSheetDialog = 2131952221;
-			
-			// aapt resource value: 0x7F13025E
-			public const int Theme_MaterialComponents_DayNight_Bridge = 2131952222;
-			
-			// aapt resource value: 0x7F13025F
-			public const int Theme_MaterialComponents_DayNight_DarkActionBar = 2131952223;
-			
-			// aapt resource value: 0x7F130260
-			public const int Theme_MaterialComponents_DayNight_DarkActionBar_Bridge = 2131952224;
-			
-			// aapt resource value: 0x7F130261
-			public const int Theme_MaterialComponents_DayNight_Dialog = 2131952225;
-			
-			// aapt resource value: 0x7F130269
-			public const int Theme_MaterialComponents_DayNight_DialogWhenLarge = 2131952233;
-			
-			// aapt resource value: 0x7F130262
-			public const int Theme_MaterialComponents_DayNight_Dialog_Alert = 2131952226;
-			
-			// aapt resource value: 0x7F130263
-			public const int Theme_MaterialComponents_DayNight_Dialog_Alert_Bridge = 2131952227;
-			
-			// aapt resource value: 0x7F130264
-			public const int Theme_MaterialComponents_DayNight_Dialog_Bridge = 2131952228;
-			
-			// aapt resource value: 0x7F130265
-			public const int Theme_MaterialComponents_DayNight_Dialog_FixedSize = 2131952229;
-			
-			// aapt resource value: 0x7F130266
-			public const int Theme_MaterialComponents_DayNight_Dialog_FixedSize_Bridge = 2131952230;
-			
-			// aapt resource value: 0x7F130267
-			public const int Theme_MaterialComponents_DayNight_Dialog_MinWidth = 2131952231;
-			
-			// aapt resource value: 0x7F130268
-			public const int Theme_MaterialComponents_DayNight_Dialog_MinWidth_Bridge = 2131952232;
-			
-			// aapt resource value: 0x7F13026A
-			public const int Theme_MaterialComponents_DayNight_NoActionBar = 2131952234;
-			
-			// aapt resource value: 0x7F13026B
-			public const int Theme_MaterialComponents_DayNight_NoActionBar_Bridge = 2131952235;
-			
-			// aapt resource value: 0x7F13026C
-			public const int Theme_MaterialComponents_Dialog = 2131952236;
-			
-			// aapt resource value: 0x7F130274
-			public const int Theme_MaterialComponents_DialogWhenLarge = 2131952244;
-			
-			// aapt resource value: 0x7F13026D
-			public const int Theme_MaterialComponents_Dialog_Alert = 2131952237;
-			
-			// aapt resource value: 0x7F13026E
-			public const int Theme_MaterialComponents_Dialog_Alert_Bridge = 2131952238;
-			
-			// aapt resource value: 0x7F13026F
-			public const int Theme_MaterialComponents_Dialog_Bridge = 2131952239;
-			
-			// aapt resource value: 0x7F130270
-			public const int Theme_MaterialComponents_Dialog_FixedSize = 2131952240;
-			
-			// aapt resource value: 0x7F130271
-			public const int Theme_MaterialComponents_Dialog_FixedSize_Bridge = 2131952241;
-			
-			// aapt resource value: 0x7F130272
-			public const int Theme_MaterialComponents_Dialog_MinWidth = 2131952242;
-			
-			// aapt resource value: 0x7F130273
-			public const int Theme_MaterialComponents_Dialog_MinWidth_Bridge = 2131952243;
-			
-			// aapt resource value: 0x7F130275
-			public const int Theme_MaterialComponents_Light = 2131952245;
-			
-			// aapt resource value: 0x7F130276
-			public const int Theme_MaterialComponents_Light_BottomSheetDialog = 2131952246;
-			
-			// aapt resource value: 0x7F130277
-			public const int Theme_MaterialComponents_Light_Bridge = 2131952247;
-			
-			// aapt resource value: 0x7F130278
-			public const int Theme_MaterialComponents_Light_DarkActionBar = 2131952248;
-			
-			// aapt resource value: 0x7F130279
-			public const int Theme_MaterialComponents_Light_DarkActionBar_Bridge = 2131952249;
-			
-			// aapt resource value: 0x7F13027A
-			public const int Theme_MaterialComponents_Light_Dialog = 2131952250;
-			
-			// aapt resource value: 0x7F130282
-			public const int Theme_MaterialComponents_Light_DialogWhenLarge = 2131952258;
-			
-			// aapt resource value: 0x7F13027B
-			public const int Theme_MaterialComponents_Light_Dialog_Alert = 2131952251;
-			
-			// aapt resource value: 0x7F13027C
-			public const int Theme_MaterialComponents_Light_Dialog_Alert_Bridge = 2131952252;
-			
-			// aapt resource value: 0x7F13027D
-			public const int Theme_MaterialComponents_Light_Dialog_Bridge = 2131952253;
-			
-			// aapt resource value: 0x7F13027E
-			public const int Theme_MaterialComponents_Light_Dialog_FixedSize = 2131952254;
-			
-			// aapt resource value: 0x7F13027F
-			public const int Theme_MaterialComponents_Light_Dialog_FixedSize_Bridge = 2131952255;
-			
-			// aapt resource value: 0x7F130280
-			public const int Theme_MaterialComponents_Light_Dialog_MinWidth = 2131952256;
-			
-			// aapt resource value: 0x7F130281
-			public const int Theme_MaterialComponents_Light_Dialog_MinWidth_Bridge = 2131952257;
-			
-			// aapt resource value: 0x7F130283
-			public const int Theme_MaterialComponents_Light_NoActionBar = 2131952259;
-			
-			// aapt resource value: 0x7F130284
-			public const int Theme_MaterialComponents_Light_NoActionBar_Bridge = 2131952260;
+			public const int TextView = 2131952157;
 			
 			// aapt resource value: 0x7F130285
-			public const int Theme_MaterialComponents_NoActionBar = 2131952261;
+			public const int ThemeOverlay_AppCompat = 2131952261;
 			
 			// aapt resource value: 0x7F130286
-			public const int Theme_MaterialComponents_NoActionBar_Bridge = 2131952262;
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131952262;
+			
+			// aapt resource value: 0x7F130287
+			public const int ThemeOverlay_AppCompat_Dark = 2131952263;
+			
+			// aapt resource value: 0x7F130288
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131952264;
+			
+			// aapt resource value: 0x7F130289
+			public const int ThemeOverlay_AppCompat_DayNight = 2131952265;
+			
+			// aapt resource value: 0x7F13028A
+			public const int ThemeOverlay_AppCompat_DayNight_ActionBar = 2131952266;
+			
+			// aapt resource value: 0x7F13028B
+			public const int ThemeOverlay_AppCompat_Dialog = 2131952267;
+			
+			// aapt resource value: 0x7F13028C
+			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131952268;
+			
+			// aapt resource value: 0x7F13028D
+			public const int ThemeOverlay_AppCompat_Light = 2131952269;
+			
+			// aapt resource value: 0x7F13028E
+			public const int ThemeOverlay_Design_TextInputEditText = 2131952270;
+			
+			// aapt resource value: 0x7F13028F
+			public const int ThemeOverlay_Material3 = 2131952271;
+			
+			// aapt resource value: 0x7F130290
+			public const int ThemeOverlay_Material3_ActionBar = 2131952272;
+			
+			// aapt resource value: 0x7F130291
+			public const int ThemeOverlay_Material3_AutoCompleteTextView = 2131952273;
+			
+			// aapt resource value: 0x7F130292
+			public const int ThemeOverlay_Material3_AutoCompleteTextView_FilledBox = 2131952274;
+			
+			// aapt resource value: 0x7F130293
+			public const int ThemeOverlay_Material3_AutoCompleteTextView_FilledBox_Dense = 2131952275;
+			
+			// aapt resource value: 0x7F130294
+			public const int ThemeOverlay_Material3_AutoCompleteTextView_OutlinedBox = 2131952276;
+			
+			// aapt resource value: 0x7F130295
+			public const int ThemeOverlay_Material3_AutoCompleteTextView_OutlinedBox_Dense = 2131952277;
+			
+			// aapt resource value: 0x7F130296
+			public const int ThemeOverlay_Material3_BottomAppBar = 2131952278;
+			
+			// aapt resource value: 0x7F130297
+			public const int ThemeOverlay_Material3_BottomAppBar_Legacy = 2131952279;
+			
+			// aapt resource value: 0x7F130298
+			public const int ThemeOverlay_Material3_BottomNavigationView = 2131952280;
+			
+			// aapt resource value: 0x7F130299
+			public const int ThemeOverlay_Material3_BottomSheetDialog = 2131952281;
+			
+			// aapt resource value: 0x7F13029A
+			public const int ThemeOverlay_Material3_Button = 2131952282;
+			
+			// aapt resource value: 0x7F13029B
+			public const int ThemeOverlay_Material3_Button_ElevatedButton = 2131952283;
+			
+			// aapt resource value: 0x7F13029C
+			public const int ThemeOverlay_Material3_Button_IconButton = 2131952284;
+			
+			// aapt resource value: 0x7F13029D
+			public const int ThemeOverlay_Material3_Button_IconButton_Filled = 2131952285;
+			
+			// aapt resource value: 0x7F13029E
+			public const int ThemeOverlay_Material3_Button_IconButton_Filled_Tonal = 2131952286;
+			
+			// aapt resource value: 0x7F13029F
+			public const int ThemeOverlay_Material3_Button_TextButton = 2131952287;
+			
+			// aapt resource value: 0x7F1302A0
+			public const int ThemeOverlay_Material3_Button_TextButton_Snackbar = 2131952288;
+			
+			// aapt resource value: 0x7F1302A1
+			public const int ThemeOverlay_Material3_Button_TonalButton = 2131952289;
+			
+			// aapt resource value: 0x7F1302A2
+			public const int ThemeOverlay_Material3_Chip = 2131952290;
+			
+			// aapt resource value: 0x7F1302A3
+			public const int ThemeOverlay_Material3_Chip_Assist = 2131952291;
+			
+			// aapt resource value: 0x7F1302A4
+			public const int ThemeOverlay_Material3_Dark = 2131952292;
+			
+			// aapt resource value: 0x7F1302A5
+			public const int ThemeOverlay_Material3_Dark_ActionBar = 2131952293;
+			
+			// aapt resource value: 0x7F1302A6
+			public const int ThemeOverlay_Material3_DayNight_BottomSheetDialog = 2131952294;
+			
+			// aapt resource value: 0x7F1302A7
+			public const int ThemeOverlay_Material3_DayNight_SideSheetDialog = 2131952295;
+			
+			// aapt resource value: 0x7F1302A8
+			public const int ThemeOverlay_Material3_Dialog = 2131952296;
+			
+			// aapt resource value: 0x7F1302A9
+			public const int ThemeOverlay_Material3_Dialog_Alert = 2131952297;
+			
+			// aapt resource value: 0x7F1302AA
+			public const int ThemeOverlay_Material3_Dialog_Alert_Framework = 2131952298;
+			
+			// aapt resource value: 0x7F1302AB
+			public const int ThemeOverlay_Material3_DynamicColors_Dark = 2131952299;
+			
+			// aapt resource value: 0x7F1302AC
+			public const int ThemeOverlay_Material3_DynamicColors_DayNight = 2131952300;
+			
+			// aapt resource value: 0x7F1302AD
+			public const int ThemeOverlay_Material3_DynamicColors_Light = 2131952301;
+			
+			// aapt resource value: 0x7F1302AE
+			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Primary = 2131952302;
+			
+			// aapt resource value: 0x7F1302AF
+			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Secondary = 2131952303;
+			
+			// aapt resource value: 0x7F1302B0
+			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Surface = 2131952304;
+			
+			// aapt resource value: 0x7F1302B1
+			public const int ThemeOverlay_Material3_ExtendedFloatingActionButton_Tertiary = 2131952305;
+			
+			// aapt resource value: 0x7F1302B2
+			public const int ThemeOverlay_Material3_FloatingActionButton_Primary = 2131952306;
+			
+			// aapt resource value: 0x7F1302B3
+			public const int ThemeOverlay_Material3_FloatingActionButton_Secondary = 2131952307;
+			
+			// aapt resource value: 0x7F1302B4
+			public const int ThemeOverlay_Material3_FloatingActionButton_Surface = 2131952308;
+			
+			// aapt resource value: 0x7F1302B5
+			public const int ThemeOverlay_Material3_FloatingActionButton_Tertiary = 2131952309;
+			
+			// aapt resource value: 0x7F1302B6
+			public const int ThemeOverlay_Material3_HarmonizedColors = 2131952310;
+			
+			// aapt resource value: 0x7F1302B7
+			public const int ThemeOverlay_Material3_HarmonizedColors_Empty = 2131952311;
+			
+			// aapt resource value: 0x7F1302B8
+			public const int ThemeOverlay_Material3_Light = 2131952312;
+			
+			// aapt resource value: 0x7F1302B9
+			public const int ThemeOverlay_Material3_Light_Dialog_Alert_Framework = 2131952313;
+			
+			// aapt resource value: 0x7F1302BA
+			public const int ThemeOverlay_Material3_MaterialAlertDialog = 2131952314;
+			
+			// aapt resource value: 0x7F1302BB
+			public const int ThemeOverlay_Material3_MaterialAlertDialog_Centered = 2131952315;
+			
+			// aapt resource value: 0x7F1302BC
+			public const int ThemeOverlay_Material3_MaterialCalendar = 2131952316;
+			
+			// aapt resource value: 0x7F1302BD
+			public const int ThemeOverlay_Material3_MaterialCalendar_Fullscreen = 2131952317;
+			
+			// aapt resource value: 0x7F1302BE
+			public const int ThemeOverlay_Material3_MaterialCalendar_HeaderCancelButton = 2131952318;
+			
+			// aapt resource value: 0x7F1302BF
+			public const int ThemeOverlay_Material3_MaterialTimePicker = 2131952319;
+			
+			// aapt resource value: 0x7F1302C0
+			public const int ThemeOverlay_Material3_MaterialTimePicker_Display_TextInputEditText = 2131952320;
+			
+			// aapt resource value: 0x7F1302C1
+			public const int ThemeOverlay_Material3_NavigationRailView = 2131952321;
+			
+			// aapt resource value: 0x7F1302C2
+			public const int ThemeOverlay_Material3_NavigationView = 2131952322;
+			
+			// aapt resource value: 0x7F1302C3
+			public const int ThemeOverlay_Material3_PersonalizedColors = 2131952323;
+			
+			// aapt resource value: 0x7F1302C4
+			public const int ThemeOverlay_Material3_Search = 2131952324;
+			
+			// aapt resource value: 0x7F1302C5
+			public const int ThemeOverlay_Material3_SideSheetDialog = 2131952325;
+			
+			// aapt resource value: 0x7F1302C6
+			public const int ThemeOverlay_Material3_Snackbar = 2131952326;
+			
+			// aapt resource value: 0x7F1302C7
+			public const int ThemeOverlay_Material3_TabLayout = 2131952327;
+			
+			// aapt resource value: 0x7F1302C8
+			public const int ThemeOverlay_Material3_TextInputEditText = 2131952328;
+			
+			// aapt resource value: 0x7F1302C9
+			public const int ThemeOverlay_Material3_TextInputEditText_FilledBox = 2131952329;
+			
+			// aapt resource value: 0x7F1302CA
+			public const int ThemeOverlay_Material3_TextInputEditText_FilledBox_Dense = 2131952330;
+			
+			// aapt resource value: 0x7F1302CB
+			public const int ThemeOverlay_Material3_TextInputEditText_OutlinedBox = 2131952331;
+			
+			// aapt resource value: 0x7F1302CC
+			public const int ThemeOverlay_Material3_TextInputEditText_OutlinedBox_Dense = 2131952332;
+			
+			// aapt resource value: 0x7F1302CD
+			public const int ThemeOverlay_Material3_Toolbar_Surface = 2131952333;
+			
+			// aapt resource value: 0x7F1302CE
+			public const int ThemeOverlay_MaterialAlertDialog_Material3_Title_Icon = 2131952334;
+			
+			// aapt resource value: 0x7F1302CF
+			public const int ThemeOverlay_MaterialComponents = 2131952335;
+			
+			// aapt resource value: 0x7F1302D0
+			public const int ThemeOverlay_MaterialComponents_ActionBar = 2131952336;
+			
+			// aapt resource value: 0x7F1302D1
+			public const int ThemeOverlay_MaterialComponents_ActionBar_Primary = 2131952337;
+			
+			// aapt resource value: 0x7F1302D2
+			public const int ThemeOverlay_MaterialComponents_ActionBar_Surface = 2131952338;
+			
+			// aapt resource value: 0x7F1302D3
+			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView = 2131952339;
+			
+			// aapt resource value: 0x7F1302D4
+			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_FilledBox = 2131952340;
+			
+			// aapt resource value: 0x7F1302D5
+			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_FilledBox_Dense = 2131952341;
+			
+			// aapt resource value: 0x7F1302D6
+			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_OutlinedBox = 2131952342;
+			
+			// aapt resource value: 0x7F1302D7
+			public const int ThemeOverlay_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense = 2131952343;
+			
+			// aapt resource value: 0x7F1302D8
+			public const int ThemeOverlay_MaterialComponents_BottomAppBar_Primary = 2131952344;
+			
+			// aapt resource value: 0x7F1302D9
+			public const int ThemeOverlay_MaterialComponents_BottomAppBar_Surface = 2131952345;
+			
+			// aapt resource value: 0x7F1302DA
+			public const int ThemeOverlay_MaterialComponents_BottomSheetDialog = 2131952346;
+			
+			// aapt resource value: 0x7F1302DB
+			public const int ThemeOverlay_MaterialComponents_Dark = 2131952347;
+			
+			// aapt resource value: 0x7F1302DC
+			public const int ThemeOverlay_MaterialComponents_Dark_ActionBar = 2131952348;
+			
+			// aapt resource value: 0x7F1302DD
+			public const int ThemeOverlay_MaterialComponents_DayNight_BottomSheetDialog = 2131952349;
+			
+			// aapt resource value: 0x7F1302DE
+			public const int ThemeOverlay_MaterialComponents_Dialog = 2131952350;
+			
+			// aapt resource value: 0x7F1302DF
+			public const int ThemeOverlay_MaterialComponents_Dialog_Alert = 2131952351;
+			
+			// aapt resource value: 0x7F1302E0
+			public const int ThemeOverlay_MaterialComponents_Dialog_Alert_Framework = 2131952352;
+			
+			// aapt resource value: 0x7F1302E1
+			public const int ThemeOverlay_MaterialComponents_Light = 2131952353;
+			
+			// aapt resource value: 0x7F1302E2
+			public const int ThemeOverlay_MaterialComponents_Light_Dialog_Alert_Framework = 2131952354;
+			
+			// aapt resource value: 0x7F1302E3
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog = 2131952355;
+			
+			// aapt resource value: 0x7F1302E4
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Centered = 2131952356;
+			
+			// aapt resource value: 0x7F1302E5
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date = 2131952357;
+			
+			// aapt resource value: 0x7F1302E6
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Calendar = 2131952358;
+			
+			// aapt resource value: 0x7F1302E7
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Header_Text = 2131952359;
+			
+			// aapt resource value: 0x7F1302E8
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Header_Text_Day = 2131952360;
+			
+			// aapt resource value: 0x7F1302E9
+			public const int ThemeOverlay_MaterialComponents_MaterialAlertDialog_Picker_Date_Spinner = 2131952361;
+			
+			// aapt resource value: 0x7F1302EA
+			public const int ThemeOverlay_MaterialComponents_MaterialCalendar = 2131952362;
+			
+			// aapt resource value: 0x7F1302EB
+			public const int ThemeOverlay_MaterialComponents_MaterialCalendar_Fullscreen = 2131952363;
+			
+			// aapt resource value: 0x7F1302EC
+			public const int ThemeOverlay_MaterialComponents_TextInputEditText = 2131952364;
+			
+			// aapt resource value: 0x7F1302ED
+			public const int ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox = 2131952365;
+			
+			// aapt resource value: 0x7F1302EE
+			public const int ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense = 2131952366;
+			
+			// aapt resource value: 0x7F1302EF
+			public const int ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox = 2131952367;
+			
+			// aapt resource value: 0x7F1302F0
+			public const int ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense = 2131952368;
+			
+			// aapt resource value: 0x7F1302F1
+			public const int ThemeOverlay_MaterialComponents_TimePicker = 2131952369;
+			
+			// aapt resource value: 0x7F1302F2
+			public const int ThemeOverlay_MaterialComponents_TimePicker_Display = 2131952370;
+			
+			// aapt resource value: 0x7F1302F3
+			public const int ThemeOverlay_MaterialComponents_TimePicker_Display_TextInputEditText = 2131952371;
+			
+			// aapt resource value: 0x7F1302F4
+			public const int ThemeOverlay_MaterialComponents_Toolbar_Popup_Primary = 2131952372;
+			
+			// aapt resource value: 0x7F1302F5
+			public const int ThemeOverlay_MaterialComponents_Toolbar_Primary = 2131952373;
+			
+			// aapt resource value: 0x7F1302F6
+			public const int ThemeOverlay_MaterialComponents_Toolbar_Surface = 2131952374;
+			
+			// aapt resource value: 0x7F13021E
+			public const int Theme_AppCompat = 2131952158;
+			
+			// aapt resource value: 0x7F13021F
+			public const int Theme_AppCompat_CompactMenu = 2131952159;
+			
+			// aapt resource value: 0x7F130220
+			public const int Theme_AppCompat_DayNight = 2131952160;
+			
+			// aapt resource value: 0x7F130221
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131952161;
+			
+			// aapt resource value: 0x7F130222
+			public const int Theme_AppCompat_DayNight_Dialog = 2131952162;
+			
+			// aapt resource value: 0x7F130225
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131952165;
+			
+			// aapt resource value: 0x7F130223
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131952163;
+			
+			// aapt resource value: 0x7F130224
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131952164;
+			
+			// aapt resource value: 0x7F130226
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131952166;
+			
+			// aapt resource value: 0x7F130227
+			public const int Theme_AppCompat_Dialog = 2131952167;
+			
+			// aapt resource value: 0x7F13022A
+			public const int Theme_AppCompat_DialogWhenLarge = 2131952170;
+			
+			// aapt resource value: 0x7F130228
+			public const int Theme_AppCompat_Dialog_Alert = 2131952168;
+			
+			// aapt resource value: 0x7F130229
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131952169;
+			
+			// aapt resource value: 0x7F13022B
+			public const int Theme_AppCompat_Empty = 2131952171;
+			
+			// aapt resource value: 0x7F13022C
+			public const int Theme_AppCompat_Light = 2131952172;
+			
+			// aapt resource value: 0x7F13022D
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131952173;
+			
+			// aapt resource value: 0x7F13022E
+			public const int Theme_AppCompat_Light_Dialog = 2131952174;
+			
+			// aapt resource value: 0x7F130231
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131952177;
+			
+			// aapt resource value: 0x7F13022F
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131952175;
+			
+			// aapt resource value: 0x7F130230
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131952176;
+			
+			// aapt resource value: 0x7F130232
+			public const int Theme_AppCompat_Light_NoActionBar = 2131952178;
+			
+			// aapt resource value: 0x7F130233
+			public const int Theme_AppCompat_NoActionBar = 2131952179;
+			
+			// aapt resource value: 0x7F130234
+			public const int Theme_BiometricPromptDialog = 2131952180;
+			
+			// aapt resource value: 0x7F130235
+			public const int Theme_Design = 2131952181;
+			
+			// aapt resource value: 0x7F130236
+			public const int Theme_Design_BottomSheetDialog = 2131952182;
+			
+			// aapt resource value: 0x7F130237
+			public const int Theme_Design_Light = 2131952183;
+			
+			// aapt resource value: 0x7F130238
+			public const int Theme_Design_Light_BottomSheetDialog = 2131952184;
+			
+			// aapt resource value: 0x7F130239
+			public const int Theme_Design_Light_NoActionBar = 2131952185;
+			
+			// aapt resource value: 0x7F13023A
+			public const int Theme_Design_NoActionBar = 2131952186;
+			
+			// aapt resource value: 0x7F13023B
+			public const int Theme_Material3_Dark = 2131952187;
+			
+			// aapt resource value: 0x7F13023C
+			public const int Theme_Material3_Dark_BottomSheetDialog = 2131952188;
+			
+			// aapt resource value: 0x7F13023D
+			public const int Theme_Material3_Dark_Dialog = 2131952189;
+			
+			// aapt resource value: 0x7F130240
+			public const int Theme_Material3_Dark_DialogWhenLarge = 2131952192;
+			
+			// aapt resource value: 0x7F13023E
+			public const int Theme_Material3_Dark_Dialog_Alert = 2131952190;
+			
+			// aapt resource value: 0x7F13023F
+			public const int Theme_Material3_Dark_Dialog_MinWidth = 2131952191;
+			
+			// aapt resource value: 0x7F130241
+			public const int Theme_Material3_Dark_NoActionBar = 2131952193;
+			
+			// aapt resource value: 0x7F130242
+			public const int Theme_Material3_Dark_SideSheetDialog = 2131952194;
+			
+			// aapt resource value: 0x7F130243
+			public const int Theme_Material3_DayNight = 2131952195;
+			
+			// aapt resource value: 0x7F130244
+			public const int Theme_Material3_DayNight_BottomSheetDialog = 2131952196;
+			
+			// aapt resource value: 0x7F130245
+			public const int Theme_Material3_DayNight_Dialog = 2131952197;
+			
+			// aapt resource value: 0x7F130248
+			public const int Theme_Material3_DayNight_DialogWhenLarge = 2131952200;
+			
+			// aapt resource value: 0x7F130246
+			public const int Theme_Material3_DayNight_Dialog_Alert = 2131952198;
+			
+			// aapt resource value: 0x7F130247
+			public const int Theme_Material3_DayNight_Dialog_MinWidth = 2131952199;
+			
+			// aapt resource value: 0x7F130249
+			public const int Theme_Material3_DayNight_NoActionBar = 2131952201;
+			
+			// aapt resource value: 0x7F13024A
+			public const int Theme_Material3_DayNight_SideSheetDialog = 2131952202;
+			
+			// aapt resource value: 0x7F13024B
+			public const int Theme_Material3_DynamicColors_Dark = 2131952203;
+			
+			// aapt resource value: 0x7F13024C
+			public const int Theme_Material3_DynamicColors_DayNight = 2131952204;
+			
+			// aapt resource value: 0x7F13024D
+			public const int Theme_Material3_DynamicColors_Light = 2131952205;
+			
+			// aapt resource value: 0x7F13024E
+			public const int Theme_Material3_Light = 2131952206;
+			
+			// aapt resource value: 0x7F13024F
+			public const int Theme_Material3_Light_BottomSheetDialog = 2131952207;
+			
+			// aapt resource value: 0x7F130250
+			public const int Theme_Material3_Light_Dialog = 2131952208;
+			
+			// aapt resource value: 0x7F130253
+			public const int Theme_Material3_Light_DialogWhenLarge = 2131952211;
+			
+			// aapt resource value: 0x7F130251
+			public const int Theme_Material3_Light_Dialog_Alert = 2131952209;
+			
+			// aapt resource value: 0x7F130252
+			public const int Theme_Material3_Light_Dialog_MinWidth = 2131952210;
+			
+			// aapt resource value: 0x7F130254
+			public const int Theme_Material3_Light_NoActionBar = 2131952212;
+			
+			// aapt resource value: 0x7F130255
+			public const int Theme_Material3_Light_SideSheetDialog = 2131952213;
+			
+			// aapt resource value: 0x7F130256
+			public const int Theme_MaterialComponents = 2131952214;
+			
+			// aapt resource value: 0x7F130257
+			public const int Theme_MaterialComponents_BottomSheetDialog = 2131952215;
+			
+			// aapt resource value: 0x7F130258
+			public const int Theme_MaterialComponents_Bridge = 2131952216;
+			
+			// aapt resource value: 0x7F130259
+			public const int Theme_MaterialComponents_CompactMenu = 2131952217;
+			
+			// aapt resource value: 0x7F13025A
+			public const int Theme_MaterialComponents_DayNight = 2131952218;
+			
+			// aapt resource value: 0x7F13025B
+			public const int Theme_MaterialComponents_DayNight_BottomSheetDialog = 2131952219;
+			
+			// aapt resource value: 0x7F13025C
+			public const int Theme_MaterialComponents_DayNight_Bridge = 2131952220;
+			
+			// aapt resource value: 0x7F13025D
+			public const int Theme_MaterialComponents_DayNight_DarkActionBar = 2131952221;
+			
+			// aapt resource value: 0x7F13025E
+			public const int Theme_MaterialComponents_DayNight_DarkActionBar_Bridge = 2131952222;
+			
+			// aapt resource value: 0x7F13025F
+			public const int Theme_MaterialComponents_DayNight_Dialog = 2131952223;
+			
+			// aapt resource value: 0x7F130267
+			public const int Theme_MaterialComponents_DayNight_DialogWhenLarge = 2131952231;
+			
+			// aapt resource value: 0x7F130260
+			public const int Theme_MaterialComponents_DayNight_Dialog_Alert = 2131952224;
+			
+			// aapt resource value: 0x7F130261
+			public const int Theme_MaterialComponents_DayNight_Dialog_Alert_Bridge = 2131952225;
+			
+			// aapt resource value: 0x7F130262
+			public const int Theme_MaterialComponents_DayNight_Dialog_Bridge = 2131952226;
+			
+			// aapt resource value: 0x7F130263
+			public const int Theme_MaterialComponents_DayNight_Dialog_FixedSize = 2131952227;
+			
+			// aapt resource value: 0x7F130264
+			public const int Theme_MaterialComponents_DayNight_Dialog_FixedSize_Bridge = 2131952228;
+			
+			// aapt resource value: 0x7F130265
+			public const int Theme_MaterialComponents_DayNight_Dialog_MinWidth = 2131952229;
+			
+			// aapt resource value: 0x7F130266
+			public const int Theme_MaterialComponents_DayNight_Dialog_MinWidth_Bridge = 2131952230;
+			
+			// aapt resource value: 0x7F130268
+			public const int Theme_MaterialComponents_DayNight_NoActionBar = 2131952232;
+			
+			// aapt resource value: 0x7F130269
+			public const int Theme_MaterialComponents_DayNight_NoActionBar_Bridge = 2131952233;
+			
+			// aapt resource value: 0x7F13026A
+			public const int Theme_MaterialComponents_Dialog = 2131952234;
+			
+			// aapt resource value: 0x7F130272
+			public const int Theme_MaterialComponents_DialogWhenLarge = 2131952242;
+			
+			// aapt resource value: 0x7F13026B
+			public const int Theme_MaterialComponents_Dialog_Alert = 2131952235;
+			
+			// aapt resource value: 0x7F13026C
+			public const int Theme_MaterialComponents_Dialog_Alert_Bridge = 2131952236;
+			
+			// aapt resource value: 0x7F13026D
+			public const int Theme_MaterialComponents_Dialog_Bridge = 2131952237;
+			
+			// aapt resource value: 0x7F13026E
+			public const int Theme_MaterialComponents_Dialog_FixedSize = 2131952238;
+			
+			// aapt resource value: 0x7F13026F
+			public const int Theme_MaterialComponents_Dialog_FixedSize_Bridge = 2131952239;
+			
+			// aapt resource value: 0x7F130270
+			public const int Theme_MaterialComponents_Dialog_MinWidth = 2131952240;
+			
+			// aapt resource value: 0x7F130271
+			public const int Theme_MaterialComponents_Dialog_MinWidth_Bridge = 2131952241;
+			
+			// aapt resource value: 0x7F130273
+			public const int Theme_MaterialComponents_Light = 2131952243;
+			
+			// aapt resource value: 0x7F130274
+			public const int Theme_MaterialComponents_Light_BottomSheetDialog = 2131952244;
+			
+			// aapt resource value: 0x7F130275
+			public const int Theme_MaterialComponents_Light_Bridge = 2131952245;
+			
+			// aapt resource value: 0x7F130276
+			public const int Theme_MaterialComponents_Light_DarkActionBar = 2131952246;
+			
+			// aapt resource value: 0x7F130277
+			public const int Theme_MaterialComponents_Light_DarkActionBar_Bridge = 2131952247;
+			
+			// aapt resource value: 0x7F130278
+			public const int Theme_MaterialComponents_Light_Dialog = 2131952248;
+			
+			// aapt resource value: 0x7F130280
+			public const int Theme_MaterialComponents_Light_DialogWhenLarge = 2131952256;
+			
+			// aapt resource value: 0x7F130279
+			public const int Theme_MaterialComponents_Light_Dialog_Alert = 2131952249;
+			
+			// aapt resource value: 0x7F13027A
+			public const int Theme_MaterialComponents_Light_Dialog_Alert_Bridge = 2131952250;
+			
+			// aapt resource value: 0x7F13027B
+			public const int Theme_MaterialComponents_Light_Dialog_Bridge = 2131952251;
+			
+			// aapt resource value: 0x7F13027C
+			public const int Theme_MaterialComponents_Light_Dialog_FixedSize = 2131952252;
+			
+			// aapt resource value: 0x7F13027D
+			public const int Theme_MaterialComponents_Light_Dialog_FixedSize_Bridge = 2131952253;
+			
+			// aapt resource value: 0x7F13027E
+			public const int Theme_MaterialComponents_Light_Dialog_MinWidth = 2131952254;
+			
+			// aapt resource value: 0x7F13027F
+			public const int Theme_MaterialComponents_Light_Dialog_MinWidth_Bridge = 2131952255;
+			
+			// aapt resource value: 0x7F130281
+			public const int Theme_MaterialComponents_Light_NoActionBar = 2131952257;
+			
+			// aapt resource value: 0x7F130282
+			public const int Theme_MaterialComponents_Light_NoActionBar_Bridge = 2131952258;
+			
+			// aapt resource value: 0x7F130283
+			public const int Theme_MaterialComponents_NoActionBar = 2131952259;
+			
+			// aapt resource value: 0x7F130284
+			public const int Theme_MaterialComponents_NoActionBar_Bridge = 2131952260;
+			
+			// aapt resource value: 0x7F13048D
+			public const int time_picker_style = 2131952781;
+			
+			// aapt resource value: 0x7F13048E
+			public const int translucent = 2131952782;
 			
 			// aapt resource value: 0x7F13048F
-			public const int time_picker_style = 2131952783;
+			public const int user_module_edittext = 2131952783;
 			
 			// aapt resource value: 0x7F130490
-			public const int translucent = 2131952784;
+			public const int video_dialog = 2131952784;
 			
-			// aapt resource value: 0x7F130491
-			public const int user_module_edittext = 2131952785;
+			// aapt resource value: 0x7F1302F7
+			public const int Widget_AppCompat_ActionBar = 2131952375;
 			
-			// aapt resource value: 0x7F130492
-			public const int video_dialog = 2131952786;
+			// aapt resource value: 0x7F1302F8
+			public const int Widget_AppCompat_ActionBar_Solid = 2131952376;
 			
 			// aapt resource value: 0x7F1302F9
-			public const int Widget_AppCompat_ActionBar = 2131952377;
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131952377;
 			
 			// aapt resource value: 0x7F1302FA
-			public const int Widget_AppCompat_ActionBar_Solid = 2131952378;
+			public const int Widget_AppCompat_ActionBar_TabText = 2131952378;
 			
 			// aapt resource value: 0x7F1302FB
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131952379;
+			public const int Widget_AppCompat_ActionBar_TabView = 2131952379;
 			
 			// aapt resource value: 0x7F1302FC
-			public const int Widget_AppCompat_ActionBar_TabText = 2131952380;
+			public const int Widget_AppCompat_ActionButton = 2131952380;
 			
 			// aapt resource value: 0x7F1302FD
-			public const int Widget_AppCompat_ActionBar_TabView = 2131952381;
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131952381;
 			
 			// aapt resource value: 0x7F1302FE
-			public const int Widget_AppCompat_ActionButton = 2131952382;
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131952382;
 			
 			// aapt resource value: 0x7F1302FF
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131952383;
+			public const int Widget_AppCompat_ActionMode = 2131952383;
 			
 			// aapt resource value: 0x7F130300
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131952384;
+			public const int Widget_AppCompat_ActivityChooserView = 2131952384;
 			
 			// aapt resource value: 0x7F130301
-			public const int Widget_AppCompat_ActionMode = 2131952385;
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131952385;
 			
 			// aapt resource value: 0x7F130302
-			public const int Widget_AppCompat_ActivityChooserView = 2131952386;
-			
-			// aapt resource value: 0x7F130303
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131952387;
-			
-			// aapt resource value: 0x7F130304
-			public const int Widget_AppCompat_Button = 2131952388;
-			
-			// aapt resource value: 0x7F13030A
-			public const int Widget_AppCompat_ButtonBar = 2131952394;
-			
-			// aapt resource value: 0x7F13030B
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131952395;
-			
-			// aapt resource value: 0x7F130305
-			public const int Widget_AppCompat_Button_Borderless = 2131952389;
-			
-			// aapt resource value: 0x7F130306
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131952390;
-			
-			// aapt resource value: 0x7F130307
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131952391;
+			public const int Widget_AppCompat_Button = 2131952386;
 			
 			// aapt resource value: 0x7F130308
-			public const int Widget_AppCompat_Button_Colored = 2131952392;
+			public const int Widget_AppCompat_ButtonBar = 2131952392;
 			
 			// aapt resource value: 0x7F130309
-			public const int Widget_AppCompat_Button_Small = 2131952393;
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131952393;
+			
+			// aapt resource value: 0x7F130303
+			public const int Widget_AppCompat_Button_Borderless = 2131952387;
+			
+			// aapt resource value: 0x7F130304
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131952388;
+			
+			// aapt resource value: 0x7F130305
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131952389;
+			
+			// aapt resource value: 0x7F130306
+			public const int Widget_AppCompat_Button_Colored = 2131952390;
+			
+			// aapt resource value: 0x7F130307
+			public const int Widget_AppCompat_Button_Small = 2131952391;
+			
+			// aapt resource value: 0x7F13030A
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131952394;
+			
+			// aapt resource value: 0x7F13030B
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131952395;
 			
 			// aapt resource value: 0x7F13030C
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131952396;
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131952396;
 			
 			// aapt resource value: 0x7F13030D
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131952397;
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131952397;
 			
 			// aapt resource value: 0x7F13030E
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131952398;
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131952398;
 			
 			// aapt resource value: 0x7F13030F
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131952399;
+			public const int Widget_AppCompat_EditText = 2131952399;
 			
 			// aapt resource value: 0x7F130310
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131952400;
+			public const int Widget_AppCompat_ImageButton = 2131952400;
 			
 			// aapt resource value: 0x7F130311
-			public const int Widget_AppCompat_EditText = 2131952401;
+			public const int Widget_AppCompat_Light_ActionBar = 2131952401;
 			
 			// aapt resource value: 0x7F130312
-			public const int Widget_AppCompat_ImageButton = 2131952402;
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131952402;
 			
 			// aapt resource value: 0x7F130313
-			public const int Widget_AppCompat_Light_ActionBar = 2131952403;
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131952403;
 			
 			// aapt resource value: 0x7F130314
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131952404;
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131952404;
 			
 			// aapt resource value: 0x7F130315
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131952405;
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131952405;
 			
 			// aapt resource value: 0x7F130316
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131952406;
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131952406;
 			
 			// aapt resource value: 0x7F130317
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131952407;
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131952407;
 			
 			// aapt resource value: 0x7F130318
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131952408;
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131952408;
 			
 			// aapt resource value: 0x7F130319
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131952409;
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131952409;
 			
 			// aapt resource value: 0x7F13031A
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131952410;
+			public const int Widget_AppCompat_Light_ActionButton = 2131952410;
 			
 			// aapt resource value: 0x7F13031B
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131952411;
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131952411;
 			
 			// aapt resource value: 0x7F13031C
-			public const int Widget_AppCompat_Light_ActionButton = 2131952412;
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131952412;
 			
 			// aapt resource value: 0x7F13031D
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131952413;
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131952413;
 			
 			// aapt resource value: 0x7F13031E
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131952414;
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131952414;
 			
 			// aapt resource value: 0x7F13031F
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131952415;
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131952415;
 			
 			// aapt resource value: 0x7F130320
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131952416;
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131952416;
 			
 			// aapt resource value: 0x7F130321
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131952417;
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131952417;
 			
 			// aapt resource value: 0x7F130322
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131952418;
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131952418;
 			
 			// aapt resource value: 0x7F130323
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131952419;
+			public const int Widget_AppCompat_Light_PopupMenu = 2131952419;
 			
 			// aapt resource value: 0x7F130324
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131952420;
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131952420;
 			
 			// aapt resource value: 0x7F130325
-			public const int Widget_AppCompat_Light_PopupMenu = 2131952421;
+			public const int Widget_AppCompat_Light_SearchView = 2131952421;
 			
 			// aapt resource value: 0x7F130326
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131952422;
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131952422;
 			
 			// aapt resource value: 0x7F130327
-			public const int Widget_AppCompat_Light_SearchView = 2131952423;
+			public const int Widget_AppCompat_ListMenuView = 2131952423;
 			
 			// aapt resource value: 0x7F130328
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131952424;
+			public const int Widget_AppCompat_ListPopupWindow = 2131952424;
 			
 			// aapt resource value: 0x7F130329
-			public const int Widget_AppCompat_ListMenuView = 2131952425;
+			public const int Widget_AppCompat_ListView = 2131952425;
 			
 			// aapt resource value: 0x7F13032A
-			public const int Widget_AppCompat_ListPopupWindow = 2131952426;
+			public const int Widget_AppCompat_ListView_DropDown = 2131952426;
 			
 			// aapt resource value: 0x7F13032B
-			public const int Widget_AppCompat_ListView = 2131952427;
+			public const int Widget_AppCompat_ListView_Menu = 2131952427;
 			
 			// aapt resource value: 0x7F13032C
-			public const int Widget_AppCompat_ListView_DropDown = 2131952428;
+			public const int Widget_AppCompat_PopupMenu = 2131952428;
 			
 			// aapt resource value: 0x7F13032D
-			public const int Widget_AppCompat_ListView_Menu = 2131952429;
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131952429;
 			
 			// aapt resource value: 0x7F13032E
-			public const int Widget_AppCompat_PopupMenu = 2131952430;
+			public const int Widget_AppCompat_PopupWindow = 2131952430;
 			
 			// aapt resource value: 0x7F13032F
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131952431;
+			public const int Widget_AppCompat_ProgressBar = 2131952431;
 			
 			// aapt resource value: 0x7F130330
-			public const int Widget_AppCompat_PopupWindow = 2131952432;
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131952432;
 			
 			// aapt resource value: 0x7F130331
-			public const int Widget_AppCompat_ProgressBar = 2131952433;
+			public const int Widget_AppCompat_RatingBar = 2131952433;
 			
 			// aapt resource value: 0x7F130332
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131952434;
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131952434;
 			
 			// aapt resource value: 0x7F130333
-			public const int Widget_AppCompat_RatingBar = 2131952435;
+			public const int Widget_AppCompat_RatingBar_Small = 2131952435;
 			
 			// aapt resource value: 0x7F130334
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131952436;
+			public const int Widget_AppCompat_SearchView = 2131952436;
 			
 			// aapt resource value: 0x7F130335
-			public const int Widget_AppCompat_RatingBar_Small = 2131952437;
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131952437;
 			
 			// aapt resource value: 0x7F130336
-			public const int Widget_AppCompat_SearchView = 2131952438;
+			public const int Widget_AppCompat_SeekBar = 2131952438;
 			
 			// aapt resource value: 0x7F130337
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131952439;
+			public const int Widget_AppCompat_SeekBar_Discrete = 2131952439;
 			
 			// aapt resource value: 0x7F130338
-			public const int Widget_AppCompat_SeekBar = 2131952440;
+			public const int Widget_AppCompat_Spinner = 2131952440;
 			
 			// aapt resource value: 0x7F130339
-			public const int Widget_AppCompat_SeekBar_Discrete = 2131952441;
+			public const int Widget_AppCompat_Spinner_DropDown = 2131952441;
 			
 			// aapt resource value: 0x7F13033A
-			public const int Widget_AppCompat_Spinner = 2131952442;
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131952442;
 			
 			// aapt resource value: 0x7F13033B
-			public const int Widget_AppCompat_Spinner_DropDown = 2131952443;
+			public const int Widget_AppCompat_Spinner_Underlined = 2131952443;
 			
 			// aapt resource value: 0x7F13033C
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131952444;
+			public const int Widget_AppCompat_TextView = 2131952444;
 			
 			// aapt resource value: 0x7F13033D
-			public const int Widget_AppCompat_Spinner_Underlined = 2131952445;
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131952445;
 			
 			// aapt resource value: 0x7F13033E
-			public const int Widget_AppCompat_TextView = 2131952446;
+			public const int Widget_AppCompat_Toolbar = 2131952446;
 			
 			// aapt resource value: 0x7F13033F
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131952447;
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131952447;
 			
 			// aapt resource value: 0x7F130340
-			public const int Widget_AppCompat_Toolbar = 2131952448;
+			public const int Widget_Compat_NotificationActionContainer = 2131952448;
 			
 			// aapt resource value: 0x7F130341
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131952449;
+			public const int Widget_Compat_NotificationActionText = 2131952449;
 			
 			// aapt resource value: 0x7F130342
-			public const int Widget_Compat_NotificationActionContainer = 2131952450;
+			public const int Widget_Design_AppBarLayout = 2131952450;
 			
 			// aapt resource value: 0x7F130343
-			public const int Widget_Compat_NotificationActionText = 2131952451;
+			public const int Widget_Design_BottomNavigationView = 2131952451;
 			
 			// aapt resource value: 0x7F130344
-			public const int Widget_Design_AppBarLayout = 2131952452;
+			public const int Widget_Design_BottomSheet_Modal = 2131952452;
 			
 			// aapt resource value: 0x7F130345
-			public const int Widget_Design_BottomNavigationView = 2131952453;
+			public const int Widget_Design_CollapsingToolbar = 2131952453;
 			
 			// aapt resource value: 0x7F130346
-			public const int Widget_Design_BottomSheet_Modal = 2131952454;
+			public const int Widget_Design_FloatingActionButton = 2131952454;
 			
 			// aapt resource value: 0x7F130347
-			public const int Widget_Design_CollapsingToolbar = 2131952455;
+			public const int Widget_Design_NavigationView = 2131952455;
 			
 			// aapt resource value: 0x7F130348
-			public const int Widget_Design_FloatingActionButton = 2131952456;
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131952456;
 			
 			// aapt resource value: 0x7F130349
-			public const int Widget_Design_NavigationView = 2131952457;
+			public const int Widget_Design_Snackbar = 2131952457;
 			
 			// aapt resource value: 0x7F13034A
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131952458;
+			public const int Widget_Design_TabLayout = 2131952458;
 			
 			// aapt resource value: 0x7F13034B
-			public const int Widget_Design_Snackbar = 2131952459;
+			public const int Widget_Design_TextInputEditText = 2131952459;
 			
 			// aapt resource value: 0x7F13034C
-			public const int Widget_Design_TabLayout = 2131952460;
+			public const int Widget_Design_TextInputLayout = 2131952460;
 			
 			// aapt resource value: 0x7F13034D
-			public const int Widget_Design_TextInputEditText = 2131952461;
+			public const int Widget_Material3_ActionBar_Solid = 2131952461;
 			
 			// aapt resource value: 0x7F13034E
-			public const int Widget_Design_TextInputLayout = 2131952462;
+			public const int Widget_Material3_ActionMode = 2131952462;
 			
 			// aapt resource value: 0x7F13034F
-			public const int Widget_Material3_ActionBar_Solid = 2131952463;
+			public const int Widget_Material3_AppBarLayout = 2131952463;
 			
 			// aapt resource value: 0x7F130350
-			public const int Widget_Material3_ActionMode = 2131952464;
+			public const int Widget_Material3_AutoCompleteTextView_FilledBox = 2131952464;
 			
 			// aapt resource value: 0x7F130351
-			public const int Widget_Material3_AppBarLayout = 2131952465;
+			public const int Widget_Material3_AutoCompleteTextView_FilledBox_Dense = 2131952465;
 			
 			// aapt resource value: 0x7F130352
-			public const int Widget_Material3_AutoCompleteTextView_FilledBox = 2131952466;
+			public const int Widget_Material3_AutoCompleteTextView_OutlinedBox = 2131952466;
 			
 			// aapt resource value: 0x7F130353
-			public const int Widget_Material3_AutoCompleteTextView_FilledBox_Dense = 2131952467;
+			public const int Widget_Material3_AutoCompleteTextView_OutlinedBox_Dense = 2131952467;
 			
 			// aapt resource value: 0x7F130354
-			public const int Widget_Material3_AutoCompleteTextView_OutlinedBox = 2131952468;
+			public const int Widget_Material3_Badge = 2131952468;
 			
 			// aapt resource value: 0x7F130355
-			public const int Widget_Material3_AutoCompleteTextView_OutlinedBox_Dense = 2131952469;
+			public const int Widget_Material3_Badge_AdjustToBounds = 2131952469;
 			
 			// aapt resource value: 0x7F130356
-			public const int Widget_Material3_Badge = 2131952470;
+			public const int Widget_Material3_BottomAppBar = 2131952470;
 			
 			// aapt resource value: 0x7F130357
-			public const int Widget_Material3_Badge_AdjustToBounds = 2131952471;
+			public const int Widget_Material3_BottomAppBar_Button_Navigation = 2131952471;
 			
 			// aapt resource value: 0x7F130358
-			public const int Widget_Material3_BottomAppBar = 2131952472;
+			public const int Widget_Material3_BottomAppBar_Legacy = 2131952472;
 			
 			// aapt resource value: 0x7F130359
-			public const int Widget_Material3_BottomAppBar_Button_Navigation = 2131952473;
+			public const int Widget_Material3_BottomNavigationView = 2131952473;
 			
 			// aapt resource value: 0x7F13035A
-			public const int Widget_Material3_BottomAppBar_Legacy = 2131952474;
+			public const int Widget_Material3_BottomNavigationView_ActiveIndicator = 2131952474;
 			
 			// aapt resource value: 0x7F13035B
-			public const int Widget_Material3_BottomNavigationView = 2131952475;
+			public const int Widget_Material3_BottomSheet = 2131952475;
 			
 			// aapt resource value: 0x7F13035C
-			public const int Widget_Material3_BottomNavigationView_ActiveIndicator = 2131952476;
+			public const int Widget_Material3_BottomSheet_DragHandle = 2131952476;
 			
 			// aapt resource value: 0x7F13035D
-			public const int Widget_Material3_BottomSheet = 2131952477;
+			public const int Widget_Material3_BottomSheet_Modal = 2131952477;
 			
 			// aapt resource value: 0x7F13035E
-			public const int Widget_Material3_BottomSheet_DragHandle = 2131952478;
+			public const int Widget_Material3_Button = 2131952478;
 			
 			// aapt resource value: 0x7F13035F
-			public const int Widget_Material3_BottomSheet_Modal = 2131952479;
+			public const int Widget_Material3_Button_ElevatedButton = 2131952479;
 			
 			// aapt resource value: 0x7F130360
-			public const int Widget_Material3_Button = 2131952480;
+			public const int Widget_Material3_Button_ElevatedButton_Icon = 2131952480;
 			
 			// aapt resource value: 0x7F130361
-			public const int Widget_Material3_Button_ElevatedButton = 2131952481;
+			public const int Widget_Material3_Button_Icon = 2131952481;
 			
 			// aapt resource value: 0x7F130362
-			public const int Widget_Material3_Button_ElevatedButton_Icon = 2131952482;
+			public const int Widget_Material3_Button_IconButton = 2131952482;
 			
 			// aapt resource value: 0x7F130363
-			public const int Widget_Material3_Button_Icon = 2131952483;
+			public const int Widget_Material3_Button_IconButton_Filled = 2131952483;
 			
 			// aapt resource value: 0x7F130364
-			public const int Widget_Material3_Button_IconButton = 2131952484;
+			public const int Widget_Material3_Button_IconButton_Filled_Tonal = 2131952484;
 			
 			// aapt resource value: 0x7F130365
-			public const int Widget_Material3_Button_IconButton_Filled = 2131952485;
+			public const int Widget_Material3_Button_IconButton_Outlined = 2131952485;
 			
 			// aapt resource value: 0x7F130366
-			public const int Widget_Material3_Button_IconButton_Filled_Tonal = 2131952486;
+			public const int Widget_Material3_Button_OutlinedButton = 2131952486;
 			
 			// aapt resource value: 0x7F130367
-			public const int Widget_Material3_Button_IconButton_Outlined = 2131952487;
+			public const int Widget_Material3_Button_OutlinedButton_Icon = 2131952487;
 			
 			// aapt resource value: 0x7F130368
-			public const int Widget_Material3_Button_OutlinedButton = 2131952488;
+			public const int Widget_Material3_Button_TextButton = 2131952488;
 			
 			// aapt resource value: 0x7F130369
-			public const int Widget_Material3_Button_OutlinedButton_Icon = 2131952489;
+			public const int Widget_Material3_Button_TextButton_Dialog = 2131952489;
 			
 			// aapt resource value: 0x7F13036A
-			public const int Widget_Material3_Button_TextButton = 2131952490;
+			public const int Widget_Material3_Button_TextButton_Dialog_Flush = 2131952490;
 			
 			// aapt resource value: 0x7F13036B
-			public const int Widget_Material3_Button_TextButton_Dialog = 2131952491;
+			public const int Widget_Material3_Button_TextButton_Dialog_Icon = 2131952491;
 			
 			// aapt resource value: 0x7F13036C
-			public const int Widget_Material3_Button_TextButton_Dialog_Flush = 2131952492;
+			public const int Widget_Material3_Button_TextButton_Icon = 2131952492;
 			
 			// aapt resource value: 0x7F13036D
-			public const int Widget_Material3_Button_TextButton_Dialog_Icon = 2131952493;
+			public const int Widget_Material3_Button_TextButton_Snackbar = 2131952493;
 			
 			// aapt resource value: 0x7F13036E
-			public const int Widget_Material3_Button_TextButton_Icon = 2131952494;
+			public const int Widget_Material3_Button_TonalButton = 2131952494;
 			
 			// aapt resource value: 0x7F13036F
-			public const int Widget_Material3_Button_TextButton_Snackbar = 2131952495;
+			public const int Widget_Material3_Button_TonalButton_Icon = 2131952495;
 			
 			// aapt resource value: 0x7F130370
-			public const int Widget_Material3_Button_TonalButton = 2131952496;
+			public const int Widget_Material3_Button_UnelevatedButton = 2131952496;
 			
 			// aapt resource value: 0x7F130371
-			public const int Widget_Material3_Button_TonalButton_Icon = 2131952497;
+			public const int Widget_Material3_CardView_Elevated = 2131952497;
 			
 			// aapt resource value: 0x7F130372
-			public const int Widget_Material3_Button_UnelevatedButton = 2131952498;
+			public const int Widget_Material3_CardView_Filled = 2131952498;
 			
 			// aapt resource value: 0x7F130373
-			public const int Widget_Material3_CardView_Elevated = 2131952499;
+			public const int Widget_Material3_CardView_Outlined = 2131952499;
 			
 			// aapt resource value: 0x7F130374
-			public const int Widget_Material3_CardView_Filled = 2131952500;
-			
-			// aapt resource value: 0x7F130375
-			public const int Widget_Material3_CardView_Outlined = 2131952501;
-			
-			// aapt resource value: 0x7F130376
-			public const int Widget_Material3_CheckedTextView = 2131952502;
-			
-			// aapt resource value: 0x7F130381
-			public const int Widget_Material3_ChipGroup = 2131952513;
-			
-			// aapt resource value: 0x7F130377
-			public const int Widget_Material3_Chip_Assist = 2131952503;
-			
-			// aapt resource value: 0x7F130378
-			public const int Widget_Material3_Chip_Assist_Elevated = 2131952504;
-			
-			// aapt resource value: 0x7F130379
-			public const int Widget_Material3_Chip_Filter = 2131952505;
-			
-			// aapt resource value: 0x7F13037A
-			public const int Widget_Material3_Chip_Filter_Elevated = 2131952506;
-			
-			// aapt resource value: 0x7F13037B
-			public const int Widget_Material3_Chip_Input = 2131952507;
-			
-			// aapt resource value: 0x7F13037C
-			public const int Widget_Material3_Chip_Input_Elevated = 2131952508;
-			
-			// aapt resource value: 0x7F13037D
-			public const int Widget_Material3_Chip_Input_Icon = 2131952509;
-			
-			// aapt resource value: 0x7F13037E
-			public const int Widget_Material3_Chip_Input_Icon_Elevated = 2131952510;
+			public const int Widget_Material3_CheckedTextView = 2131952500;
 			
 			// aapt resource value: 0x7F13037F
-			public const int Widget_Material3_Chip_Suggestion = 2131952511;
+			public const int Widget_Material3_ChipGroup = 2131952511;
+			
+			// aapt resource value: 0x7F130375
+			public const int Widget_Material3_Chip_Assist = 2131952501;
+			
+			// aapt resource value: 0x7F130376
+			public const int Widget_Material3_Chip_Assist_Elevated = 2131952502;
+			
+			// aapt resource value: 0x7F130377
+			public const int Widget_Material3_Chip_Filter = 2131952503;
+			
+			// aapt resource value: 0x7F130378
+			public const int Widget_Material3_Chip_Filter_Elevated = 2131952504;
+			
+			// aapt resource value: 0x7F130379
+			public const int Widget_Material3_Chip_Input = 2131952505;
+			
+			// aapt resource value: 0x7F13037A
+			public const int Widget_Material3_Chip_Input_Elevated = 2131952506;
+			
+			// aapt resource value: 0x7F13037B
+			public const int Widget_Material3_Chip_Input_Icon = 2131952507;
+			
+			// aapt resource value: 0x7F13037C
+			public const int Widget_Material3_Chip_Input_Icon_Elevated = 2131952508;
+			
+			// aapt resource value: 0x7F13037D
+			public const int Widget_Material3_Chip_Suggestion = 2131952509;
+			
+			// aapt resource value: 0x7F13037E
+			public const int Widget_Material3_Chip_Suggestion_Elevated = 2131952510;
 			
 			// aapt resource value: 0x7F130380
-			public const int Widget_Material3_Chip_Suggestion_Elevated = 2131952512;
+			public const int Widget_Material3_CircularProgressIndicator = 2131952512;
+			
+			// aapt resource value: 0x7F130381
+			public const int Widget_Material3_CircularProgressIndicator_ExtraSmall = 2131952513;
 			
 			// aapt resource value: 0x7F130382
-			public const int Widget_Material3_CircularProgressIndicator = 2131952514;
+			public const int Widget_Material3_CircularProgressIndicator_Medium = 2131952514;
 			
 			// aapt resource value: 0x7F130383
-			public const int Widget_Material3_CircularProgressIndicator_ExtraSmall = 2131952515;
+			public const int Widget_Material3_CircularProgressIndicator_Small = 2131952515;
 			
 			// aapt resource value: 0x7F130384
-			public const int Widget_Material3_CircularProgressIndicator_Medium = 2131952516;
+			public const int Widget_Material3_CollapsingToolbar = 2131952516;
 			
 			// aapt resource value: 0x7F130385
-			public const int Widget_Material3_CircularProgressIndicator_Small = 2131952517;
+			public const int Widget_Material3_CollapsingToolbar_Large = 2131952517;
 			
 			// aapt resource value: 0x7F130386
-			public const int Widget_Material3_CollapsingToolbar = 2131952518;
+			public const int Widget_Material3_CollapsingToolbar_Medium = 2131952518;
 			
 			// aapt resource value: 0x7F130387
-			public const int Widget_Material3_CollapsingToolbar_Large = 2131952519;
+			public const int Widget_Material3_CompoundButton_CheckBox = 2131952519;
 			
 			// aapt resource value: 0x7F130388
-			public const int Widget_Material3_CollapsingToolbar_Medium = 2131952520;
+			public const int Widget_Material3_CompoundButton_MaterialSwitch = 2131952520;
 			
 			// aapt resource value: 0x7F130389
-			public const int Widget_Material3_CompoundButton_CheckBox = 2131952521;
+			public const int Widget_Material3_CompoundButton_RadioButton = 2131952521;
 			
 			// aapt resource value: 0x7F13038A
-			public const int Widget_Material3_CompoundButton_MaterialSwitch = 2131952522;
+			public const int Widget_Material3_CompoundButton_Switch = 2131952522;
 			
 			// aapt resource value: 0x7F13038B
-			public const int Widget_Material3_CompoundButton_RadioButton = 2131952523;
+			public const int Widget_Material3_DrawerLayout = 2131952523;
 			
 			// aapt resource value: 0x7F13038C
-			public const int Widget_Material3_CompoundButton_Switch = 2131952524;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Primary = 2131952524;
 			
 			// aapt resource value: 0x7F13038D
-			public const int Widget_Material3_DrawerLayout = 2131952525;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Secondary = 2131952525;
 			
 			// aapt resource value: 0x7F13038E
-			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Primary = 2131952526;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Surface = 2131952526;
 			
 			// aapt resource value: 0x7F13038F
-			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Secondary = 2131952527;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Tertiary = 2131952527;
 			
 			// aapt resource value: 0x7F130390
-			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Surface = 2131952528;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Primary = 2131952528;
 			
 			// aapt resource value: 0x7F130391
-			public const int Widget_Material3_ExtendedFloatingActionButton_Icon_Tertiary = 2131952529;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Secondary = 2131952529;
 			
 			// aapt resource value: 0x7F130392
-			public const int Widget_Material3_ExtendedFloatingActionButton_Primary = 2131952530;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Surface = 2131952530;
 			
 			// aapt resource value: 0x7F130393
-			public const int Widget_Material3_ExtendedFloatingActionButton_Secondary = 2131952531;
+			public const int Widget_Material3_ExtendedFloatingActionButton_Tertiary = 2131952531;
 			
 			// aapt resource value: 0x7F130394
-			public const int Widget_Material3_ExtendedFloatingActionButton_Surface = 2131952532;
+			public const int Widget_Material3_FloatingActionButton_Large_Primary = 2131952532;
 			
 			// aapt resource value: 0x7F130395
-			public const int Widget_Material3_ExtendedFloatingActionButton_Tertiary = 2131952533;
+			public const int Widget_Material3_FloatingActionButton_Large_Secondary = 2131952533;
 			
 			// aapt resource value: 0x7F130396
-			public const int Widget_Material3_FloatingActionButton_Large_Primary = 2131952534;
+			public const int Widget_Material3_FloatingActionButton_Large_Surface = 2131952534;
 			
 			// aapt resource value: 0x7F130397
-			public const int Widget_Material3_FloatingActionButton_Large_Secondary = 2131952535;
+			public const int Widget_Material3_FloatingActionButton_Large_Tertiary = 2131952535;
 			
 			// aapt resource value: 0x7F130398
-			public const int Widget_Material3_FloatingActionButton_Large_Surface = 2131952536;
+			public const int Widget_Material3_FloatingActionButton_Primary = 2131952536;
 			
 			// aapt resource value: 0x7F130399
-			public const int Widget_Material3_FloatingActionButton_Large_Tertiary = 2131952537;
+			public const int Widget_Material3_FloatingActionButton_Secondary = 2131952537;
 			
 			// aapt resource value: 0x7F13039A
-			public const int Widget_Material3_FloatingActionButton_Primary = 2131952538;
+			public const int Widget_Material3_FloatingActionButton_Small_Primary = 2131952538;
 			
 			// aapt resource value: 0x7F13039B
-			public const int Widget_Material3_FloatingActionButton_Secondary = 2131952539;
+			public const int Widget_Material3_FloatingActionButton_Small_Secondary = 2131952539;
 			
 			// aapt resource value: 0x7F13039C
-			public const int Widget_Material3_FloatingActionButton_Small_Primary = 2131952540;
+			public const int Widget_Material3_FloatingActionButton_Small_Surface = 2131952540;
 			
 			// aapt resource value: 0x7F13039D
-			public const int Widget_Material3_FloatingActionButton_Small_Secondary = 2131952541;
+			public const int Widget_Material3_FloatingActionButton_Small_Tertiary = 2131952541;
 			
 			// aapt resource value: 0x7F13039E
-			public const int Widget_Material3_FloatingActionButton_Small_Surface = 2131952542;
+			public const int Widget_Material3_FloatingActionButton_Surface = 2131952542;
 			
 			// aapt resource value: 0x7F13039F
-			public const int Widget_Material3_FloatingActionButton_Small_Tertiary = 2131952543;
+			public const int Widget_Material3_FloatingActionButton_Tertiary = 2131952543;
 			
 			// aapt resource value: 0x7F1303A0
-			public const int Widget_Material3_FloatingActionButton_Surface = 2131952544;
+			public const int Widget_Material3_Light_ActionBar_Solid = 2131952544;
 			
 			// aapt resource value: 0x7F1303A1
-			public const int Widget_Material3_FloatingActionButton_Tertiary = 2131952545;
+			public const int Widget_Material3_LinearProgressIndicator = 2131952545;
 			
 			// aapt resource value: 0x7F1303A2
-			public const int Widget_Material3_Light_ActionBar_Solid = 2131952546;
+			public const int Widget_Material3_MaterialButtonToggleGroup = 2131952546;
 			
 			// aapt resource value: 0x7F1303A3
-			public const int Widget_Material3_LinearProgressIndicator = 2131952547;
+			public const int Widget_Material3_MaterialCalendar = 2131952547;
 			
 			// aapt resource value: 0x7F1303A4
-			public const int Widget_Material3_MaterialButtonToggleGroup = 2131952548;
-			
-			// aapt resource value: 0x7F1303A5
-			public const int Widget_Material3_MaterialCalendar = 2131952549;
-			
-			// aapt resource value: 0x7F1303A6
-			public const int Widget_Material3_MaterialCalendar_Day = 2131952550;
-			
-			// aapt resource value: 0x7F1303AA
-			public const int Widget_Material3_MaterialCalendar_DayOfWeekLabel = 2131952554;
-			
-			// aapt resource value: 0x7F1303AB
-			public const int Widget_Material3_MaterialCalendar_DayTextView = 2131952555;
-			
-			// aapt resource value: 0x7F1303A7
-			public const int Widget_Material3_MaterialCalendar_Day_Invalid = 2131952551;
+			public const int Widget_Material3_MaterialCalendar_Day = 2131952548;
 			
 			// aapt resource value: 0x7F1303A8
-			public const int Widget_Material3_MaterialCalendar_Day_Selected = 2131952552;
+			public const int Widget_Material3_MaterialCalendar_DayOfWeekLabel = 2131952552;
 			
 			// aapt resource value: 0x7F1303A9
-			public const int Widget_Material3_MaterialCalendar_Day_Today = 2131952553;
+			public const int Widget_Material3_MaterialCalendar_DayTextView = 2131952553;
+			
+			// aapt resource value: 0x7F1303A5
+			public const int Widget_Material3_MaterialCalendar_Day_Invalid = 2131952549;
+			
+			// aapt resource value: 0x7F1303A6
+			public const int Widget_Material3_MaterialCalendar_Day_Selected = 2131952550;
+			
+			// aapt resource value: 0x7F1303A7
+			public const int Widget_Material3_MaterialCalendar_Day_Today = 2131952551;
+			
+			// aapt resource value: 0x7F1303AA
+			public const int Widget_Material3_MaterialCalendar_Fullscreen = 2131952554;
+			
+			// aapt resource value: 0x7F1303AB
+			public const int Widget_Material3_MaterialCalendar_HeaderCancelButton = 2131952555;
 			
 			// aapt resource value: 0x7F1303AC
-			public const int Widget_Material3_MaterialCalendar_Fullscreen = 2131952556;
+			public const int Widget_Material3_MaterialCalendar_HeaderDivider = 2131952556;
 			
 			// aapt resource value: 0x7F1303AD
-			public const int Widget_Material3_MaterialCalendar_HeaderCancelButton = 2131952557;
+			public const int Widget_Material3_MaterialCalendar_HeaderLayout = 2131952557;
 			
 			// aapt resource value: 0x7F1303AE
-			public const int Widget_Material3_MaterialCalendar_HeaderDivider = 2131952558;
+			public const int Widget_Material3_MaterialCalendar_HeaderLayout_Fullscreen = 2131952558;
 			
 			// aapt resource value: 0x7F1303AF
-			public const int Widget_Material3_MaterialCalendar_HeaderLayout = 2131952559;
+			public const int Widget_Material3_MaterialCalendar_HeaderSelection = 2131952559;
 			
 			// aapt resource value: 0x7F1303B0
-			public const int Widget_Material3_MaterialCalendar_HeaderLayout_Fullscreen = 2131952560;
+			public const int Widget_Material3_MaterialCalendar_HeaderSelection_Fullscreen = 2131952560;
 			
 			// aapt resource value: 0x7F1303B1
-			public const int Widget_Material3_MaterialCalendar_HeaderSelection = 2131952561;
+			public const int Widget_Material3_MaterialCalendar_HeaderTitle = 2131952561;
 			
 			// aapt resource value: 0x7F1303B2
-			public const int Widget_Material3_MaterialCalendar_HeaderSelection_Fullscreen = 2131952562;
+			public const int Widget_Material3_MaterialCalendar_HeaderToggleButton = 2131952562;
 			
 			// aapt resource value: 0x7F1303B3
-			public const int Widget_Material3_MaterialCalendar_HeaderTitle = 2131952563;
+			public const int Widget_Material3_MaterialCalendar_Item = 2131952563;
 			
 			// aapt resource value: 0x7F1303B4
-			public const int Widget_Material3_MaterialCalendar_HeaderToggleButton = 2131952564;
+			public const int Widget_Material3_MaterialCalendar_MonthNavigationButton = 2131952564;
 			
 			// aapt resource value: 0x7F1303B5
-			public const int Widget_Material3_MaterialCalendar_Item = 2131952565;
+			public const int Widget_Material3_MaterialCalendar_MonthTextView = 2131952565;
 			
 			// aapt resource value: 0x7F1303B6
-			public const int Widget_Material3_MaterialCalendar_MonthNavigationButton = 2131952566;
-			
-			// aapt resource value: 0x7F1303B7
-			public const int Widget_Material3_MaterialCalendar_MonthTextView = 2131952567;
-			
-			// aapt resource value: 0x7F1303B8
-			public const int Widget_Material3_MaterialCalendar_Year = 2131952568;
-			
-			// aapt resource value: 0x7F1303BB
-			public const int Widget_Material3_MaterialCalendar_YearNavigationButton = 2131952571;
+			public const int Widget_Material3_MaterialCalendar_Year = 2131952566;
 			
 			// aapt resource value: 0x7F1303B9
-			public const int Widget_Material3_MaterialCalendar_Year_Selected = 2131952569;
+			public const int Widget_Material3_MaterialCalendar_YearNavigationButton = 2131952569;
+			
+			// aapt resource value: 0x7F1303B7
+			public const int Widget_Material3_MaterialCalendar_Year_Selected = 2131952567;
+			
+			// aapt resource value: 0x7F1303B8
+			public const int Widget_Material3_MaterialCalendar_Year_Today = 2131952568;
 			
 			// aapt resource value: 0x7F1303BA
-			public const int Widget_Material3_MaterialCalendar_Year_Today = 2131952570;
+			public const int Widget_Material3_MaterialDivider = 2131952570;
+			
+			// aapt resource value: 0x7F1303BB
+			public const int Widget_Material3_MaterialDivider_Heavy = 2131952571;
 			
 			// aapt resource value: 0x7F1303BC
-			public const int Widget_Material3_MaterialDivider = 2131952572;
+			public const int Widget_Material3_MaterialTimePicker = 2131952572;
 			
 			// aapt resource value: 0x7F1303BD
-			public const int Widget_Material3_MaterialDivider_Heavy = 2131952573;
+			public const int Widget_Material3_MaterialTimePicker_Button = 2131952573;
 			
 			// aapt resource value: 0x7F1303BE
-			public const int Widget_Material3_MaterialTimePicker = 2131952574;
+			public const int Widget_Material3_MaterialTimePicker_Clock = 2131952574;
 			
 			// aapt resource value: 0x7F1303BF
-			public const int Widget_Material3_MaterialTimePicker_Button = 2131952575;
+			public const int Widget_Material3_MaterialTimePicker_Display = 2131952575;
 			
 			// aapt resource value: 0x7F1303C0
-			public const int Widget_Material3_MaterialTimePicker_Clock = 2131952576;
+			public const int Widget_Material3_MaterialTimePicker_Display_Divider = 2131952576;
 			
 			// aapt resource value: 0x7F1303C1
-			public const int Widget_Material3_MaterialTimePicker_Display = 2131952577;
+			public const int Widget_Material3_MaterialTimePicker_Display_HelperText = 2131952577;
 			
 			// aapt resource value: 0x7F1303C2
-			public const int Widget_Material3_MaterialTimePicker_Display_Divider = 2131952578;
+			public const int Widget_Material3_MaterialTimePicker_Display_TextInputEditText = 2131952578;
 			
 			// aapt resource value: 0x7F1303C3
-			public const int Widget_Material3_MaterialTimePicker_Display_HelperText = 2131952579;
+			public const int Widget_Material3_MaterialTimePicker_Display_TextInputLayout = 2131952579;
 			
 			// aapt resource value: 0x7F1303C4
-			public const int Widget_Material3_MaterialTimePicker_Display_TextInputEditText = 2131952580;
+			public const int Widget_Material3_MaterialTimePicker_ImageButton = 2131952580;
 			
 			// aapt resource value: 0x7F1303C5
-			public const int Widget_Material3_MaterialTimePicker_Display_TextInputLayout = 2131952581;
+			public const int Widget_Material3_NavigationRailView = 2131952581;
 			
 			// aapt resource value: 0x7F1303C6
-			public const int Widget_Material3_MaterialTimePicker_ImageButton = 2131952582;
+			public const int Widget_Material3_NavigationRailView_ActiveIndicator = 2131952582;
 			
 			// aapt resource value: 0x7F1303C7
-			public const int Widget_Material3_NavigationRailView = 2131952583;
+			public const int Widget_Material3_NavigationRailView_Badge = 2131952583;
 			
 			// aapt resource value: 0x7F1303C8
-			public const int Widget_Material3_NavigationRailView_ActiveIndicator = 2131952584;
+			public const int Widget_Material3_NavigationView = 2131952584;
 			
 			// aapt resource value: 0x7F1303C9
-			public const int Widget_Material3_NavigationRailView_Badge = 2131952585;
+			public const int Widget_Material3_PopupMenu = 2131952585;
 			
 			// aapt resource value: 0x7F1303CA
-			public const int Widget_Material3_NavigationView = 2131952586;
+			public const int Widget_Material3_PopupMenu_ContextMenu = 2131952586;
 			
 			// aapt resource value: 0x7F1303CB
-			public const int Widget_Material3_PopupMenu = 2131952587;
+			public const int Widget_Material3_PopupMenu_ListPopupWindow = 2131952587;
 			
 			// aapt resource value: 0x7F1303CC
-			public const int Widget_Material3_PopupMenu_ContextMenu = 2131952588;
-			
-			// aapt resource value: 0x7F1303CD
-			public const int Widget_Material3_PopupMenu_ListPopupWindow = 2131952589;
-			
-			// aapt resource value: 0x7F1303CE
-			public const int Widget_Material3_PopupMenu_Overflow = 2131952590;
-			
-			// aapt resource value: 0x7F1303D1
-			public const int Widget_Material3_SearchBar = 2131952593;
-			
-			// aapt resource value: 0x7F1303D2
-			public const int Widget_Material3_SearchBar_Outlined = 2131952594;
-			
-			// aapt resource value: 0x7F1303D3
-			public const int Widget_Material3_SearchView = 2131952595;
-			
-			// aapt resource value: 0x7F1303D4
-			public const int Widget_Material3_SearchView_Prefix = 2131952596;
-			
-			// aapt resource value: 0x7F1303D5
-			public const int Widget_Material3_SearchView_Toolbar = 2131952597;
+			public const int Widget_Material3_PopupMenu_Overflow = 2131952588;
 			
 			// aapt resource value: 0x7F1303CF
-			public const int Widget_Material3_Search_ActionButton_Overflow = 2131952591;
+			public const int Widget_Material3_SearchBar = 2131952591;
 			
 			// aapt resource value: 0x7F1303D0
-			public const int Widget_Material3_Search_Toolbar_Button_Navigation = 2131952592;
+			public const int Widget_Material3_SearchBar_Outlined = 2131952592;
+			
+			// aapt resource value: 0x7F1303D1
+			public const int Widget_Material3_SearchView = 2131952593;
+			
+			// aapt resource value: 0x7F1303D2
+			public const int Widget_Material3_SearchView_Prefix = 2131952594;
+			
+			// aapt resource value: 0x7F1303D3
+			public const int Widget_Material3_SearchView_Toolbar = 2131952595;
+			
+			// aapt resource value: 0x7F1303CD
+			public const int Widget_Material3_Search_ActionButton_Overflow = 2131952589;
+			
+			// aapt resource value: 0x7F1303CE
+			public const int Widget_Material3_Search_Toolbar_Button_Navigation = 2131952590;
+			
+			// aapt resource value: 0x7F1303D4
+			public const int Widget_Material3_SideSheet = 2131952596;
+			
+			// aapt resource value: 0x7F1303D5
+			public const int Widget_Material3_SideSheet_Detached = 2131952597;
 			
 			// aapt resource value: 0x7F1303D6
-			public const int Widget_Material3_SideSheet = 2131952598;
+			public const int Widget_Material3_SideSheet_Modal = 2131952598;
 			
 			// aapt resource value: 0x7F1303D7
-			public const int Widget_Material3_SideSheet_Detached = 2131952599;
+			public const int Widget_Material3_SideSheet_Modal_Detached = 2131952599;
 			
 			// aapt resource value: 0x7F1303D8
-			public const int Widget_Material3_SideSheet_Modal = 2131952600;
+			public const int Widget_Material3_Slider = 2131952600;
 			
 			// aapt resource value: 0x7F1303D9
-			public const int Widget_Material3_SideSheet_Modal_Detached = 2131952601;
+			public const int Widget_Material3_Slider_Label = 2131952601;
 			
 			// aapt resource value: 0x7F1303DA
-			public const int Widget_Material3_Slider = 2131952602;
+			public const int Widget_Material3_Snackbar = 2131952602;
 			
 			// aapt resource value: 0x7F1303DB
-			public const int Widget_Material3_Slider_Label = 2131952603;
+			public const int Widget_Material3_Snackbar_FullWidth = 2131952603;
 			
 			// aapt resource value: 0x7F1303DC
-			public const int Widget_Material3_Snackbar = 2131952604;
+			public const int Widget_Material3_Snackbar_TextView = 2131952604;
 			
 			// aapt resource value: 0x7F1303DD
-			public const int Widget_Material3_Snackbar_FullWidth = 2131952605;
+			public const int Widget_Material3_TabLayout = 2131952605;
 			
 			// aapt resource value: 0x7F1303DE
-			public const int Widget_Material3_Snackbar_TextView = 2131952606;
+			public const int Widget_Material3_TabLayout_OnSurface = 2131952606;
 			
 			// aapt resource value: 0x7F1303DF
-			public const int Widget_Material3_TabLayout = 2131952607;
+			public const int Widget_Material3_TabLayout_Secondary = 2131952607;
 			
 			// aapt resource value: 0x7F1303E0
-			public const int Widget_Material3_TabLayout_OnSurface = 2131952608;
+			public const int Widget_Material3_TextInputEditText_FilledBox = 2131952608;
 			
 			// aapt resource value: 0x7F1303E1
-			public const int Widget_Material3_TabLayout_Secondary = 2131952609;
+			public const int Widget_Material3_TextInputEditText_FilledBox_Dense = 2131952609;
 			
 			// aapt resource value: 0x7F1303E2
-			public const int Widget_Material3_TextInputEditText_FilledBox = 2131952610;
+			public const int Widget_Material3_TextInputEditText_OutlinedBox = 2131952610;
 			
 			// aapt resource value: 0x7F1303E3
-			public const int Widget_Material3_TextInputEditText_FilledBox_Dense = 2131952611;
+			public const int Widget_Material3_TextInputEditText_OutlinedBox_Dense = 2131952611;
 			
 			// aapt resource value: 0x7F1303E4
-			public const int Widget_Material3_TextInputEditText_OutlinedBox = 2131952612;
+			public const int Widget_Material3_TextInputLayout_FilledBox = 2131952612;
 			
 			// aapt resource value: 0x7F1303E5
-			public const int Widget_Material3_TextInputEditText_OutlinedBox_Dense = 2131952613;
+			public const int Widget_Material3_TextInputLayout_FilledBox_Dense = 2131952613;
 			
 			// aapt resource value: 0x7F1303E6
-			public const int Widget_Material3_TextInputLayout_FilledBox = 2131952614;
+			public const int Widget_Material3_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu = 2131952614;
 			
 			// aapt resource value: 0x7F1303E7
-			public const int Widget_Material3_TextInputLayout_FilledBox_Dense = 2131952615;
+			public const int Widget_Material3_TextInputLayout_FilledBox_ExposedDropdownMenu = 2131952615;
 			
 			// aapt resource value: 0x7F1303E8
-			public const int Widget_Material3_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu = 2131952616;
+			public const int Widget_Material3_TextInputLayout_OutlinedBox = 2131952616;
 			
 			// aapt resource value: 0x7F1303E9
-			public const int Widget_Material3_TextInputLayout_FilledBox_ExposedDropdownMenu = 2131952617;
+			public const int Widget_Material3_TextInputLayout_OutlinedBox_Dense = 2131952617;
 			
 			// aapt resource value: 0x7F1303EA
-			public const int Widget_Material3_TextInputLayout_OutlinedBox = 2131952618;
+			public const int Widget_Material3_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu = 2131952618;
 			
 			// aapt resource value: 0x7F1303EB
-			public const int Widget_Material3_TextInputLayout_OutlinedBox_Dense = 2131952619;
+			public const int Widget_Material3_TextInputLayout_OutlinedBox_ExposedDropdownMenu = 2131952619;
 			
 			// aapt resource value: 0x7F1303EC
-			public const int Widget_Material3_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu = 2131952620;
+			public const int Widget_Material3_Toolbar = 2131952620;
 			
 			// aapt resource value: 0x7F1303ED
-			public const int Widget_Material3_TextInputLayout_OutlinedBox_ExposedDropdownMenu = 2131952621;
+			public const int Widget_Material3_Toolbar_OnSurface = 2131952621;
 			
 			// aapt resource value: 0x7F1303EE
-			public const int Widget_Material3_Toolbar = 2131952622;
+			public const int Widget_Material3_Toolbar_Surface = 2131952622;
 			
 			// aapt resource value: 0x7F1303EF
-			public const int Widget_Material3_Toolbar_OnSurface = 2131952623;
+			public const int Widget_Material3_Tooltip = 2131952623;
 			
 			// aapt resource value: 0x7F1303F0
-			public const int Widget_Material3_Toolbar_Surface = 2131952624;
+			public const int Widget_MaterialComponents_ActionBar_Primary = 2131952624;
 			
 			// aapt resource value: 0x7F1303F1
-			public const int Widget_Material3_Tooltip = 2131952625;
+			public const int Widget_MaterialComponents_ActionBar_PrimarySurface = 2131952625;
 			
 			// aapt resource value: 0x7F1303F2
-			public const int Widget_MaterialComponents_ActionBar_Primary = 2131952626;
+			public const int Widget_MaterialComponents_ActionBar_Solid = 2131952626;
 			
 			// aapt resource value: 0x7F1303F3
-			public const int Widget_MaterialComponents_ActionBar_PrimarySurface = 2131952627;
+			public const int Widget_MaterialComponents_ActionBar_Surface = 2131952627;
 			
 			// aapt resource value: 0x7F1303F4
-			public const int Widget_MaterialComponents_ActionBar_Solid = 2131952628;
+			public const int Widget_MaterialComponents_ActionMode = 2131952628;
 			
 			// aapt resource value: 0x7F1303F5
-			public const int Widget_MaterialComponents_ActionBar_Surface = 2131952629;
+			public const int Widget_MaterialComponents_AppBarLayout_Primary = 2131952629;
 			
 			// aapt resource value: 0x7F1303F6
-			public const int Widget_MaterialComponents_ActionMode = 2131952630;
+			public const int Widget_MaterialComponents_AppBarLayout_PrimarySurface = 2131952630;
 			
 			// aapt resource value: 0x7F1303F7
-			public const int Widget_MaterialComponents_AppBarLayout_Primary = 2131952631;
+			public const int Widget_MaterialComponents_AppBarLayout_Surface = 2131952631;
 			
 			// aapt resource value: 0x7F1303F8
-			public const int Widget_MaterialComponents_AppBarLayout_PrimarySurface = 2131952632;
+			public const int Widget_MaterialComponents_AutoCompleteTextView_FilledBox = 2131952632;
 			
 			// aapt resource value: 0x7F1303F9
-			public const int Widget_MaterialComponents_AppBarLayout_Surface = 2131952633;
+			public const int Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense = 2131952633;
 			
 			// aapt resource value: 0x7F1303FA
-			public const int Widget_MaterialComponents_AutoCompleteTextView_FilledBox = 2131952634;
+			public const int Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox = 2131952634;
 			
 			// aapt resource value: 0x7F1303FB
-			public const int Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense = 2131952635;
+			public const int Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense = 2131952635;
 			
 			// aapt resource value: 0x7F1303FC
-			public const int Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox = 2131952636;
+			public const int Widget_MaterialComponents_Badge = 2131952636;
 			
 			// aapt resource value: 0x7F1303FD
-			public const int Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense = 2131952637;
+			public const int Widget_MaterialComponents_BottomAppBar = 2131952637;
 			
 			// aapt resource value: 0x7F1303FE
-			public const int Widget_MaterialComponents_Badge = 2131952638;
+			public const int Widget_MaterialComponents_BottomAppBar_Colored = 2131952638;
 			
 			// aapt resource value: 0x7F1303FF
-			public const int Widget_MaterialComponents_BottomAppBar = 2131952639;
+			public const int Widget_MaterialComponents_BottomAppBar_PrimarySurface = 2131952639;
 			
 			// aapt resource value: 0x7F130400
-			public const int Widget_MaterialComponents_BottomAppBar_Colored = 2131952640;
+			public const int Widget_MaterialComponents_BottomNavigationView = 2131952640;
 			
 			// aapt resource value: 0x7F130401
-			public const int Widget_MaterialComponents_BottomAppBar_PrimarySurface = 2131952641;
+			public const int Widget_MaterialComponents_BottomNavigationView_Colored = 2131952641;
 			
 			// aapt resource value: 0x7F130402
-			public const int Widget_MaterialComponents_BottomNavigationView = 2131952642;
+			public const int Widget_MaterialComponents_BottomNavigationView_PrimarySurface = 2131952642;
 			
 			// aapt resource value: 0x7F130403
-			public const int Widget_MaterialComponents_BottomNavigationView_Colored = 2131952643;
+			public const int Widget_MaterialComponents_BottomSheet = 2131952643;
 			
 			// aapt resource value: 0x7F130404
-			public const int Widget_MaterialComponents_BottomNavigationView_PrimarySurface = 2131952644;
+			public const int Widget_MaterialComponents_BottomSheet_Modal = 2131952644;
 			
 			// aapt resource value: 0x7F130405
-			public const int Widget_MaterialComponents_BottomSheet = 2131952645;
+			public const int Widget_MaterialComponents_Button = 2131952645;
 			
 			// aapt resource value: 0x7F130406
-			public const int Widget_MaterialComponents_BottomSheet_Modal = 2131952646;
+			public const int Widget_MaterialComponents_Button_Icon = 2131952646;
 			
 			// aapt resource value: 0x7F130407
-			public const int Widget_MaterialComponents_Button = 2131952647;
+			public const int Widget_MaterialComponents_Button_OutlinedButton = 2131952647;
 			
 			// aapt resource value: 0x7F130408
-			public const int Widget_MaterialComponents_Button_Icon = 2131952648;
+			public const int Widget_MaterialComponents_Button_OutlinedButton_Icon = 2131952648;
 			
 			// aapt resource value: 0x7F130409
-			public const int Widget_MaterialComponents_Button_OutlinedButton = 2131952649;
+			public const int Widget_MaterialComponents_Button_TextButton = 2131952649;
 			
 			// aapt resource value: 0x7F13040A
-			public const int Widget_MaterialComponents_Button_OutlinedButton_Icon = 2131952650;
+			public const int Widget_MaterialComponents_Button_TextButton_Dialog = 2131952650;
 			
 			// aapt resource value: 0x7F13040B
-			public const int Widget_MaterialComponents_Button_TextButton = 2131952651;
+			public const int Widget_MaterialComponents_Button_TextButton_Dialog_Flush = 2131952651;
 			
 			// aapt resource value: 0x7F13040C
-			public const int Widget_MaterialComponents_Button_TextButton_Dialog = 2131952652;
+			public const int Widget_MaterialComponents_Button_TextButton_Dialog_Icon = 2131952652;
 			
 			// aapt resource value: 0x7F13040D
-			public const int Widget_MaterialComponents_Button_TextButton_Dialog_Flush = 2131952653;
+			public const int Widget_MaterialComponents_Button_TextButton_Icon = 2131952653;
 			
 			// aapt resource value: 0x7F13040E
-			public const int Widget_MaterialComponents_Button_TextButton_Dialog_Icon = 2131952654;
+			public const int Widget_MaterialComponents_Button_TextButton_Snackbar = 2131952654;
 			
 			// aapt resource value: 0x7F13040F
-			public const int Widget_MaterialComponents_Button_TextButton_Icon = 2131952655;
+			public const int Widget_MaterialComponents_Button_UnelevatedButton = 2131952655;
 			
 			// aapt resource value: 0x7F130410
-			public const int Widget_MaterialComponents_Button_TextButton_Snackbar = 2131952656;
+			public const int Widget_MaterialComponents_Button_UnelevatedButton_Icon = 2131952656;
 			
 			// aapt resource value: 0x7F130411
-			public const int Widget_MaterialComponents_Button_UnelevatedButton = 2131952657;
+			public const int Widget_MaterialComponents_CardView = 2131952657;
 			
 			// aapt resource value: 0x7F130412
-			public const int Widget_MaterialComponents_Button_UnelevatedButton_Icon = 2131952658;
-			
-			// aapt resource value: 0x7F130413
-			public const int Widget_MaterialComponents_CardView = 2131952659;
-			
-			// aapt resource value: 0x7F130414
-			public const int Widget_MaterialComponents_CheckedTextView = 2131952660;
-			
-			// aapt resource value: 0x7F130419
-			public const int Widget_MaterialComponents_ChipGroup = 2131952665;
-			
-			// aapt resource value: 0x7F130415
-			public const int Widget_MaterialComponents_Chip_Action = 2131952661;
-			
-			// aapt resource value: 0x7F130416
-			public const int Widget_MaterialComponents_Chip_Choice = 2131952662;
+			public const int Widget_MaterialComponents_CheckedTextView = 2131952658;
 			
 			// aapt resource value: 0x7F130417
-			public const int Widget_MaterialComponents_Chip_Entry = 2131952663;
+			public const int Widget_MaterialComponents_ChipGroup = 2131952663;
+			
+			// aapt resource value: 0x7F130413
+			public const int Widget_MaterialComponents_Chip_Action = 2131952659;
+			
+			// aapt resource value: 0x7F130414
+			public const int Widget_MaterialComponents_Chip_Choice = 2131952660;
+			
+			// aapt resource value: 0x7F130415
+			public const int Widget_MaterialComponents_Chip_Entry = 2131952661;
+			
+			// aapt resource value: 0x7F130416
+			public const int Widget_MaterialComponents_Chip_Filter = 2131952662;
 			
 			// aapt resource value: 0x7F130418
-			public const int Widget_MaterialComponents_Chip_Filter = 2131952664;
+			public const int Widget_MaterialComponents_CircularProgressIndicator = 2131952664;
+			
+			// aapt resource value: 0x7F130419
+			public const int Widget_MaterialComponents_CircularProgressIndicator_ExtraSmall = 2131952665;
 			
 			// aapt resource value: 0x7F13041A
-			public const int Widget_MaterialComponents_CircularProgressIndicator = 2131952666;
+			public const int Widget_MaterialComponents_CircularProgressIndicator_Medium = 2131952666;
 			
 			// aapt resource value: 0x7F13041B
-			public const int Widget_MaterialComponents_CircularProgressIndicator_ExtraSmall = 2131952667;
+			public const int Widget_MaterialComponents_CircularProgressIndicator_Small = 2131952667;
 			
 			// aapt resource value: 0x7F13041C
-			public const int Widget_MaterialComponents_CircularProgressIndicator_Medium = 2131952668;
+			public const int Widget_MaterialComponents_CollapsingToolbar = 2131952668;
 			
 			// aapt resource value: 0x7F13041D
-			public const int Widget_MaterialComponents_CircularProgressIndicator_Small = 2131952669;
+			public const int Widget_MaterialComponents_CompoundButton_CheckBox = 2131952669;
 			
 			// aapt resource value: 0x7F13041E
-			public const int Widget_MaterialComponents_CollapsingToolbar = 2131952670;
+			public const int Widget_MaterialComponents_CompoundButton_RadioButton = 2131952670;
 			
 			// aapt resource value: 0x7F13041F
-			public const int Widget_MaterialComponents_CompoundButton_CheckBox = 2131952671;
+			public const int Widget_MaterialComponents_CompoundButton_Switch = 2131952671;
 			
 			// aapt resource value: 0x7F130420
-			public const int Widget_MaterialComponents_CompoundButton_RadioButton = 2131952672;
+			public const int Widget_MaterialComponents_ExtendedFloatingActionButton = 2131952672;
 			
 			// aapt resource value: 0x7F130421
-			public const int Widget_MaterialComponents_CompoundButton_Switch = 2131952673;
+			public const int Widget_MaterialComponents_ExtendedFloatingActionButton_Icon = 2131952673;
 			
 			// aapt resource value: 0x7F130422
-			public const int Widget_MaterialComponents_ExtendedFloatingActionButton = 2131952674;
+			public const int Widget_MaterialComponents_FloatingActionButton = 2131952674;
 			
 			// aapt resource value: 0x7F130423
-			public const int Widget_MaterialComponents_ExtendedFloatingActionButton_Icon = 2131952675;
+			public const int Widget_MaterialComponents_Light_ActionBar_Solid = 2131952675;
 			
 			// aapt resource value: 0x7F130424
-			public const int Widget_MaterialComponents_FloatingActionButton = 2131952676;
+			public const int Widget_MaterialComponents_LinearProgressIndicator = 2131952676;
 			
 			// aapt resource value: 0x7F130425
-			public const int Widget_MaterialComponents_Light_ActionBar_Solid = 2131952677;
+			public const int Widget_MaterialComponents_MaterialButtonToggleGroup = 2131952677;
 			
 			// aapt resource value: 0x7F130426
-			public const int Widget_MaterialComponents_LinearProgressIndicator = 2131952678;
+			public const int Widget_MaterialComponents_MaterialCalendar = 2131952678;
 			
 			// aapt resource value: 0x7F130427
-			public const int Widget_MaterialComponents_MaterialButtonToggleGroup = 2131952679;
-			
-			// aapt resource value: 0x7F130428
-			public const int Widget_MaterialComponents_MaterialCalendar = 2131952680;
-			
-			// aapt resource value: 0x7F130429
-			public const int Widget_MaterialComponents_MaterialCalendar_Day = 2131952681;
-			
-			// aapt resource value: 0x7F13042D
-			public const int Widget_MaterialComponents_MaterialCalendar_DayOfWeekLabel = 2131952685;
-			
-			// aapt resource value: 0x7F13042E
-			public const int Widget_MaterialComponents_MaterialCalendar_DayTextView = 2131952686;
-			
-			// aapt resource value: 0x7F13042A
-			public const int Widget_MaterialComponents_MaterialCalendar_Day_Invalid = 2131952682;
+			public const int Widget_MaterialComponents_MaterialCalendar_Day = 2131952679;
 			
 			// aapt resource value: 0x7F13042B
-			public const int Widget_MaterialComponents_MaterialCalendar_Day_Selected = 2131952683;
+			public const int Widget_MaterialComponents_MaterialCalendar_DayOfWeekLabel = 2131952683;
 			
 			// aapt resource value: 0x7F13042C
-			public const int Widget_MaterialComponents_MaterialCalendar_Day_Today = 2131952684;
+			public const int Widget_MaterialComponents_MaterialCalendar_DayTextView = 2131952684;
+			
+			// aapt resource value: 0x7F130428
+			public const int Widget_MaterialComponents_MaterialCalendar_Day_Invalid = 2131952680;
+			
+			// aapt resource value: 0x7F130429
+			public const int Widget_MaterialComponents_MaterialCalendar_Day_Selected = 2131952681;
+			
+			// aapt resource value: 0x7F13042A
+			public const int Widget_MaterialComponents_MaterialCalendar_Day_Today = 2131952682;
+			
+			// aapt resource value: 0x7F13042D
+			public const int Widget_MaterialComponents_MaterialCalendar_Fullscreen = 2131952685;
+			
+			// aapt resource value: 0x7F13042E
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderCancelButton = 2131952686;
 			
 			// aapt resource value: 0x7F13042F
-			public const int Widget_MaterialComponents_MaterialCalendar_Fullscreen = 2131952687;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton = 2131952687;
 			
 			// aapt resource value: 0x7F130430
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderCancelButton = 2131952688;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderDivider = 2131952688;
 			
 			// aapt resource value: 0x7F130431
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton = 2131952689;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderLayout = 2131952689;
 			
 			// aapt resource value: 0x7F130432
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderDivider = 2131952690;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderLayout_Fullscreen = 2131952690;
 			
 			// aapt resource value: 0x7F130433
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderLayout = 2131952691;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderSelection = 2131952691;
 			
 			// aapt resource value: 0x7F130434
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderLayout_Fullscreen = 2131952692;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen = 2131952692;
 			
 			// aapt resource value: 0x7F130435
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderSelection = 2131952693;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderTitle = 2131952693;
 			
 			// aapt resource value: 0x7F130436
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen = 2131952694;
+			public const int Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton = 2131952694;
 			
 			// aapt resource value: 0x7F130437
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderTitle = 2131952695;
+			public const int Widget_MaterialComponents_MaterialCalendar_Item = 2131952695;
 			
 			// aapt resource value: 0x7F130438
-			public const int Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton = 2131952696;
+			public const int Widget_MaterialComponents_MaterialCalendar_MonthNavigationButton = 2131952696;
 			
 			// aapt resource value: 0x7F130439
-			public const int Widget_MaterialComponents_MaterialCalendar_Item = 2131952697;
+			public const int Widget_MaterialComponents_MaterialCalendar_MonthTextView = 2131952697;
 			
 			// aapt resource value: 0x7F13043A
-			public const int Widget_MaterialComponents_MaterialCalendar_MonthNavigationButton = 2131952698;
-			
-			// aapt resource value: 0x7F13043B
-			public const int Widget_MaterialComponents_MaterialCalendar_MonthTextView = 2131952699;
-			
-			// aapt resource value: 0x7F13043C
-			public const int Widget_MaterialComponents_MaterialCalendar_Year = 2131952700;
-			
-			// aapt resource value: 0x7F13043F
-			public const int Widget_MaterialComponents_MaterialCalendar_YearNavigationButton = 2131952703;
+			public const int Widget_MaterialComponents_MaterialCalendar_Year = 2131952698;
 			
 			// aapt resource value: 0x7F13043D
-			public const int Widget_MaterialComponents_MaterialCalendar_Year_Selected = 2131952701;
+			public const int Widget_MaterialComponents_MaterialCalendar_YearNavigationButton = 2131952701;
+			
+			// aapt resource value: 0x7F13043B
+			public const int Widget_MaterialComponents_MaterialCalendar_Year_Selected = 2131952699;
+			
+			// aapt resource value: 0x7F13043C
+			public const int Widget_MaterialComponents_MaterialCalendar_Year_Today = 2131952700;
 			
 			// aapt resource value: 0x7F13043E
-			public const int Widget_MaterialComponents_MaterialCalendar_Year_Today = 2131952702;
+			public const int Widget_MaterialComponents_MaterialDivider = 2131952702;
+			
+			// aapt resource value: 0x7F13043F
+			public const int Widget_MaterialComponents_NavigationRailView = 2131952703;
 			
 			// aapt resource value: 0x7F130440
-			public const int Widget_MaterialComponents_MaterialDivider = 2131952704;
+			public const int Widget_MaterialComponents_NavigationRailView_Colored = 2131952704;
 			
 			// aapt resource value: 0x7F130441
-			public const int Widget_MaterialComponents_NavigationRailView = 2131952705;
+			public const int Widget_MaterialComponents_NavigationRailView_Colored_Compact = 2131952705;
 			
 			// aapt resource value: 0x7F130442
-			public const int Widget_MaterialComponents_NavigationRailView_Colored = 2131952706;
+			public const int Widget_MaterialComponents_NavigationRailView_Compact = 2131952706;
 			
 			// aapt resource value: 0x7F130443
-			public const int Widget_MaterialComponents_NavigationRailView_Colored_Compact = 2131952707;
+			public const int Widget_MaterialComponents_NavigationRailView_PrimarySurface = 2131952707;
 			
 			// aapt resource value: 0x7F130444
-			public const int Widget_MaterialComponents_NavigationRailView_Compact = 2131952708;
+			public const int Widget_MaterialComponents_NavigationView = 2131952708;
 			
 			// aapt resource value: 0x7F130445
-			public const int Widget_MaterialComponents_NavigationRailView_PrimarySurface = 2131952709;
+			public const int Widget_MaterialComponents_PopupMenu = 2131952709;
 			
 			// aapt resource value: 0x7F130446
-			public const int Widget_MaterialComponents_NavigationView = 2131952710;
+			public const int Widget_MaterialComponents_PopupMenu_ContextMenu = 2131952710;
 			
 			// aapt resource value: 0x7F130447
-			public const int Widget_MaterialComponents_PopupMenu = 2131952711;
+			public const int Widget_MaterialComponents_PopupMenu_ListPopupWindow = 2131952711;
 			
 			// aapt resource value: 0x7F130448
-			public const int Widget_MaterialComponents_PopupMenu_ContextMenu = 2131952712;
+			public const int Widget_MaterialComponents_PopupMenu_Overflow = 2131952712;
 			
 			// aapt resource value: 0x7F130449
-			public const int Widget_MaterialComponents_PopupMenu_ListPopupWindow = 2131952713;
+			public const int Widget_MaterialComponents_ProgressIndicator = 2131952713;
 			
 			// aapt resource value: 0x7F13044A
-			public const int Widget_MaterialComponents_PopupMenu_Overflow = 2131952714;
+			public const int Widget_MaterialComponents_ShapeableImageView = 2131952714;
 			
 			// aapt resource value: 0x7F13044B
-			public const int Widget_MaterialComponents_ProgressIndicator = 2131952715;
+			public const int Widget_MaterialComponents_Slider = 2131952715;
 			
 			// aapt resource value: 0x7F13044C
-			public const int Widget_MaterialComponents_ShapeableImageView = 2131952716;
+			public const int Widget_MaterialComponents_Snackbar = 2131952716;
 			
 			// aapt resource value: 0x7F13044D
-			public const int Widget_MaterialComponents_Slider = 2131952717;
+			public const int Widget_MaterialComponents_Snackbar_FullWidth = 2131952717;
 			
 			// aapt resource value: 0x7F13044E
-			public const int Widget_MaterialComponents_Snackbar = 2131952718;
+			public const int Widget_MaterialComponents_Snackbar_TextView = 2131952718;
 			
 			// aapt resource value: 0x7F13044F
-			public const int Widget_MaterialComponents_Snackbar_FullWidth = 2131952719;
+			public const int Widget_MaterialComponents_TabLayout = 2131952719;
 			
 			// aapt resource value: 0x7F130450
-			public const int Widget_MaterialComponents_Snackbar_TextView = 2131952720;
+			public const int Widget_MaterialComponents_TabLayout_Colored = 2131952720;
 			
 			// aapt resource value: 0x7F130451
-			public const int Widget_MaterialComponents_TabLayout = 2131952721;
+			public const int Widget_MaterialComponents_TabLayout_PrimarySurface = 2131952721;
 			
 			// aapt resource value: 0x7F130452
-			public const int Widget_MaterialComponents_TabLayout_Colored = 2131952722;
+			public const int Widget_MaterialComponents_TextInputEditText_FilledBox = 2131952722;
 			
 			// aapt resource value: 0x7F130453
-			public const int Widget_MaterialComponents_TabLayout_PrimarySurface = 2131952723;
+			public const int Widget_MaterialComponents_TextInputEditText_FilledBox_Dense = 2131952723;
 			
 			// aapt resource value: 0x7F130454
-			public const int Widget_MaterialComponents_TextInputEditText_FilledBox = 2131952724;
+			public const int Widget_MaterialComponents_TextInputEditText_OutlinedBox = 2131952724;
 			
 			// aapt resource value: 0x7F130455
-			public const int Widget_MaterialComponents_TextInputEditText_FilledBox_Dense = 2131952725;
+			public const int Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense = 2131952725;
 			
 			// aapt resource value: 0x7F130456
-			public const int Widget_MaterialComponents_TextInputEditText_OutlinedBox = 2131952726;
+			public const int Widget_MaterialComponents_TextInputLayout_FilledBox = 2131952726;
 			
 			// aapt resource value: 0x7F130457
-			public const int Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense = 2131952727;
+			public const int Widget_MaterialComponents_TextInputLayout_FilledBox_Dense = 2131952727;
 			
 			// aapt resource value: 0x7F130458
-			public const int Widget_MaterialComponents_TextInputLayout_FilledBox = 2131952728;
+			public const int Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu = 2131952728;
 			
 			// aapt resource value: 0x7F130459
-			public const int Widget_MaterialComponents_TextInputLayout_FilledBox_Dense = 2131952729;
+			public const int Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu = 2131952729;
 			
 			// aapt resource value: 0x7F13045A
-			public const int Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu = 2131952730;
+			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox = 2131952730;
 			
 			// aapt resource value: 0x7F13045B
-			public const int Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu = 2131952731;
+			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense = 2131952731;
 			
 			// aapt resource value: 0x7F13045C
-			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox = 2131952732;
+			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu = 2131952732;
 			
 			// aapt resource value: 0x7F13045D
-			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense = 2131952733;
+			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu = 2131952733;
 			
 			// aapt resource value: 0x7F13045E
-			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu = 2131952734;
+			public const int Widget_MaterialComponents_TextView = 2131952734;
 			
 			// aapt resource value: 0x7F13045F
-			public const int Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu = 2131952735;
+			public const int Widget_MaterialComponents_TimePicker = 2131952735;
 			
 			// aapt resource value: 0x7F130460
-			public const int Widget_MaterialComponents_TextView = 2131952736;
+			public const int Widget_MaterialComponents_TimePicker_Button = 2131952736;
 			
 			// aapt resource value: 0x7F130461
-			public const int Widget_MaterialComponents_TimePicker = 2131952737;
+			public const int Widget_MaterialComponents_TimePicker_Clock = 2131952737;
 			
 			// aapt resource value: 0x7F130462
-			public const int Widget_MaterialComponents_TimePicker_Button = 2131952738;
+			public const int Widget_MaterialComponents_TimePicker_Display = 2131952738;
 			
 			// aapt resource value: 0x7F130463
-			public const int Widget_MaterialComponents_TimePicker_Clock = 2131952739;
+			public const int Widget_MaterialComponents_TimePicker_Display_Divider = 2131952739;
 			
 			// aapt resource value: 0x7F130464
-			public const int Widget_MaterialComponents_TimePicker_Display = 2131952740;
+			public const int Widget_MaterialComponents_TimePicker_Display_HelperText = 2131952740;
 			
 			// aapt resource value: 0x7F130465
-			public const int Widget_MaterialComponents_TimePicker_Display_Divider = 2131952741;
+			public const int Widget_MaterialComponents_TimePicker_Display_TextInputEditText = 2131952741;
 			
 			// aapt resource value: 0x7F130466
-			public const int Widget_MaterialComponents_TimePicker_Display_HelperText = 2131952742;
+			public const int Widget_MaterialComponents_TimePicker_Display_TextInputLayout = 2131952742;
 			
 			// aapt resource value: 0x7F130467
-			public const int Widget_MaterialComponents_TimePicker_Display_TextInputEditText = 2131952743;
+			public const int Widget_MaterialComponents_TimePicker_ImageButton = 2131952743;
 			
 			// aapt resource value: 0x7F130468
-			public const int Widget_MaterialComponents_TimePicker_Display_TextInputLayout = 2131952744;
+			public const int Widget_MaterialComponents_TimePicker_ImageButton_ShapeAppearance = 2131952744;
 			
 			// aapt resource value: 0x7F130469
-			public const int Widget_MaterialComponents_TimePicker_ImageButton = 2131952745;
+			public const int Widget_MaterialComponents_Toolbar = 2131952745;
 			
 			// aapt resource value: 0x7F13046A
-			public const int Widget_MaterialComponents_TimePicker_ImageButton_ShapeAppearance = 2131952746;
+			public const int Widget_MaterialComponents_Toolbar_Primary = 2131952746;
 			
 			// aapt resource value: 0x7F13046B
-			public const int Widget_MaterialComponents_Toolbar = 2131952747;
+			public const int Widget_MaterialComponents_Toolbar_PrimarySurface = 2131952747;
 			
 			// aapt resource value: 0x7F13046C
-			public const int Widget_MaterialComponents_Toolbar_Primary = 2131952748;
+			public const int Widget_MaterialComponents_Toolbar_Surface = 2131952748;
 			
 			// aapt resource value: 0x7F13046D
-			public const int Widget_MaterialComponents_Toolbar_PrimarySurface = 2131952749;
+			public const int Widget_MaterialComponents_Tooltip = 2131952749;
 			
 			// aapt resource value: 0x7F13046E
-			public const int Widget_MaterialComponents_Toolbar_Surface = 2131952750;
+			public const int Widget_Support_CoordinatorLayout = 2131952750;
 			
-			// aapt resource value: 0x7F13046F
-			public const int Widget_MaterialComponents_Tooltip = 2131952751;
-			
-			// aapt resource value: 0x7F130470
-			public const int Widget_Support_CoordinatorLayout = 2131952752;
-			
-			// aapt resource value: 0x7F130493
-			public const int zxing_CaptureTheme = 2131952787;
+			// aapt resource value: 0x7F130491
+			public const int zxing_CaptureTheme = 2131952785;
 			
 			static Style()
 			{
@@ -34695,13 +34141,7 @@
 			public const int image_share_filepaths = 2132082690;
 			
 			// aapt resource value: 0x7F150003
-			public const int jpush_file_paths = 2132082691;
-			
-			// aapt resource value: 0x7F150004
-			public const int network_security_config = 2132082692;
-			
-			// aapt resource value: 0x7F150005
-			public const int xamarin_essentials_fileprovider_file_paths = 2132082693;
+			public const int network_security_config = 2132082691;
 			
 			static Xml()
 			{
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 450ac81..0259c11 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -10,7 +10,6 @@
 using Android.Support.V4.Content;
 using CN.Jpush.Android.Api;
 //using Android.Widget;
-using Com.Hdl.ON.Jpush.Androidjpush;
 using HDL_ON;
 using Java.Util;
 using Shared;
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 9e8aee9..a981693 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -279,8 +279,6 @@
                     {
                         //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
                         ShowAlarmPushMessage(jpushMessageInfo, true);
-                        //钀ょ煶闂ㄩ攣鎺ㄩ��
-                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                     }
                     else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
                     {
@@ -331,24 +329,7 @@
                             //eSVideoInfo.Lc_Psk = json["cname"].ToString();
                             eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
                         }
-                        else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
-                        {
-                            //钀ょ煶鐚溂
-                            eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
-                            eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
-                            eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
-                            eSVideoInfo.spk = json["spk"].ToString();
-
-                            eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
-                            if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
-                            {
-                                eSVideoInfo.msgId = json["msgId"].ToString();
-                            }
-                            if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
-                            {
-                                eSVideoInfo.currentTime = json["currentTime"].ToString();
-                            }
-                        }
+                        
                         else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
                         {
                             try
@@ -405,13 +386,10 @@
                     else if (jpushMessageInfo.messageType == (PushMessageType.Prompt.ToString()))
                     {
                         ShowAlarmPushMessage(jpushMessageInfo, false);
-                        //钀ょ煶闂ㄩ攣鎺ㄩ��
-                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                     }
                     else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
                     {
                         //钀ょ煶闂ㄩ攣鎺ㄩ��
-                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                     }
 
                    
@@ -702,128 +680,5 @@
         }
 #endregion
 
-#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
-
-        /// <summary>
-        /// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
-        /// </summary>
-        /// <param name="bodyView"></param>
-        public void Go2EZvizMonitor(FrameLayout bodyView)
-        {
-            var waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
-            new Thread(() =>
-            {
-                try
-                {
-                    var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
-                    //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
-                    var result = new HttpServerRequest().EZGetChildToken();
-                    if (result.Code == StateCode.SUCCESS)
-                    {
-                        var ezChildAccessToken = result.Data.ToString();
-
-                        //var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString());
-                        Application.RunOnMainThread(() =>
-                        {
-                            if (!string.IsNullOrEmpty(ezChildAccessToken))
-                            {
-
-#if __IOS__
-
-                                //iOS
-                                //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
-                                EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
-                                //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
-                                EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
-                                EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
-                                //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
-                                EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
-
-                                //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
-                                //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
-
-                                //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
-                                //info.de
-                                //EZSDK.IOS.EZSDK.Play(info);
-
-                                //2023骞�03鏈�29鏃�13:08:35 淇敼
-                                Foundation.NSObject[] nSObject = new Foundation.NSObject[list.Count];
-                                for (int i = 0; i < list.Count; i++)
-                                {
-                                    string strValue = list[i];
-                                    nSObject[i] = new Foundation.NSString(strValue);
-                                }
-                                EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);
-
-
-
-#else
-                                //Android
-                                //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
-                                //2.璁剧疆钀ょ煶瀛愯处鍙风殑token
-                                //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
-                                ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
-                                {
-                                    if (b)
-                                    {
-                                        ((BaseActivity)Shared.Application.Activity).SetPermission(result =>
-                                        {
-                                            //2023骞�03鏈�29鏃�13:08:35 淇敼
-                                            Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
-                                            Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
-                                            //if (result)
-                                            //{
-                                            //    Android.Content.Intent intent = new Android.Content.Intent();
-                                            //    var bundle = new Android.OS.Bundle();
-                                            //    //浼犻�抧ame鍙傛暟涓簍inyphp
-                                            //    bundle.PutString("EzChildAccessToken", ezChildAccessToken);
-                                            //    bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
-                                            //    bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
-                                            //    bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
-                                            //    bundle.PutInt("Platform", 1);
-                                            //    bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
-                                            //    intent.PutExtras(bundle);
-                                            //    intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
-                                            //    Shared.Application.Activity.StartActivity(intent);
-                                            //}
-                                        }, "android.permission.RECORD_AUDIO");
-
-                                    }
-                                });
-#endif
-
-
-                            }
-
-                        });
-                    }
-                    else
-                    {
-                        if (result.Code != "-1")
-                            IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
-                    }
-                }
-                catch (Exception ex)
-                {
-                }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        if (waitPage != null)
-                        {
-                            waitPage.RemoveFromParent();
-                            waitPage = null;
-                        }
-                    });
-                }
-            })
-            { IsBackground = true }.Start();
-        }
-
-#endregion
     }
 }
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 88dfbdf..8441526 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -268,41 +268,6 @@
                 Shared.Application.Activity.StartActivity(intent);
 
             }
-            else if (interphoneType == InterphoneType.EZVIZ.ToString())
-            {
-                ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
-                {
-                    if (b)
-                    {
-                        intent = new Android.Content.Intent();
-                        var bundle = new Android.OS.Bundle();
-                        //浼犻�抧ame鍙傛暟涓簍inyphp
-                        bundle.PutString("EzChildAccessToken", mESVideoInfo.Lc_AccessToken);
-                        bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
-                        bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
-                        bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
-                        bundle.PutInt("Platform", 1);
-                        bundle.PutString("HomeId", mESVideoInfo.HomeId);
-                        bundle.PutString("DeviceSerial", mESVideoInfo.DeviceSerial);
-                        intent.PutExtras(bundle);
-                        //鑾峰彇钀ょ煶token锛屽垵濮嬪寲sdk
-                        var result = new HttpServerRequest().EZGetChildToken();
-                        if (result.Code == StateCode.SUCCESS)
-                        {
-                            var ezChildAccessToken = result.Data.ToString();
-
-                            Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
-
-                            Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,
-                                mESVideoInfo.Lc_DeviceId, mESVideoInfo.DeviceSerial, mESVideoInfo.spk, mESVideoInfo.msgId);
-                        }
-
-                        //intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
-                        //Shared.Application.Activity.StartActivity(intent);
-                    }
-                });
-                return;
-            }
             else if (interphoneType == InterphoneType.HDL.ToString())
             {
                 //HDL Linphone 鐙勮�愬厠
@@ -896,7 +861,7 @@
         /// <summary>
         /// 钀ょ煶鐚溂鍛煎彨
         /// </summary>
-        EZVIZ,
+        //EZVIZ,
         /// <summary>
         /// 鐙勮�愬厠 HDL Linphone
         /// </summary>
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 1f8b69d..ef43e8a 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -76,10 +76,7 @@
                                     ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                     ShowFunction.SecurityCenter,ShowFunction.Acst,
                                     ShowFunction.MechanicalArm ,
-                                    ShowFunction.SecurityMonitoring,
-                                    ShowFunction.VideoDoorLock,
                                     ShowFunction.Series,
-                                    ShowFunction.Aks,
                     };
                 }
                 return dddd;
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index a14796c..83cea42 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -164,7 +164,7 @@
         /// <summary>
         /// 瀹夐槻鐩戞帶
         /// </summary>
-        SecurityMonitoring = 0x20,
+        //SecurityMonitoring = 0x20,
         /// <summary>
         /// 鍙瀵硅
         /// </summary>
@@ -188,7 +188,7 @@
         /// <summary>
         /// 钀ょ煶瑙嗛闂ㄩ攣
         /// </summary>
-        VideoDoorLock = 0x26,
+        //VideoDoorLock = 0x26,
         /// <summary>
         /// 璺戦┈鐏紙搴忓垪锛�
         /// </summary>
@@ -196,7 +196,7 @@
         /// <summary>
         /// 褰遍煶涓帶
         /// </summary>
-        Aks = 0x28,
+        //Aks = 0x28,
 
 
     }
@@ -240,4 +240,28 @@
         Right,//00024=鍙�
         Down,//00025=涓�
     }
+
+    /// <summary>
+    /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
+    /// </summary>
+    public enum Comerom
+    {
+        function,//鍔熻兘
+        collect,//鏀惰棌
+        room,//鎴块棿
+        push,//鎺ㄩ��
+        sanfan,//娣诲姞绗笁鏂硅澶�
+    }
+
+    /// <summary>
+    /// 寮规绫诲瀷
+    /// </summary>
+    public enum TipType
+    {
+        none,//鏃犳彁绀�
+        flicker,//闂儊妗�
+        confirmation//纭妗�
+    }
+
+
 }
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 7bcc154..2a77f7e 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -458,7 +458,7 @@
         public bool online {
             get
             {
-                if (spk == SPK.AirSwitchP3|| spk == SPK.ElectricalTvHisense)
+                if (spk == SPK.AirSwitchP3)
                 {
                     return _online;
                 }
@@ -888,24 +888,24 @@
                 });
 
             }
-            else if (spk == SPK.ElectricalTvHisense)
-            {
-                list.Add(new FunctionAttributes
-                {
-                    key = FunctionAttributeKey.OnOff,
-                    curValue = string.Empty,
-                });
-                list.Add(new FunctionAttributes
-                {
-                    key = FunctionAttributeKey.SetVolume,
-                    curValue = string.Empty,
-                });
-                list.Add(new FunctionAttributes
-                {
-                    key = FunctionAttributeKey.Signal,
-                    curValue = string.Empty,
-                });
-            }
+            //else if (spk == SPK.ElectricalTvHisense)
+            //{
+            //    list.Add(new FunctionAttributes
+            //    {
+            //        key = FunctionAttributeKey.OnOff,
+            //        curValue = string.Empty,
+            //    });
+            //    list.Add(new FunctionAttributes
+            //    {
+            //        key = FunctionAttributeKey.SetVolume,
+            //        curValue = string.Empty,
+            //    });
+            //    list.Add(new FunctionAttributes
+            //    {
+            //        key = FunctionAttributeKey.Signal,
+            //        curValue = string.Empty,
+            //    });
+            //}
             else
             {
                 list.AddRange(attributes);
@@ -1781,51 +1781,51 @@
         /// <summary>
         /// 钀ょ煶瑙嗛闂ㄩ攣
         /// </summary>
-        public const string VideoDoorLock="security.door.ezviz";
+        //public const string VideoDoorLock="security.door.ezviz";
         /// <summary>
         /// 钀ょ煶鎽勫儚澶�
         /// </summary>
-        public const string Ev_Ipcam = "security.ipcam.ez";
+        //public const string Ev_Ipcam = "security.ipcam.ez";
         /// <summary>
         /// 褰遍煶涓帶
         /// </summary>
-        public const string AvZkAiks = "av.zk.aiks";
+        //public const string AvZkAiks = "av.zk.aiks";
        
         /// <summary>
         /// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
         /// </summary>
         /// <returns></returns>
-        public static List<string> GetVideoDoorLockSPKList()
-        {
-            var list = new List<string>();
-            list.Add(VideoDoorLock);
-            return list;
-        }
+        //public static List<string> GetVideoDoorLockSPKList()
+        //{
+        //    var list = new List<string>();
+        //    list.Add(VideoDoorLock);
+        //    return list;
+        //}
 
       
         /// <summary>
         /// 褰遍煶涓帶spk鍒楄〃
         /// </summary>
         /// <returns></returns>
-        public static List<string> GetVideoControlsSPKList()
-        {
-            var list = new List<string>
-            {
-                AvZkAiks
-            };
-            return list;
-        }
+        //public static List<string> GetVideoControlsSPKList()
+        //{
+        //    var list = new List<string>
+        //    {
+        //        AvZkAiks
+        //    };
+        //    return list;
+        //}
 
         /// <summary>
         /// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
         /// </summary>
         /// <returns></returns>
-        public static List<string> GetEvIpcamSPKList()
-        {
-            var list = new List<string>();
-            list.Add(Ev_Ipcam);
-            return list;
-        }
+        //public static List<string> GetEvIpcamSPKList()
+        //{
+        //    var list = new List<string>();
+        //    list.Add(Ev_Ipcam);
+        //    return list;
+        //}
 
         #region 鐏厜
         /// <summary>
@@ -2253,7 +2253,7 @@
         /// <summary>
         /// 娴蜂俊鐢佃
         /// </summary>
-        public const string ElectricalTvHisense = "electrical.tv.hisense";
+        //public const string ElectricalTvHisense = "electrical.tv.hisense";
         /// <summary>
         /// 瀹剁數銆佹彃搴�
         /// </summary>
@@ -2372,7 +2372,7 @@
             spkList.Add(ElectricTuyaWaterValve);
             spkList.Add(ElectricTuyaWaterValve2);
             spkList.Add(AirSwitch);
-            spkList.Add(ElectricalTvHisense);
+            //spkList.Add(ElectricalTvHisense);
             return spkList;
         }
 
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f91b737..f8d3798 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -174,25 +174,6 @@
             var spkList = SPK.GetDoorLockSPKList();
             return Functions.FindAll((obj) => spkList.Contains(obj.spk));
         }
-        /// <summary>
-        /// 鑾峰彇钀ょ煶瑙嗛闂ㄩ攣
-        /// </summary>
-        /// <returns></returns>
-        public List<Function> GetVideoDoorLockList()
-        {
-            var spkList = SPK.GetVideoDoorLockSPKList();
-            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰遍煶涓帶鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<Function> GetVideoControlsList()
-        {
-            var spkList = SPK.GetVideoControlsSPKList();
-            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
-        }
 
         /// <summary>
         /// 鏂伴鍒楄〃
@@ -559,6 +540,10 @@
         /// </summary>
         public void DeleteFunction(Function delTemp)
         {
+            if(delTemp == null)
+            {
+                return;
+            }
             Functions.Remove(Functions.Find((obj) => obj.deviceId == delTemp.deviceId));
             FileUtlis.Files.DeleteFile(delTemp.savePath);
         }
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 0e1d1cc..313fdbb 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -523,12 +523,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\A31UsbMusicList.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\CommonMethod.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\A31FlieList.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideDoorLockSend.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\StackTraceLog.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\ObjectClass.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\CommonMethod.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorLockPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorLockListPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\OrderFunctionPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\FaceManagementPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\DeliveryQrCodePage.cs" />
@@ -544,50 +538,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\ColorfulSettingPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\ColorfulInfoPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\GroupControlPage_V2.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockHistoryPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Scene\SetSceneRgbColorfulModePage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicSeriesSettingPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockUserManagerPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockUserListPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\UnlockSettingPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\UnlockSettingFacePage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockFaceUnlockTriggerSettingPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockFaceUnlockHelpPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockAudioSetupPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockBatteryManagementPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\2-Classification\SeriesFunctionListPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\AksListPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\AksCommonMethod.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\AksPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\ButtonFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\CornerFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\BaseFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\MenuFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\TypeSingleFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\TypeMultiFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\VerticalBoutonFLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\SxqPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\HorizontalFramLayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\YkPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\ImageFramlayout.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CollectPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\DetailPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\TvPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\JdhPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\MusicPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\GfPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\TyyPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\YkqPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\SendMethod.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\RemoteControlEntity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\SequencerEntity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\FilterCategoryEntity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\KeypadEntity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\MovieLibraryEntity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\MovieLibraryInfoEntity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\HisenseTV \HisenseTvPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\HisenseTV \Send.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\HisenseTV \HisenseTVFunctionalAttributeConstant.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\AirSwitchP3Page.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\AirSwitchP3EnergyPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\AirSwitchP3SubloopEnergyPage.cs" />
@@ -623,9 +576,5 @@
     <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Acst\" />
     <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\" />
     <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\" />
-    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\" />
-    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\" />
-    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\Entity\" />
-    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\HisenseTV \" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 89db532..0c6c555 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -124,7 +124,6 @@
             SPK.GroupControl,
             SPK.AvMusic,
             SPK.MusicStandard,
-            SPK.ElectricalTvHisense,
             SPK.OtherCommon,
             
         };
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index bfedba6..2b76d8a 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -3,7 +3,6 @@
 using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
 using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
 
 namespace HDL_ON.UI
 {
@@ -342,34 +341,6 @@
                             }
                         }
 #endif
-                        break;
-                    case SPK.VideoDoorLock: {
-                            //钀ょ煶瑙嗛闂ㄩ攣
-                            var form = new VideoDoorLockPage(function, btnName, btnFromFloor,comerom,action);
-                            MainPage.BasePageView.AddChidren(form);
-                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                            form.Show();
-                        }
-                        break;
-                    case SPK.AvZkAiks:
-                        {
-                            //褰遍煶涓帶
-                            var form = new UI2.FuntionControlView.Aks.AksPage(function, btnName, btnFromFloor, comerom, action);
-                            MainPage.BasePageView.AddChidren(form);
-                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                            form.Show();
-
-                        }
-                        break;
-                    case SPK.ElectricalTvHisense:
-                        {
-                            //娴蜂俊鐢佃
-                            var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor,btnCollectionIcon, comerom, action);
-                            MainPage.BasePageView.AddChidren(form);
-                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                            form.Show();
-
-                        }
                         break;
                 }
             };
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a89c424..b1bcab9 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -899,21 +899,7 @@
 
 
 #if DEBUG
-                var hesTv = new Function()
-                {
-                    sid = "hisense000000000001",
-                    deviceId = "hisense000000000001",
-                    name = "娴蜂俊鐢佃",
-                    spk = SPK.ElectricalTvHisense,
-
-                    roomIds = new List<string>() { "1405771024583090178" },
-                    attributes = new List<FunctionAttributes>()
-                    {
-                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "off" }, curValue="on",state = "on"   },
-                        new FunctionAttributes() { key = "wol",value =new List<string>(){ "on" }, curValue="on",state = "on"   },
-                    }
-                };
-                hesTv.SaveFunctionFile();
+               
 
 
                 var airSwitchP3 = new Function()
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 03de85a..e5c6ada 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1564,16 +1564,6 @@
                     btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                     btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                 }
-                else if (function.spk == SPK.VideoDoorLock)
-                {
-                    btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
-                    //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
-                }
-                else if (function.spk == SPK.AvZkAiks)
-                {
-                    //涓轰簡鍘绘帀寮�鍏虫寜閽�
-                    btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong1.png";
-                }
                 else if (function.spk == SPK.GroupControl)
                 {
                     btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1673,7 +1663,7 @@
                 };
 
 
-                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> {
+                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, Comerom.collect,()=> {
                     this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
                 });
                 view.MouseUpEventHandler = skipControlPageEvent;
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 0ed2008..54b3e98 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -4,9 +4,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using HDL_ON.DAL.Server;
-//#if DEBUG
-//using Xamarin.Essentials;
-//#endif
 namespace HDL_ON.UI
 {
     /// <summary>
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 59d643c..609c480 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -5,7 +5,6 @@
 using HDL_ON.Entity;
 using HDL_ON.UI;
 using HDL_ON.UI.CSS;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Shared;
@@ -716,7 +715,7 @@
                         #region 鐢靛櫒
 
                         functionCount = FunctionList.List.GetElectricals().Count;
-                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
+                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
 //#if DEBUG
 //                        functionCount = 1;
 //#endif
@@ -745,19 +744,7 @@
                         break;
                     case ShowFunction.Panel:
                         break;
-                    case ShowFunction.SecurityMonitoring:
-                        if (!MainPage.NoLoginMode)
-                        {
-                            if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
-                            {
-                                functionCount = 0;
-                            }
-                            else
-                            {
-                                functionCount = 1;
-                            }
-                        }
-                        break;
+                   
                     case ShowFunction.Sensor:
                         functionCount = FunctionList.List.GetArmSensorList().Count;
                         break;
@@ -774,25 +761,7 @@
                         functionCount = FunctionList.List.GetAcstParentList().Count;
                         functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                         break;
-                    case ShowFunction.VideoDoorLock:
-                        if (Common.ApiUtlis.Ins.hadInternet)
-                        {
-                            functionCount = FunctionList.List.GetVideoDoorLockList().Count;
-                            functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
-                                || obj.GetAttrState("status").ToString() == "normal_open").Count;
-                        }
-                        else
-                        {
-                            functionCount = 0;
-                        }
-                        break;
-                    case ShowFunction.Aks:
-                        functionCount = FunctionList.List.GetVideoControlsList().Count;
-                        functionOnCount = 1;
-                        break;
-
-
-
+                   
                 }
 
                 if (functionCount == 0)
@@ -848,12 +817,9 @@
 
                 //涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
                 Button btnFunctionCount=null;
-                if (item != ShowFunction.Aks
-                    && item != ShowFunction.VideoDoorLock
-                    && item != ShowFunction.Environmental
+                if ( item != ShowFunction.Environmental
                     && item != ShowFunction.Sensor
                     && item != ShowFunction.VideoIntercom
-                    && item != ShowFunction.SecurityMonitoring
                     && item != ShowFunction.FreshAir
                     && item != ShowFunction.Music
                     && item != ShowFunction.EnergyMonitoring
@@ -1144,13 +1110,6 @@
                     case ShowFunction.Panel:
                         btnName.TextID = StringId.Panel;
                         break;
-                    case ShowFunction.SecurityMonitoring:
-                        btnName.TextID = StringId.EZVIZ;
-                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
-                        {
-                            HDLCommon.Current.Go2EZvizMonitor(bodyView);
-                        };
-                        break;
                     case ShowFunction.Sensor:
                         btnName.TextID = StringId.Sensor;
                         functionPageTitleId = StringId.Sensor;
@@ -1218,42 +1177,12 @@
                             MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         };
                         break;
-                    case ShowFunction.VideoDoorLock:
-                        //钀ょ煶瑙嗛闂ㄩ攣
-                        btnName.TextID = StringId.yingshishipinmensuo;
-                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
-                        {
-                            var list =CommonMethod.Current.GetVideoDoorLockList();
-                            var form = new VideoDoorLockListPage(()=> {
-                                UpdateBottomView();
-                            });
-                            form.AddForm(list);
-                        };
-                        break;
-                    case ShowFunction.Aks:
-
-                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
-                        //鍩冨厠鏂奖闊充腑鎺�
-                        btnName.TextID = StringId.jiatingyingyuan;
-                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
-                        {
-                            var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
-                            var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
-                                UpdateBottomView();
-                            });
-                            form.AddForm(list);
-                        };
-                        break;
 
                 }
                 //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
-                if (item != ShowFunction.VideoDoorLock
-                     && item != ShowFunction.Aks
-                    && item != ShowFunction.Music
+                if (  item != ShowFunction.Music
                     && item != ShowFunction.Environmental
-                    && item != ShowFunction.SecurityMonitoring
                     && item != ShowFunction.DoorLock
-                    //&& ShowFunction.EnergyMonitoring != item
                     && ShowFunction.VideoIntercom != item
                     && ShowFunction.SecurityCenter != item
                     && ShowFunction.Series != item
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 80844c1..8da322e 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -269,15 +269,6 @@
             {
                 btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
             }
-            else if (function.spk == SPK.VideoDoorLock)
-            {
-                btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
-            }
-            else if (function.spk == SPK.AvZkAiks)
-            {
-                //闅愯棌寮�鍏虫寜閽�
-                btnIcon.UnSelectedImagePath = "AksIcon/aks.png";
-            }
             else if(function.spk == SPK.GroupControl) { }
             else if (function.spk == SPK.HvacCac)
             {
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 6a9bac7..32db921 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -418,7 +418,7 @@
             //    btnFromFloor.MouseUpEventHandler = handler;
             //    return;
             //}
-            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
+            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, Comerom.room,this.action);
             this.MouseUpEventHandler = eventHandler;
             btnName.MouseUpEventHandler = eventHandler;
             btnFromFloor.MouseUpEventHandler = eventHandler;
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index c1e7d38..06ae543 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -286,35 +286,6 @@
                                 functionListView.AddChidren(functionDiv);
 
                             }
-                            else if (function.spk == SPK.ElectricalTvHisense)
-                            {
-                                Action deviceDelAction = () =>
-                                {
-                                    //鍒犻櫎璁惧鎴愬姛鍚庢洿鏂癠I
-                                    if (functionListView==null) {
-                                        return;
-                                    }
-                                    functionListView.RemoveAll();
-                                    showList.Remove(function);//鍏堢Щ闄�
-                                    ShowFunctionRow(showList,isAppend);
-                                    this.DelAction?.Invoke();
-
-                                };
-                                var functionDiv = new FunctionControlZone(function, deviceDelAction) 
-                                {
-                                    Gravity = Gravity.CenterHorizontal,
-                                    Width = Application.GetRealWidth(343),
-                                    Height = Application.GetRealHeight(96),
-                                    Radius = (uint)Application.GetMinRealAverage(12),
-                                    BorderColor = 0x00FFFFFF,
-                                    BorderWidth = 1,
-                                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                                    Tag = function.spk + function.sid
-                                };
-                                functionDiv.LoadFunctionDiv();
-                                functionDiv.OrderEvent = OrderEvent;
-                                functionListView.AddChidren(functionDiv);
-                            }
                             else
                             {
                                 var functionDiv = new FunctionControlZone(function, null)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 7d2996e..6dbb73c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -2,7 +2,6 @@
 using Shared;
 using System.Collections.Generic;
 using HDL_ON.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 
 
 namespace HDL_ON.UI.UI2.Intelligence.Automation
@@ -757,24 +756,6 @@
                         }
                     }
                     break;
-                //钀ょ煶瑙嗛闂ㄩ攣
-                case SPK.VideoDoorLock:
-                    {
-                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
-                        view1.btnText.TextID=StringId.kaimenrenyuan;
-                        view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
-                        fLayout.AddChidren(view1.FLayoutView());
-                        view1.btnClick.MouseUpEventHandler += (sender, e) =>
-                        {
-                            this.identifier = "open_door";//寮�閿佷簨浠�
-                            this.VideoDoorLockAction(this, device, view1.btnState);
-                        };
-                        if (edit)
-                        {
-                            this.GetEditState(device, index, view1.btnState,null, null, null);
-                        }
-                    }
-                    break;
                     //鐚溂
                 case SPK.Peephole:
                     LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
@@ -792,24 +773,6 @@
                         this.GetEditState(device, index, viewPeephole.btnState, null, null, null);
                     }
                     break;
-                    //钀ょ煶鎽勫儚澶�
-                case SPK.Ev_Ipcam:
-                    LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
-                    viewEzIpcam.btnText.TextID = StringId.ActivityDetection;
-                    //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
-                    fLayout.AddChidren(viewEzIpcam.FLayoutView());
-                    viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
-                    {
-                        this.identifier = Constant.intelligentDetection_event;//浜轰綋鎰熷簲鍛婅
-                        this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1);
-
-                    };
-                    if (edit)
-                    {
-                        this.GetEditState(device, index, viewEzIpcam.btnState, null, null, null);
-                    }
-                    break;
-
             }
             #region  淇濆瓨
             ///淇濆瓨View
@@ -866,20 +829,6 @@
                     inputDevice.condition_type = "9";
                     inputDevice.identifier = this.identifier;
                     inputDevice.condition = new List<Dictionary<string, string>>();
-                }
-                else if(device.spk == SPK.Ev_Ipcam)
-                {
-                    //钀ょ煶鎽勫儚澶�-绉诲姩鐩戞祴鍛婅
-                    inputDevice.condition_type = "9";
-                    inputDevice.identifier = this.identifier;
-                    inputDevice.condition = new List<Dictionary<string, string>>();
-                }
-                else if (device.spk == SPK.VideoDoorLock)
-                {
-                    ////钀ょ煶瑙嗛闂ㄩ攣
-                    inputDevice.condition_type = "9";
-                    inputDevice.identifier = this.identifier;
-                    //inputDevice.condition = new List<Dictionary<string, string>>();
                 }
                 else if (device.spk == SPK.SensorPirHold)
                 {
@@ -1295,13 +1244,13 @@
             frame.AddChidren(loading);
             loading.Start();
 
-            CommonMethod.Current.SunThread(() =>
+            new System.Threading.Thread(() =>
             {
                 try
                 {
                     var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
 
-                    CommonMethod.Current.MainThread(() =>
+                    Application.RunOnMainThread(() =>
                     {
                         loading.Hide();
                         string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
@@ -1350,78 +1299,11 @@
                     });
                 }
 
-            });
+            })
+            { IsBackground = true}.Start();
 
         }
 
-        /// <summary>
-        /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤
-        /// </summary>
-        /// <param name="frame">褰撳墠鐣岄潰</param>
-        /// <param name="device">褰撳墠璁惧</param>
-        /// <param name="btnState">鏃х姸鎬�</param>
-        public void VideoDoorLockAction(FrameLayout frame, Entity.Function device, Button btnState)
-        {
-            selectedState = device.spk + "_";
-            Loading loading = new Loading();
-            frame.AddChidren(loading);
-            loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    var faceIdList = Send.Current.GetVideoDoorLockUserListInfo(device);
-                    CommonMethod.Current.MainThread(() =>
-                    {
-
-                        loading.Hide();
-                        string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
-                        PublicInterface publicInterface = new PublicInterface();
-                        publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
-                        {
-                            if (indexeList.Count > 0)
-                            {
-                                dicSateteList.Clear();
-                                string seleTxet = string.Empty;
-                                string tag = string.Empty;
-                                string[] array = new string[indexeList.Count];
-
-                                for (int i = 0; i < indexeList.Count; i++)
-                                {
-                                    if (i > faceIdList.Count)
-                                    {
-                                        continue;
-                                    }
-                                    var indexe = indexeList[i];
-                                    var face = faceIdList[indexe];
-                                    tag += face.userId;
-                                    tag += "_";
-                                    array[i] = face.userName;
-                                }
-                                seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
-                                //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
-                                AddDictionary("open_user",seleTxet, "string", "[]"); 
-                                //鐣岄潰鏄剧ず閫変腑鍊�
-                                btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(seleTxet);
-                                btnState.Tag = tag;
-                            }
-
-                        });
-
-                    });
-                }
-                catch { }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        loading.Hide();
-                    });
-                }
-
-            });
-
-        }
 
         /// <summary>
         /// 鏃堕棿鏂规硶
@@ -1496,12 +1378,6 @@
                     if (inputs.identifier == "pir_event")
                     {
                         button1.Text = Language.StringByID(StringId.shi );
-                    }
-                    break;
-                case SPK.Ev_Ipcam:
-                    if (inputs.identifier == Constant.intelligentDetection_event)
-                    {
-                        button1.Text = Language.StringByID(StringId.shi);
                     }
                     break;
             }
@@ -1627,7 +1503,7 @@
             {
                 return false;
             }
-            if (this.function.spk == SPK.VideoDoorLock ||
+            if (
                this.function.spk == SPK.doorgate
                 )
             {
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index b2ebfb6..486fd90 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -416,24 +416,6 @@
                                         }
                                     }
                                     break;
-                                case SPK.VideoDoorLock:
-                                    {
-                                        string userName = string.Empty;
-                                        string tag = string.Empty;
-                                        for (int b = 0; b < dicList.Count; b++)
-                                        {
-                                            var dic = dicList[b];
-                                            //var userId = dic["value"].ToString();
-                                            //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
-                                            //s += FaceItem.userName;
-                                            //s += ",";
-                                            //tag += FaceItem.userId;
-                                            //tag += "_";
-                                            userName = dic["value"].ToString();
-                                        }
-                                        inputView.btnState.Text = RemoveLastStr(userName);
-                                    }
-                                    break;
                                 case SPK.doorgate:
                                     {
 
@@ -483,12 +465,6 @@
                                             inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
                                         }
 
-                                    }
-                                    break;
-                                case SPK.Ev_Ipcam:
-                                    if (inputCondition.identifier == Constant.intelligentDetection_event)
-                                    {
-                                        inputView.btnState.Text = Language.StringByID(StringId.shi);
                                     }
                                     break;
                                 case SPK.Peephole:
@@ -1547,46 +1523,6 @@
 
                                     }
                                     break;
-                                case SPK.ElectricalTvHisense:
-                                    {
-                                        string on = GetKeyValue("wol", dicList);
-                                        string off = GetKeyValue("on_off", dicList);
-                                        string volumet = GetKeyValue("set_volume", dicList);
-                                        string signal = GetKeyValue("signal", dicList);
-
-                                        if (!string.IsNullOrEmpty(off))
-                                        {
-                                            stateStr = Language.StringByID(StringId.offLogic);
-                                            //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
-                                            break;
-                                        }
-
-                                        if (!string.IsNullOrEmpty(on))
-                                        {
-                                            stateStr = Language.StringByID(StringId.onLogic);
-                                        }
-                                        if (!string.IsNullOrEmpty(stateStr))
-                                        {
-                                            stateStr += ",";
-                                        }
-                                        if (!string.IsNullOrEmpty(volumet))
-                                        {
-                                            stateStr += Language.StringByID(StringId.yinliang) + volumet;
-                                        }
-
-                                        if (!string.IsNullOrEmpty(stateStr))
-                                        {
-                                            stateStr += ",";
-                                        }
-                                        if (!string.IsNullOrEmpty(signal))
-                                        {
-                                            var p = new PublicInterface();
-                                            string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
-                                            stateStr += key;
-                                        }
-                                        stateStr = stateStr.TrimEnd(',');
-                                    }
-                                    break;
                             }
                         }
                         break;
@@ -2497,26 +2433,6 @@
                         }
                     }
                     break;
-                case SPK.VideoDoorLock:
-                    {
-                        string userName = string.Empty;
-                        string tag = string.Empty;
-                        for (int b = 0; b < dicList.Count; b++)
-                        {
-                            var dic = dicList[b];
-                            //var userId = dic["value"].ToString();
-                            //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
-                            //s += FaceItem.userName;
-                            //s += ",";
-                            //tag += FaceItem.userId;
-                            //tag += "_";
-                            userName = dic["value"].ToString();
-
-                        }
-                        button1.Text = RemoveLastStr(userName);
-                        button1.Tag = tag;
-                    }
-                    break;
                 case SPK.MusicStandard:
                 case SPK.AvMusic:
                     {
@@ -2579,63 +2495,6 @@
                         catch { }
                     }
                     break;
-                case SPK.ElectricalTvHisense:
-                    {
-                        foreach (var dic in dicList)
-                        {
-                            string value = dic["value"];
-                            switch (dic["key"])
-                            {
-                                case "on_off":
-                                    {
-                                        if (value == "off")
-                                        {
-                                            button1.Text = Language.StringByID(StringId.offLogic);
-
-                                        }
-
-                                    }
-                                    break;
-                                case "wol":
-                                    {
-                                        if (value == "on")
-                                        {
-                                            button1.Text = Language.StringByID(StringId.onLogic);
-
-                                        }
-
-                                    }
-                                    break;
-
-                                case "set_volume":
-                                    {
-                                        if (button2 == null)
-                                        {
-                                            //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
-                                            break;
-                                        }
-                                        button2.Text = value;
-                                    }
-                                    break;
-                                case "signal":
-                                    {
-                                        if (button3 == null)
-                                        {
-                                            //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
-                                            break;
-                                        }
-                                        var p = new PublicInterface();
-                                        string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
-                                        button3.Text = key;
-                                    }
-                                    break;
-                            }
-
-                        }
-                    }
-                    break;
-
-
             }
         }
         /// <summary>
@@ -3162,7 +3021,6 @@
         {
             if (Send.Current.VideoDoorLockUserListInfo.Count == 0)
             {
-                Send.Current.GetVideoDoorLockUserListInfo(device);
             }
             var face = Send.Current.VideoDoorLockUserListInfo.Find((o) => { return o.userId == userId; });
             if (face == null)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 14b8c93..efdb8d6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -366,13 +366,9 @@
                 return "LogicIcon/sensor.png";
             }
             else if (SPK.DoorLock == device.spk
-                || SPK.VideoDoorLock == device.spk)
+                )
             {
                 return "FunctionIcon/DoorLock/DoorLock.png";
-            }
-            else if (SPK.ElectricalTvHisense == device.spk)
-            {
-                return "LogicIcon/electricaltvhisense.png";
             }
             return $"FunctionIcon/Icon/{device.IconName}.png";
 
@@ -476,7 +472,6 @@
             device.spk == SPK.AirSwitch
             || device.spk == SPK.PanelSocket
             || device.spk == SPK.ElectricSocket
-            || device.spk == SPK.ElectricalTvHisense
             );
             if (electric != null)
             {
@@ -484,7 +479,7 @@
             }
             ///闂ㄩ攣绫�
             var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock
-            || device.spk == SPK.VideoDoorLock);
+            );
             if (doorlock != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
@@ -510,7 +505,7 @@
             }
             ///鎽勫儚澶寸被
             var camera = deviceList.Find((device) =>
-            device.spk == SPK.IpCam_Imou || device.spk == SPK.Ev_Ipcam || device.spk == SPK.Peephole);
+            device.spk == SPK.IpCam_Imou || device.spk == SPK.Peephole);
             if (camera != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.shexiangtou));
@@ -608,13 +603,11 @@
                 functionTypeList.Add(SPK.AirSwitch);
                 functionTypeList.Add(SPK.PanelSocket);
                 functionTypeList.Add(SPK.ElectricSocket);
-                functionTypeList.Add(SPK.ElectricalTvHisense);
             }
             ///闂ㄩ攣绫�
             else if (deviceType == Language.StringByID(StringId.DoorLock))
             {
                 functionTypeList.Add(SPK.DoorLock);
-                functionTypeList.Add(SPK.VideoDoorLock);
             }
             ///闊充箰绫�
             else if (deviceType == Language.StringByID(StringId.Music))
@@ -636,7 +629,6 @@
             else if (deviceType == Language.StringByID(StringId.shexiangtou))
             {
                 functionTypeList.Add(SPK.IpCam_Imou);
-                functionTypeList.Add(SPK.Ev_Ipcam);
                 functionTypeList.Add(SPK.Peephole);
             }
             else
@@ -644,7 +636,6 @@
                 //鍏ㄩ儴鍖哄煙
                 functionTypeList.Add(SPK.GroupControl);
                 functionTypeList.Add(SPK.Peephole);
-                functionTypeList.Add(SPK.Ev_Ipcam);
                 functionTypeList.Add(SPK.LightSwitch);
                 functionTypeList.Add(SPK.LightDimming);
                 functionTypeList.Add(SPK.LightRGB);
@@ -698,10 +689,8 @@
                 functionTypeList.Add(SPK.MechanicalArm);
                 functionTypeList.Add(SPK.IpCam_Imou);
                 functionTypeList.Add(SPK.SensorPm10);
-                functionTypeList.Add(SPK.VideoDoorLock);
                 functionTypeList.Add(SPK.AcIr);
                 functionTypeList.Add(SPK.SensorPirHold);
-                functionTypeList.Add(SPK.ElectricalTvHisense);
                 functionTypeList.Add(SPK.SensorLight);
                 functionTypeList.Add(SPK.OtherCommon);
 
@@ -722,7 +711,6 @@
             {
                 case condition_if:
                     {
-                        deviceTypeList.Add(SPK.Ev_Ipcam);
                         deviceTypeList.Add(SPK.Peephole);
                         deviceTypeList.Add(SPK.LightSwitch);
                         deviceTypeList.Add(SPK.LightRGB);
@@ -765,7 +753,6 @@
                         deviceTypeList.Add(SPK.doorgate);
                         deviceTypeList.Add(SPK.IpCam_Imou);
                         deviceTypeList.Add(SPK.SensorPm10);
-                        deviceTypeList.Add(SPK.VideoDoorLock);
                         deviceTypeList.Add(SPK.AcIr);
                         deviceTypeList.Add(SPK.SensorPirHold);
                         deviceTypeList.Add(SPK.SensorLight);
@@ -794,7 +781,6 @@
                         deviceTypeList.Add(SPK.AvMusic);
                         deviceTypeList.Add(SPK.MechanicalArm);
                         deviceTypeList.Add(SPK.AcIr);
-                        deviceTypeList.Add(SPK.ElectricalTvHisense);
                         deviceTypeList.Add(SPK.OtherCommon);
                     }
                     break;
@@ -1175,7 +1161,6 @@
                     //  new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
                       new Entity.Function { sid = "123456789688889", name = "浜轰綋瀛樺湪浼犳劅鍣�", spk = Entity.SPK.SensorPirHold },
                       new Entity.Function { sid = "12345678968888", name = "娴嬭瘯鐚溂", spk = Entity.SPK.Peephole },
-                      new Entity.Function { sid = "12345678968889", name = "娴嬭瘯钀ょ煶鎽勫儚澶�", spk = Entity.SPK.Ev_Ipcam },
                       //  new Entity.Function { sid = "1234567897", name = "姣背娉紶鎰熷櫒1", spk = Entity.SPK.SenesorMegahealth2 },
                       // new Entity.Function { sid = "1234567899", name = "闂ㄧ浼犳劅鍣�", spk = Entity.SPK.SensorDoorWindow },
                       //  new Entity.Function { sid = "12345678991234", name = "HDL鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
@@ -1183,7 +1168,6 @@
                               new Entity.Function { sid = "12345678991234566844", name = "澶у崕鎽勫儚澶�", spk = Entity.SPK.IpCam_Imou },
                                  new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB },
                                   new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW },
-                                     new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃1",sid="123456789"},
             };
                 foreach (var function in functions)
                 {
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 97fb64a..608bc18 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -7,86 +7,6 @@
 {
     public class PublicInterface
     {
-
-        /// <summary>
-        /// 鍗曢�夋嫨
-        /// </summary>
-        /// <param name="frame">鏄剧ず鍦ㄥ摢涓晫闈㈢殑鐖舵帶浠�</param>
-        /// <param name="list">鏄剧ず鏁版嵁婧�</param>
-        /// <param name="titleText"></param>
-        /// <param name="stateText">涔嬪墠鐘舵�佹枃鏈�</param>
-        /// <param name="action">杩斿洖鍊�</param>
-        /// <param name="textSize">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
-        public void SingleSelectionShow(FrameLayout frame, List<FuntionControlView.Aks.Entity.RemoteControlEntity> list, string titleText, string stateText, Action<int> action, int textSize = LogicView.TextSize.text14)
-        {
-            if (list == null)
-            {
-                return;
-            }
-            FrameLayout frameLayout = new FrameLayout
-            {
-                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
-            };
-            frame.AddChidren(frameLayout);
-
-            LogicView.DateView view = new LogicView.DateView();
-            view.btnTitle.Text = titleText;
-            view.FLayoutView(frameLayout, list.Count);
-            view.btnCancel.MouseUpEventHandler += (sender, e) =>
-            {
-                //绉婚櫎fLayout鐣岄潰
-                frameLayout.RemoveFromParent();
-            };
-            ///瀹氫箟涓�涓狟tn璁板綍閫変腑鐘舵��
-            Button checkBtn = new Button
-            {
-                Tag = "unknown",
-            };
-            for (int i = 0; i < list.Count; i++)
-            {
-                FuntionControlView.Aks.Entity.RemoteControlEntity remoteControl = list[i];
-                LogicView.CheckView checkView = new LogicView.CheckView();
-                checkView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
-                checkView.btnText.TextSize = textSize;
-                view.frameLayout.AddChidren(checkView.FLayoutView());
-                checkView.btnText.Text = remoteControl.name;
-                checkView.btnClick.Tag = i;//鏍囪
-
-                if (stateText == remoteControl.name)
-                {
-                    //鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
-                    checkBtn.IsSelected = false;
-                    checkView.btnCheckIcon.IsSelected = true;
-                    checkBtn = checkView.btnCheckIcon;
-                    checkBtn.Tag = checkView.btnClick.Tag.ToString();
-                }
-                //鐐瑰嚮浜嬩欢
-                checkView.btnClick.MouseUpEventHandler += (sender1, e1) =>
-                {
-                    checkBtn.IsSelected = false;
-                    checkView.btnCheckIcon.IsSelected = true;
-                    checkBtn = checkView.btnCheckIcon;
-                    checkBtn.Tag = checkView.btnClick.Tag.ToString();
-                };
-
-            }
-            view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
-            {
-                if (checkBtn.Tag.ToString() == "unknown")
-                {
-                    return;
-                }
-                var index = int.Parse(checkBtn.Tag.ToString());
-                if (index > list.Count)
-                {
-                    index = 0;
-                }
-                action(index);
-                //绉婚櫎fLayout鐣岄潰
-                frameLayout.RemoveFromParent();
-            };
-
-        }
         /// <summary>
         /// 鍗曢�夋嫨
         /// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 8bf6a94..62b146d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -548,29 +548,6 @@
 
         }
 
-        /// <summary> 
-        ///  鑾峰彇闂ㄩ攣鐢ㄦ埛鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="deviceId">璁惧</param>
-        /// <returns></returns>
-        public List<Face> GetVideoDoorLockUserListInfo(Function device)
-        {
-            var userList = FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
-            List<Face> faceIdList = new List<Face>();
-            for (int i = 0; i < userList.Count; i++)
-            {
-                Face face = new Face();
-                var user = userList[i];
-                face.userId = user.extUserId;
-                face.userName = user.extUserName;
-                faceIdList.Add(face);
-            }
-            VideoDoorLockUserListInfo.Clear();
-            VideoDoorLockUserListInfo.AddRange(faceIdList);
-            return faceIdList;
-        }
-
-      
 
         /// <summary>
         ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� 
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 9a2e707..22bad8a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -863,83 +863,6 @@
                         #endregion
                     }
                     break;
-                //娴蜂俊鐢佃
-                case SPK.ElectricalTvHisense:
-                    {
-                        #region 鐣岄潰
-                        ///寮�鍏�
-                        LogicView.FunTypeView switchView = new LogicView.FunTypeView();
-                        switchView.btnText.TextID = StringId.switchLogic;
-                        fLayout.AddChidren(switchView.FLayoutView());
-                        ///闊抽噺
-                        LogicView.FunTypeView volView = new LogicView.FunTypeView();
-                        volView.frameLayout.Y = switchView.frameLayout.Bottom;
-                        volView.btnText.TextID = StringId.yinliang;
-                        fLayout.AddChidren(volView.FLayoutView());
-
-                        ///淇″彿婧�
-                        LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
-                        sourceView.frameLayout.Y = volView.frameLayout.Bottom;
-                        sourceView.btnText.TextID = StringId.xinhaoyuan;
-                        fLayout.AddChidren(sourceView.FLayoutView());
-
-                        ///璁惧寤舵椂iewv
-                        DelayView(fLayout, sourceView.frameLayout.Bottom);
-                        #endregion
-                        #region 鐐瑰嚮浜嬩欢
-                        ///寮�鍏崇偣鍑讳簨浠�
-                        switchView.btnClick.MouseUpEventHandler += (sender, e) =>
-                        {
-                            SwitchViewMethod(device, switchView.btnState, 2);
-                        };
-                        ///闊抽噺鐐瑰嚮浜嬩欢
-                        volView.btnClick.MouseUpEventHandler += (sender, e) =>
-                        {
-                            //selectedState = device.spk + "_volume";
-                            //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
-                            //{
-
-                            //    //鐣岄潰鏄剧ず閫変腑鍊�
-                            //    volView.btnState.Text = value;
-                            //    //鏁版嵁灏佽
-                            //    AddDictionary("setvolume", value);//闊抽噺
-                            //}, 0, 100);
-
-                            BrightnessMethod(device, volView.btnState, volView.btnText.Text);
-
-                        };
-
-                        ///淇″彿婧愮偣鍑讳簨浠�
-                        sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
-                        {
-                            ///涔嬪墠鐨勭姸鎬佹枃鏈�
-                            string currText = sourceView.btnState.Text;
-                            //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
-                            string key = "signal";
-                            selectedState = device.spk + "_" + key;
-                            PublicInterface pif = new PublicInterface();
-                            var dic = pif.GetHisenseSignalSourceDic();
-                            pif.SingleSelectionShow(this, dic.Keys.ToList(), Language.StringByID(StringId.xinhaoyuan), currText
-                               , (valueStr) =>
-                               {
-                                   //鐣岄潰鏄剧ず閫変腑鍊�
-                                   sourceView.btnState.Text = valueStr;
-                                   string value = pif.GetValue(dic, valueStr);
-                                   //鏁版嵁灏佽
-                                   AddDictionary(key, value);
-
-                               });
-                        };
-
-                        if (edit)
-                        {
-                            //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
-                            GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
-                        }
-
-                        #endregion
-                    }
-                    break;
 
             }
             #endregion
@@ -1178,15 +1101,6 @@
 
                         }
                         break;
-                    case SPK.ElectricalTvHisense:
-                        {
-                            if ("on" == value)
-                            {
-                                key = "wol";
-                            }
-
-                        }
-                        break;
                 }
 
                 //鏁版嵁灏佽
@@ -1235,11 +1149,6 @@
                                 //瑙掑害
                                 keyVlaue = "angle";
                             }
-                        }
-                        break;
-                    case SPK.ElectricalTvHisense:
-                        {
-                            keyVlaue = "set_volume";
                         }
                         break;
 
@@ -1373,20 +1282,6 @@
         /// <returns></returns>
         private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
         {
-
-            if (this.device.spk == SPK.ElectricalTvHisense)
-            {
-                //鐗规畩澶勭悊
-                if (key == "on_off")
-                {
-                    key = "wol";
-                }
-                else if (key == "wol")
-                {
-                    key = "on_off";
-                }
-
-            }
 
 
             int indexValue = -1;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 6232dd0..e0f5a35 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -195,33 +195,10 @@
                         }
                         else
                         {
-                            if (sceneFunction.localFunction.spk == SPK.ElectricalTvHisense)
+                            var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
+                            if (isHasColorful != null)
                             {
-                                for(int i = 0;i< sceneFunction.status.Count;i++)
-                                {
-                                    var tvState = sceneFunction.status[i];
-                                    if (tvState.key == FunctionAttributeKey.OnOff)
-                                    {
-                                        tvState.key = "wol";
-                                        tvState.value = "on";
-                                    }
-                                    else
-                                    {
-                                        if(string.IsNullOrEmpty( tvState.value))
-                                        {
-                                            sceneFunction.status.RemoveAt(i);
-                                            i--;
-                                        }
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
-                                if (isHasColorful != null)
-                                {
-                                    sceneFunction.status.Remove(isHasColorful);
-                                }
+                                sceneFunction.status.Remove(isHasColorful);
                             }
                         }
                     }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
index 227a159..0e92a6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -1,7 +1,6 @@
 锘縰sing System;
 using Shared;
 using HDL_ON.UI.CSS;
-//using Xamarin.Essentials;
 
 namespace HDL_ON.UI
 {
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index d801642..5ca6120 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -405,12 +405,6 @@
                             };
                             break;
                         case SPK.Peephole:
-                        case SPK.VideoDoorLock:
-                        case SPK.Ev_Ipcam:
-                            {
-                                //璺宠浆鍒癮ndroid,ios閭h竟鍘�
-                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk);
-                            }
                             break;
                     }
                 };
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 2bcf880..66da31c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -3,7 +3,6 @@
 using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 #if __Android__
 using Java.Interop;
 using Android.Content;
@@ -208,21 +207,6 @@
                                 contentView.BeginHeaderRefreshing();
                             };
                             break;
-                        case SPK.VideoDoorLock:
-                            {
-                                CommonMethod.Current.MainThread(() =>
-                                {
-                                    //钀ょ煶瑙嗛闂ㄩ攣
-                                    var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
-                                    {
-                                        row.RemoveFromParent();
-                                    });
-                                    MainPage.BasePageView.AddChidren(form);
-                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                                    form.Show();
-                                });
-                            }
-                            break;
                     }
                 };
 
@@ -373,10 +357,6 @@
         {
 
             if (function == null) return false;
-            if (function.spk == SPK.VideoDoorLock)
-            {
-                return false;
-            }
             return true;
 
         }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
index 3a6090b..4241f23 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
@@ -1,7 +1,6 @@
 锘縰sing System;
 using Shared;
 using HDL_ON.UI.CSS;
-//using Xamarin.Essentials;
 using HDL_ON.DAL.Server;
 
 namespace HDL_ON.UI
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
index 001bc82..0812656 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
@@ -1,7 +1,6 @@
 锘縰sing System;
 using HDL_ON.UI.CSS;
 using Shared;
-//using Xamarin.Essentials;
 
 namespace HDL_ON.UI
 {
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 9995fae..11ce006 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -250,7 +250,6 @@
                                 }
                             }) { IsBackground = true }.Start();
                             
-                            HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
                         };
                     }
                     dialog.Show();
@@ -458,7 +457,6 @@
                         }
                     })
                     { IsBackground = true }.Start();
-                    HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
                 };
             }
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
deleted file mode 100644
index 8fcd678..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
+++ /dev/null
@@ -1,455 +0,0 @@
-锘縰sing System;
-using HDL_ON.Entity;
-using System.Collections.Generic;
-using Shared;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 褰遍煶涓帶灞忓叕鍏辨柟娉曠被
-    /// </summary>
-    public class AksCommonMethod
-    {
-      
-
-        private static AksCommonMethod commonMethod = null;
-        /// <summary>
-        /// 鑾峰彇瀵硅薄F
-        /// </summary>
-        public static AksCommonMethod Current
-        {
-            get
-            {
-                if (commonMethod == null)
-                {
-                    commonMethod = new AksCommonMethod();
-                }
-
-                return commonMethod;
-
-            }
-
-        }
-        /// <summary>
-        /// 娓呯┖鎵�鏈夌紦瀛樻暟鎹�
-        /// </summary>
-        public void ClearData()
-        {
-            movieLibraryInfoEntities.Clear();
-            CollectList.Clear();
-        }
-        /// <summary>
-        /// 褰辩墖璇︽儏鍒楄〃
-        /// </summary>
-        public Dictionary<string, MovieLibraryInfoEntity> movieLibraryInfoEntities = new Dictionary<string, MovieLibraryInfoEntity>();
-        /// <summary>
-        /// 鏀惰棌褰辩墖璇︽儏鍒楄〃
-        /// </summary>
-        public List<MovieLibrary> CollectList = new List<MovieLibrary>();
-        /// <summary>
-        /// 娣诲姞褰辩墖璇︽儏缂撳瓨
-        /// </summary>
-        /// <param name="movieLibraryInfo"></param>
-        public void AddMovieLibraryInfo(MovieLibraryInfoEntity movieLibraryInfo)
-        {
-            if (movieLibraryInfo == null)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(movieLibraryInfo.rcId) && string.IsNullOrEmpty(movieLibraryInfo.movieId))
-            {
-                return;
-            }
-            string key = movieLibraryInfo.rcId + "_" + movieLibraryInfo.movieId;
-
-            if (movieLibraryInfoEntities.ContainsKey(key))
-            {
-                movieLibraryInfoEntities.Remove(key);
-            }
-            movieLibraryInfoEntities.Add(key, movieLibraryInfo);
-        }
-        /// <summary>
-        /// 鍒犻櫎褰辩墖璇︽儏缂撳瓨
-        /// </summary>
-        /// <param name="key"></param>
-        public bool DelMovieLibraryInfo(string key)
-        {
-            if (movieLibraryInfoEntities.ContainsKey(key))
-            {
-                return movieLibraryInfoEntities.Remove(key);
-            }
-            return true;
-        }
-        /// <summary>
-        /// 浠庣紦瀛樿幏鍙栧奖鐗囪鎯�
-        /// </summary>
-        /// <param name="key">瑙勫垯:rcId_movieId(閬ユ帶鍣╥d_褰辩墖id)</param>
-        /// <returns>涓嶅瓨鍦ㄨ繑鍥瀗ull</returns>
-        public MovieLibraryInfoEntity GetMovieLibraryInfo(string key)
-        {
-            if (string.IsNullOrEmpty(key))
-            {
-                return null;
-            }
-            foreach (var dic in movieLibraryInfoEntities)
-            {
-                if (dic.Key == key)
-                {
-                    return dic.Value;
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// 娣诲姞鏀惰棌褰辩墖
-        /// </summary>
-        /// <param name="movieLibraryInfo"></param>
-        public void AddCollectMovie(MovieLibrary movieLibrary)
-        {
-            if (movieLibrary == null)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(movieLibrary.movieId))
-            {
-                return;
-            }
-            if (CollectList.Count == 0)
-            {
-                CollectList.Add(movieLibrary);
-                return;
-            }
-            for (int i = 0; i < CollectList.Count; i++)
-            {
-                if (CollectList[i].movieId == movieLibrary.movieId)
-                {
-                    CollectList.RemoveAt(i);
-                    CollectList.Insert(i, movieLibrary);
-                }
-
-            }
-        }
-        /// <summary>
-        /// 鍒犻櫎娣诲姞鏀惰棌褰辩墖
-        /// </summary>
-        /// <param name="key"></param>
-        public bool DelCollectMovie(MovieLibrary movieLibrary)
-        {
-            if (movieLibrary == null)
-            {
-                return false;
-            }
-            if (string.IsNullOrEmpty(movieLibrary.movieId))
-            {
-                return false;
-            }
-
-            for (int i = 0; i < CollectList.Count; i++)
-            {
-                if (CollectList[i].movieId == movieLibrary.movieId)
-                {
-                    CollectList.RemoveAt(i);
-                    break;
-                }
-
-            }
-            return true;
-        }
-
-
-
-
-        /// <summary>
-        /// 鑾峰彇褰遍煶涓帶灞忓垪琛�
-        /// </summary>
-        /// <returns></returns>
-        public List<Function> GetVideoControlsList()
-        {
-            var list = FunctionList.List.GetVideoControlsList();
-#if DEBUG
-            //list.Add(new Function { name = "褰遍煶涓帶灞忎竴", sid = "11111111", spk = SPK.AvZkAiks });
-            //list.Add(new Function { name = "褰遍煶涓帶灞忎簩", sid = "22222222", spk = SPK.AvZkAiks });
-#endif
-            return list;
-        }
-
-
-        /// <summary>
-        /// 鑾峰彇銆愰煶涔愩�戦仴鎺у櫒鎸夐敭鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetMusicKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
-            keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
-            keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan.png" });
-            keypads.Add(new KeypadEntity { keypad = "return", name = "杩斿洖", localIconAddress = $"{aksIcon}fanhui.png" });
-            keypads.Add(new KeypadEntity { keypad = "sound_channel", name = "澹伴亾", localIconAddress = $"{aksIcon}shengdao.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}jingyin.png" });
-            keypads.Add(new KeypadEntity { keypad = "part_up", name = "涓婁竴閮�", localIconAddress = $"{aksIcon}shangyibu.png" });
-            keypads.Add(new KeypadEntity { keypad = "part_down", name = "涓嬩竴閮�", localIconAddress = $"{aksIcon}xiayibu.png" });
-            keypads.Add(new KeypadEntity { keypad = "fast_rewind", name = "蹇��", localIconAddress = $"{aksIcon}kauitui.png" });
-            keypads.Add(new KeypadEntity { keypad = "fast_forward", name = "蹇繘", localIconAddress = $"{aksIcon}kuaijin.png" });
-            keypads.Add(new KeypadEntity { keypad = "stop", name = "鍋滄", localIconAddress = $"{aksIcon}tingzhi.png" });
-            keypads.Add(new KeypadEntity { keypad = "pause", name = "鏆傚仠", localIconAddress = $"{aksIcon}zanting.png" });
-            keypads.Add(new KeypadEntity { keypad = "play", name = "鎾斁", localIconAddress = $"{aksIcon}bofang.png" });
-            keypads.Add(new KeypadEntity { keypad = "in_out_warehouse", name = "杩涘嚭浠�", localIconAddress = $"{aksIcon}jinchucang.png" });
-            keypads.Add(new KeypadEntity { keypad = "subtitle", name = "瀛楀箷", localIconAddress = $"{aksIcon}zimu.png" });
-            //keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang.png" });
-            //keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia.png" });
-            //keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo.png" });
-            //keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you.png" });
-            //keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-        }
-        /// <summary>
-        /// 鑾峰彇銆愬姛鏀俱�戦仴鎺у櫒鎸夐敭鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetGFKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
-            keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_1", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-        }
-
-        /// <summary>
-        /// 鑾峰彇銆愭姇褰变华銆戦仴鎺у櫒鎸夐敭鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetTYYKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
-            keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
-            keypads.Add(new KeypadEntity { keypad = "signal_source", name = "淇″彿婧�", localIconAddress = $"{aksIcon}xinhaoyuan.png" });
-            keypads.Add(new KeypadEntity { keypad = "curtain_up", name = "骞曞竷鍗�", localIconAddress = $"{aksIcon}mubusheng.png" });
-            keypads.Add(new KeypadEntity { keypad = "curtain_down", name = "骞曞竷闄�", localIconAddress = $"{aksIcon}mubujiang.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_1", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan.png" });
-            keypads.Add(new KeypadEntity { keypad = "return", name = "杩斿洖", localIconAddress = $"{aksIcon}fanhui.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-        }
-
-
-        /// <summary>
-        /// 鑾峰彇銆愮數瑙嗐�戦仴鎺у櫒鎸夐敭鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetTvKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
-            keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
-            keypads.Add(new KeypadEntity { keypad = "signal_source", name = "淇″彿婧�", localIconAddress = $"{aksIcon}xinhaoyuan.png" });
-            keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}jingyin.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan.png" });
-            keypads.Add(new KeypadEntity { keypad = "return", name = "杩斿洖", localIconAddress = $"{aksIcon}fanhui.png" });
-            keypads.Add(new KeypadEntity { keypad = "look_back", name = "鍥炵湅", localIconAddress = $"{aksIcon}huikan.png" });
-            keypads.Add(new KeypadEntity { keypad = "cancel", name = "鍙栨秷", localIconAddress = $"{aksIcon}quxiao.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-
-        }
-
-
-        /// <summary>
-        /// 鑾峰彇銆愭満椤剁洅銆戦仴鎺у櫒鎸夐敭鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetJdhKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
-            keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
-            keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan.png" });
-            keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}jingyin.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "look_back", name = "鍥炵湅", localIconAddress = $"{aksIcon}huikan.png" });
-            keypads.Add(new KeypadEntity { keypad = "cancel", name = "鍙栨秷", localIconAddress = $"{aksIcon}quxiao.png" });
-            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_up", name = "鍔熸斁闊抽噺 +", localIconAddress = $"{aksIcon}gfyingliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_down", name = "鍔熸斁闊抽噺 -", localIconAddress = $"{aksIcon}gfyingliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-
-        }
-
-        /// <summary>
-        /// 鑾峰彇銆愯嚜瀹氫箟銆戦仴鎺у櫒鎸夐敭鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetZdiKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "on_off", name = "寮�/鍏�", localIconAddress = $"{aksIcon}kai.png" });
-            keypads.Add(new KeypadEntity { keypad = "info", name = "淇℃伅", localIconAddress = $"{aksIcon}guan.png" });
-            keypads.Add(new KeypadEntity { keypad = "collect", name = "鏀惰棌", localIconAddress = $"{aksIcon}caidan.png" });
-            keypads.Add(new KeypadEntity { keypad = "movie", name = "鐢靛奖", localIconAddress = $"{aksIcon}jingyin.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "recreation", name = "濞变箰", localIconAddress = $"{aksIcon}huikan.png" });
-            keypads.Add(new KeypadEntity { keypad = "tv", name = "鐢佃", localIconAddress = $"{aksIcon}quxiao.png" });
-            keypads.Add(new KeypadEntity { keypad = "red", name = "绾㈡寜閿�", localIconAddress = $"{aksIcon}gfyingliangjia.png" });
-            keypads.Add(new KeypadEntity { keypad = "yellow", name = "榛勬寜閿�", localIconAddress = $"{aksIcon}gf_ingliangjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "blue", name = "钃濇寜閿�", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
-            keypads.Add(new KeypadEntity { keypad = "number_1", name = "1" });
-            keypads.Add(new KeypadEntity { keypad = "number_2", name = "2" });
-            keypads.Add(new KeypadEntity { keypad = "number_3", name = "3" });
-            keypads.Add(new KeypadEntity { keypad = "number_4", name = "4" });
-            keypads.Add(new KeypadEntity { keypad = "number_5", name = "5" });
-            keypads.Add(new KeypadEntity { keypad = "number_6", name = "6" });
-            keypads.Add(new KeypadEntity { keypad = "number_7", name = "7" });
-            keypads.Add(new KeypadEntity { keypad = "number_8", name = "8" });
-            keypads.Add(new KeypadEntity { keypad = "number_9", name = "9" });
-            keypads.Add(new KeypadEntity { keypad = "audio_track", name = "闊宠建", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "subtitle", name = "瀛楀箷", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "main", name = "涓荤晫闈�", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "home", name = "涓婚〉", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "ch_up", name = "棰戦亾+", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "ch_down", name = "棰戦亾-", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "look_back", name = "鍥炵湅", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "cancel", name = "鍙栨秷", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok.png" });
-            keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟" });
-            keypads.Add(new KeypadEntity { keypad = "part_up", name = "涓婁竴閮�" });
-            keypads.Add(new KeypadEntity { keypad = "part_down", name = "涓嬩竴閮�" });
-            keypads.Add(new KeypadEntity { keypad = "fast_rewind", name = "蹇��" });
-            keypads.Add(new KeypadEntity { keypad = "fast_forward", name = "蹇繘" });
-            keypads.Add(new KeypadEntity { keypad = "stop", name = "鍋滄" });
-            keypads.Add(new KeypadEntity { keypad = "pause", name = "鏆傚仠", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "play", name = "鎾斁", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "lamp", name = "鐏厜1", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            keypads.Add(new KeypadEntity { keypad = "lamp_plc", name = "鐏厜2", localIconAddress = $"{aksIcon}zdyanjian.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-        }
-
-
-        /// <summary>
-        /// 鑾峰彇銆愭暟瀛椼�戞寜閿垪琛�
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetNumberKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            keypads.Add(new KeypadEntity { keypad = "number_1", name = "1" });
-            keypads.Add(new KeypadEntity { keypad = "number_2", name = "2" });
-            keypads.Add(new KeypadEntity { keypad = "number_3", name = "3" });
-            keypads.Add(new KeypadEntity { keypad = "ch_up", name = Language.StringByID(StringId.pindaojia) });
-            keypads.Add(new KeypadEntity { keypad = "number_4", name = "4" });
-            keypads.Add(new KeypadEntity { keypad = "number_5", name = "5" });
-            keypads.Add(new KeypadEntity { keypad = "number_6", name = "6" });
-            keypads.Add(new KeypadEntity { keypad = "ch_down", name = Language.StringByID(StringId.pindaojian) });
-            keypads.Add(new KeypadEntity { keypad = "number_7", name = "7" });
-            keypads.Add(new KeypadEntity { keypad = "number_8", name = "8" });
-            keypads.Add(new KeypadEntity { keypad = "number_9", name = "9" });
-            keypads.Add(new KeypadEntity { keypad = "number_continuous", name = "-/--" });
-            keypads.Add(new KeypadEntity { keypad = "none", name = "" });//杩欎釜鏄负浜嗗崰浣嶇疆
-            keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-        }
-
-        /// <summary>
-        /// 鑾峰彇銆愯彍鍗曘�戞寜閿垪琛�
-        /// </summary>
-        /// <returns></returns>
-        public List<KeypadEntity> GetMenuKeypadList(RemoteControlEntity remoteControlEntity)
-        {
-            List<KeypadEntity> keypads = new List<KeypadEntity>();
-            string aksIcon = "AksIcon/";
-            keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you.png" });
-            keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok.png" });
-            this.CheckKeyIsClick(remoteControlEntity, keypads);
-            return keypads;
-        }
-
-        /// <summary>
-        /// 妫�鏌ユ槸鍚︽敮鎸佹寜閿偣鍑�
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄨ澶�</param>
-        /// <param name="keypads">鑷畾涔夋寜閿垪琛�</param>
-        private void CheckKeyIsClick(RemoteControlEntity remoteControlEntity, List<KeypadEntity> keypads)
-        {
-            if (remoteControlEntity == null)
-            {
-                return;
-            }
-
-            for (int i = 0; i < keypads.Count; i++)
-            {
-                var keypad = keypads[i];
-                if (keypad.keypad == "none")
-                {
-                    //鐗规畩鐨�
-                    continue;
-                }
-                var findkeypad = remoteControlEntity.keypads.Find((o) => o.keypad == keypad.keypad);
-                if (findkeypad == null)
-                {
-                    keypad.isClicked = false;
-                }
-                else
-                {
-                    keypad.isClicked = true;
-                }
-            }
-
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
deleted file mode 100644
index 70fa9ff..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Entity;
-using HDL_ON.Stan;
-using HDL_ON.UI.CSS;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 褰遍煶涓帶鍒楄〃鐣岄潰
-    /// </summary>
-    public class AksListPage : EditorCommonForm
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-
-        /// <summary>
-        /// 褰遍煶涓帶璁惧鍒楄〃
-        /// </summary>
-        private List<Function> listDevice = new List<Function>();
-        /// <summary>
-        /// 鐢垫睜鎺т欢鍒楄〃(key:璁惧鐨剆id)
-        /// </summary>
-        private Dictionary<string, BatteryPersentControl> dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
-        /// <summary>
-        /// 鍒楄〃鎺т欢
-        /// </summary>
-        private VerticalListControl listView = null;
-        /// <summary>
-        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
-        /// </summary>
-        public Action action;
-
-
-        #endregion
-
-        #region 鈻� 鍒濆鍖朹____________________________
-
-        public AksListPage(Action action)
-        {
-            this.action = action;
-        }
-
-
-        /// <summary>
-        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
-        /// </summary>
-        /// <param name="i_listDevice">闂ㄩ攣璁惧鍒楄〃</param>
-        public void ShowForm(List<Function> i_listDevice)
-        {
-            this.listDevice.AddRange(i_listDevice);
-            //瀹跺涵褰遍櫌
-            base.SetTitleText(Language.StringByID(StringId.jiatingyingyuan));
-
-            //鍒濆鍖栦腑閮ㄤ俊鎭�
-            this.InitMiddleFrame();
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
-        /// </summary>
-        private void InitMiddleFrame()
-        {
-            //娓呯┖bodyFrame
-            this.ClearBodyFrame();
-
-            string nowSelectId = string.Empty;
-            //妤煎眰涓嬫媺鍥炬爣
-            var btnFloor = new NormalViewControl(500, Application.GetRealHeight(16), false);
-            var btnFloorIcon = new IconViewControl(16);
-            btnFloorIcon.X = HdlControlResourse.XXLeft;
-            btnFloorIcon.Y = Application.GetRealHeight(18);
-            btnFloorIcon.UnSelectedImagePath = "Public/DownIcon.png";
-            bodyFrameLayout.AddChidren(btnFloorIcon);
-            btnFloorIcon.ButtonClickEvent += (sender, e) =>
-            {
-                //鏄剧ず涓嬫媺鍒楄〃
-                var form = new FloorRoomSelectPopupView();
-                form.ShowDeviceFunctionView(btnFloor, this.listDevice, (selectId, listFunc) =>
-                {
-                    btnFloor.Width = btnFloor.GetRealWidthByText();//閲嶇疆鏂囨湰瀹藉害
-                    nowSelectId = selectId;
-                    //閲嶆柊鍒濆鍖栧垪琛ㄦ帶浠�
-                    this.InitDoorListControl(listFunc);
-
-                }, nowSelectId);
-            };
-            //妤煎眰
-            btnFloor.X = btnFloorIcon.Right + Application.GetRealWidth(2);
-            btnFloor.TextColor = CSS_Color.FirstLevelTitleColor;
-            btnFloor.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
-            btnFloor.Text = DB_ResidenceData.Instance.CurFloor.roomName;
-            //btnFloor.Width = btnFloor.GetRealWidthByText();
-            bodyFrameLayout.AddChidren(btnFloor);
-            //璁╁畠鐩稿鍥炬爣灞呬腑
-            btnFloor.Y = btnFloorIcon.Y + (btnFloorIcon.Height - btnFloor.Height) / 2;
-            btnFloor.ButtonClickEvent += (sender, e) =>
-            {
-                btnFloorIcon.ButtonClickEvent(null, null);
-            };
-
-            //鍒楄〃鎺т欢
-            this.listView = new VerticalListControl();
-            listView.Y = Application.GetRealHeight(53);
-            listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(53);
-            bodyFrameLayout.AddChidren(listView);
-
-            //鍒濆鍖栧垪琛ㄦ帶浠�
-            this.InitDoorListControl(this.listDevice);
-        }
-
-        #endregion
-
-        #region 鈻� 娣诲姞褰遍煶涓帶鎺т欢_______________________
-
-        /// <summary>
-        /// 鍒濆鍖栧垪琛ㄦ帶浠�
-        /// </summary>
-        private void InitDoorListControl(List<Function> i_listDevice)
-        {
-            this.listView.RemoveAll();
-            this.dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
-
-            //鐢熸垚褰遍煶涓帶鎺т欢
-            foreach (var device in i_listDevice)
-            {
-                this.AddDoorControl(device);
-            }
-        }
-
-        /// <summary>
-        /// 娣诲姞褰遍煶涓帶鎺т欢
-        /// </summary>
-        /// <param name="i_device">闂ㄩ攣瀵硅薄</param>
-        private void AddDoorControl(Function i_device)
-        {
-            //鐧借壊鑳屾櫙瀹瑰櫒
-            var frameBack = new FrameLayoutStatuControl();
-            frameBack.Width = Application.GetRealWidth(343);
-            frameBack.Height = Application.GetRealHeight(96);
-            frameBack.Radius = (uint)Application.GetRealWidth(12);
-            frameBack.Gravity = Gravity.CenterHorizontal;
-            frameBack.BackgroundColor = CSS_Color.MainBackgroundColor;
-            this.listView.AddChidren(frameBack);
-            //鍥炬爣
-            var btnIcon = new IconViewControl(32);
-            btnIcon.X = Application.GetRealWidth(10);
-            btnIcon.Y = Application.GetRealHeight(15);
-            btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong2.png";
-            frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
-            //璁惧鍚嶅瓧
-            var btnName = new Button();
-            btnName.X = btnIcon.Right + Application.GetRealWidth(12);
-            btnName.Y = Application.GetRealHeight(12);
-            btnName.Width = Application.GetRealWidth(150);
-            btnName.Height = Application.GetRealHeight(20);
-            btnName.TextColor = CSS_Color.FirstLevelTitleColor;
-            btnName.TextAlignment = TextAlignment.CenterLeft;
-            btnName.Text = i_device.name;
-            btnName.TextSize = CSS_FontSize.TextFontSize;
-            frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
-
-            var btnCollection = new Button()
-            {
-                X = Application.GetRealWidth(299),
-                Y = Application.GetRealHeight(10),
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealWidth(40),
-                SelectedImagePath = "Collection/CollectionIcon.png",
-                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
-                IsSelected = i_device.collect
-            };
-            frameBack.AddChidren(btnCollection, ChidrenBindMode.BindEvent);
-
-            //鎴块棿
-            var btnRoom = new Button();
-            btnRoom.X = btnName.X;
-            btnRoom.Y = btnName.Bottom + Application.GetRealHeight(4);
-            btnRoom.Width = Application.GetRealWidth(150);
-            btnRoom.Height = Application.GetRealHeight(15);
-            btnRoom.TextColor = CSS_Color.PromptingColor1;
-            btnRoom.TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel;
-            btnRoom.TextAlignment = TextAlignment.CenterLeft;
-            btnRoom.Text = i_device.GetRoomListName();
-            frameBack.AddChidren(btnRoom, ChidrenBindMode.BindEvent);
-            //鐢垫睜鍥炬爣
-            var btnBattery = new BatteryPersentControl();
-            //btnBattery.Y = Application.GetRealHeight(62);
-            //frameBack.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
-            //btnBattery.InitControl();
-            //btnBattery.SetValue(80);
-            //btnBattery.X = frameBack.Width - btnBattery.Width - Application.GetRealWidth(12);
-            this.dicBatteryContr[i_device.sid] = btnBattery;
-
-            EventHandler<MouseEventArgs> CommonClick = (sender, e) =>
-            {
-
-                var form = new AksPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function, () =>
-                {
-                    this.CloseForm();
-                    this.action?.Invoke();
-                });
-                MainPage.BasePageView.AddChidren(form);
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                form.Show();
-
-            };
-            frameBack.MouseUpEventHandler += CommonClick;
-            btnIcon.MouseUpEventHandler += CommonClick;
-            btnName.MouseUpEventHandler += CommonClick;
-            btnRoom.MouseUpEventHandler += CommonClick;
-            //鏀惰棌
-            btnCollection.MouseUpEventHandler += (sender, e) =>
-             {
-                 btnCollection.IsSelected = i_device.collect = !btnCollection.IsSelected;
-                 i_device.CollectFunction();
-             };
-
-
-
-            //搴曢儴鍐嶅姞涓棿璺�
-            var frameSpace = new FrameLayout();
-            frameSpace.Height = Application.GetRealHeight(12);
-            this.listView.AddChidren(frameSpace);
-        }
-
-        #endregion
-
-
-        #region 鈻� 璁惧鐘舵�佹帹閫乢______________________
-
-        /// <summary>
-        /// 璁惧鐘舵�佹帹閫�
-        /// </summary>
-        /// <param name="i_LocalDevice"></param>
-        public override void DeviceStatuPush(Function i_LocalDevice)
-        {
-            //涓嶆槸鐩爣璁惧
-            if (this.dicBatteryContr.ContainsKey(i_LocalDevice.sid) == false)
-            {
-                return;
-            }
-
-        }
-
-        #endregion
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
deleted file mode 100644
index 05dee0c..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-锘縰sing Shared;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using HDL_ON.UI.CSS;
-using HDL_ON.Entity;
-using HDL_ON.DriverLayer;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using HDL_ON.UI.UI2.Intelligence.Automation;
-using System.Linq;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using System.Reflection;
-using System.Collections;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鍩冨厠鏂富鐣岄潰
-    /// </summary>
-    public class AksPage : FrameLayout
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-        /// <summary>
-        /// 閬ユ帶鍣ㄥ垪琛�
-        /// </summary>
-        private List<RemoteControlEntity> remoteControlList;
-
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 璁惧
-        /// </summary>
-        private Function device;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢
-        /// </summary>
-        private Button btnDeviceName;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢
-        /// </summary>
-        private Button btnRoomName;
-        /// <summary>
-        /// 澶撮儴甯冨眬
-        /// </summary>
-        private TopView topView;
-        /// <summary>
-        /// 褰撳墠璁惧鍚嶇О
-        /// </summary>
-        private Button btnCurrDeviceName;
-        /// <summary>
-        /// 鍖哄煙
-        /// </summary>
-        private Button btnCurrDeviceRoom;
-
-        /// <summary>
-        /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
-        /// </summary>
-        private CommonMethod.Comerom comerom;
-        /// <summary>
-        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
-        /// </summary>
-        public Action action;
-        /// <summary>
-        /// 璁板綍褰撳墠璁惧
-        /// </summary>
-        public IntType currnetIntType = IntType.none;
-        /// <summary>
-        /// 璁板綍褰撳墠閫夋嫨鐨勭储寮曞��
-        /// </summary>
-        public int indexValue = -1;
-
-
-
-        public VerticalScrolViewLayout vv;
-        #endregion
-        public AksPage()
-        {
-        }
-
-        /// <summary>
-        /// 鏋勯�犲嚱鏁�
-        /// </summary>
-        /// <param name="function">璁惧</param>
-        /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
-        /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param> 
-        public AksPage(Function function, Button btnDeviceName, Button btnRoomName, CommonMethod.Comerom comerom, Action action)
-        {
-            this.device = function;
-            this.btnDeviceName = btnDeviceName;
-            this.btnRoomName = btnRoomName;
-            this.comerom = comerom;
-            this.action = action;
-
-        }
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitTop();
-            this.InitMiddle();
-            //鍒濆鍖栦簨浠�
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-
-        /// <summary>
-        /// 鍒濆鍖栧ご閮ㄧ晫闈�
-        /// </summary>
-        private void InitTop()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = true;
-            this.topView.topNameBtn.Text = this.device.name;
-            this.AddChidren(topView.TopFLayoutView());
-        }
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄧ晫闈�
-        /// </summary>
-        private void InitMiddle()
-        {
-            vv = new VerticalScrolViewLayout()
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-
-            };
-            this.AddChidren(vv);
-           
-            //杩涙潵榛樿鎾斁鍣ㄧ晫闈�
-            //this.SwitchUI(IntType.Player);
-        }
-        /// <summary>
-        /// 娉ㄥ唽浜嬩欢
-        /// </summary>
-        private void EventListener()
-        {
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                //娓呯┖鎵�鏈夌紦瀛樻暟鎹�
-                AksCommonMethod.Current.ClearData();
-                this.RemoveFromParent();
-            };
-            //璁剧疆
-            this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                CommonMethod.Current.MainThread(() =>
-                {
-                    //璋冪敤绉�缁曠殑鐣岄潰
-                    var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
-                    {
-                        if (this.btnDeviceName == null || this.btnRoomName == null || this.device == null)
-                        {
-                            return;
-                        }
-                        ////鍒锋柊鏄剧ず
-                        this.btnDeviceName.Text = this.device.name;
-                        this.btnRoomName.Text = this.device.GetRoomListName();
-                        //this.btnCurrDeviceName.Text = this.device.name;
-                        //this.btnCurrDeviceRoom.Text = this.device.GetRoomListName();
-                        //this.CalculatedPosition();//閲嶆柊璁$畻瀹藉害
-
-                    });
-                    infoView.actionDel += () =>
-                    {
-                        //瑙g粦璁惧鍚�
-                        this.RemoveFromParent();
-                        this.action?.Invoke();
-
-                    };
-                    MainPage.BasePageView.AddChidren(infoView);
-                    infoView.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                });
-            };
-
-
-        }
-        /// <summary>
-        /// 鍒濆鏁版嵁
-        /// </summary>
-        private void ReadData()
-        {
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId);
-                    this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId);
-                    //TestData(this.remoteControlList);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-
-                        if (this.remoteControlList.Count > 0)
-                        {
-                            if (this.isExistType(IntType.Player))
-                            {
-                                //鏈夋挱鏀剧被鍨嬮仴鎺у櫒浼樺厛鏄剧ず
-                                this.SwitchUI(IntType.Player);
-                            }
-                            else
-                            {
-                                //榛樿鍙栫涓�浣�
-                                this.indexValue = 0;
-                                var type = (IntType)this.remoteControlList[this.indexValue].type;
-                                this.SwitchUI(type);
-                            }
-
-                        }
-
-                    });
-                }
-            });
-        }
-        /// <summary>
-        /// 鐣岄潰鏄剧ず(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)
-        /// </summary>
-        private void SwitchUI(IntType type)
-        {
-            //if (this.currnetIntType == type)
-            //{
-            //    //鍘绘帀鍒ゆ柇绫诲瀷,鍥犱负鍙兘瀛樺湪澶氫釜鍚岀被鍨�
-            //    return;
-            //}
-            if (IntType.none == type)
-            {
-                return;
-            }
-            if (this.vv == null)
-            {
-                return;
-            }
-            this.vv.RemoveAll();
-            var remoteContro = this.remoteControlList[this.indexValue];
-            switch (type)
-            {
-                case IntType.Player:
-                    {
-                        MusicPage musicPage = new MusicPage(remoteContro, this.sequencerList);
-                        this.vv.AddChidren(musicPage);
-                        musicPage.Show();
-                        musicPage.action += (deviceType) =>
-                        {
-                            SelectedType();
-                        };
-                    }
-                    break;
-                case IntType.HiFi:
-                    {
-                        GfPage gfPage = new GfPage(remoteContro, this.sequencerList);
-                        this.vv.AddChidren(gfPage);
-                        gfPage.Show();
-                        gfPage.action += (deviceType) =>
-                        {
-                            SelectedType();
-                        };
-
-                    }
-                    break;
-                case IntType.TV:
-                    {
-
-                        TvPage tvPage = new TvPage(remoteContro, this.sequencerList);
-                        this.vv.AddChidren(tvPage);
-                        tvPage.Show();
-                        tvPage.action += (deviceType) =>
-                        {
-                            SelectedType();
-                        };
-                    }
-                    break;
-                case IntType.STB:
-                    {
-                        JdhPage jdhPage = new JdhPage(remoteContro, this.sequencerList);
-                        this.vv.AddChidren(jdhPage);
-                        jdhPage.Show();
-                        jdhPage.action += (deviceType) =>
-                        {
-                            SelectedType();
-                        };
-                    }
-                    break;
-                case IntType.Projector:
-                    {
-                        TyyPage tyyPage = new TyyPage(remoteContro, this.sequencerList);
-                        this.vv.AddChidren(tyyPage);
-                        tyyPage.Show();
-                        tyyPage.action += (deviceType) =>
-                        {
-                            SelectedType();
-                        };
-                    }
-                    break;
-                case IntType.Control:
-                    {
-
-                        YkqPage ykqPage = new YkqPage(remoteContro, this.sequencerList);
-                        this.vv.AddChidren(ykqPage);
-                        ykqPage.Show();
-                        ykqPage.action += (deviceType) =>
-                        {
-                            SelectedType();
-                        };
-
-                    }
-                    break;
-
-            }
-
-        }
-        /// <summary>
-        /// 鐣岄潰鍒囨崲(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)
-        /// </summary>
-        private void SelectedType()
-        {
-            var deviceTypeList = GetRemoteControlList();
-            ///涔嬪墠鐨勭姸鎬佹枃鏈�
-            string ccurrnetDeviceStr = "";
-            if (indexValue != -1 && indexValue < deviceTypeList.Count)
-            {
-                ccurrnetDeviceStr = deviceTypeList[indexValue].name;
-            }
-            PublicInterface conditionView = new PublicInterface();
-            conditionView.SingleSelectionShow(this, deviceTypeList, "璁惧閫夋嫨", ccurrnetDeviceStr
-               , (index) =>
-               {
-                   if (this.indexValue == index)
-                   {
-                       //鍚屼竴涓澶囦笉澶勭悊;
-                       return;
-                   }
-                   var remoteControl = deviceTypeList[index];
-                   this.indexValue = index;
-                   this.currnetIntType = (IntType)remoteControl.type;
-                   this.SwitchUI((IntType)remoteControl.type);
-
-               });
-        }
-
-
-
-
-        public enum IntType
-        {
-            /// <summary>
-            /// 娌℃湁
-            /// </summary>
-            none = 0,
-            /// <summary>
-            /// 鎾斁鍣�
-            /// </summary>
-            Player = 1,
-            /// <summary>
-            /// 鍔熸斁
-            /// </summary>
-            HiFi = 2,
-            /// <summary>
-            /// 鐢佃
-            /// </summary>
-            TV = 3,
-            /// <summary>
-            /// 鏈洪《鐩�
-            /// </summary>
-            STB = 4,
-            /// <summary>
-            /// 鎶曞奖浠�
-            /// </summary>
-            Projector = 5,
-            /// <summary>
-            /// 涓囪兘閬ユ帶鍣�
-            /// </summary>
-            Control = 6,
-        }
-
-        /// <summary>
-        /// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
-        /// </summary>
-        /// <returns></returns>
-        private List<RemoteControlEntity> GetRemoteControlList()
-        {
-            if (this.remoteControlList == null || this.remoteControlList.Count == 0)
-            {
-                return new List<RemoteControlEntity>();
-            }
-            return this.remoteControlList;
-        }
-
-        /// <summary>
-        /// 鏄惁瀛樺湪绫诲瀷
-        /// </summary>
-        /// <param name="type">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
-        /// <returns></returns>
-        private bool isExistType(IntType type)
-        {
-
-            var remoteControls = this.GetRemoteControlList();
-            for (int i = 0; i < remoteControls.Count; i++)
-            {
-                var re = remoteControls[i];
-                if ((IntType)re.type == type)
-                {
-                    this.indexValue = i;
-                    return true;
-                }
-
-            }
-            return false;
-        }
-
-
-        private void TestData(List<RemoteControlEntity> list)
-        {
-            list.Add(new RemoteControlEntity { deviceId = "33331", rcId = "1", type = 1, name = "鎾斁鍣�" });
-            list.Add(new RemoteControlEntity { deviceId = "33332", rcId = "2", type = 2, name = "鍔熸斁" });
-            list.Add(new RemoteControlEntity { deviceId = "33333", rcId = "3", type = 3, name = "鐢佃" });
-            list.Add(new RemoteControlEntity { deviceId = "33334", rcId = "4", type = 4, name = "鏈洪《鐩�" });
-            list.Add(new RemoteControlEntity { deviceId = "33335", rcId = "5", type = 5, name = "鎶曞奖浠�" });
-            list.Add(new RemoteControlEntity { deviceId = "33336", rcId = "6", type = 6, name = "涓囪兘閬ユ帶鍣�" });
-        }
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
deleted file mode 100644
index a73fea7..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-锘縰sing Shared;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鏀惰棌鐣岄潰
-    /// </summary>
-    public class CollectPage : FrameLayout
-    {
-        public CollectPage(RemoteControlEntity remoteControlEntity)
-        {
-            this.remoteControl = remoteControlEntity;
-            //璇荤紦瀛樻暟鎹�
-            var collectList = AksCommonMethod.Current.CollectList;
-            this.mMovieCollectList .AddRange(collectList);
-        }
-        /// <summary>
-        /// 褰辩墖鏀惰棌鍒楄〃
-        /// </summary>
-        private List<MovieLibrary> mMovieCollectList =new List<MovieLibrary>(); 
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        RemoteControlEntity remoteControl;
-        /// <summary>
-        /// 褰辩墖鍒楄〃涓婁笅婊戝姩瀹瑰櫒
-        /// </summary>
-        VerticalRefreshLayout vv;
-        /// <summary>
-        /// 褰辩墖瀹瑰櫒
-        /// </summary>
-        CornerFramLayout imageFLayout;
-        /// <summary>
-        /// 澶撮儴甯冨眬
-        /// </summary>
-        private TopView topView;
-        /// <summary>
-        /// 褰撳墠椤垫暟
-        /// </summary>
-        private int pageNo=1;
-
-        
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUi();
-            this.InitMiddle();
-            //璇诲彇鏁版嵁
-            ReadData();
-
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栧ご閮ㄧ晫闈�
-        /// </summary>
-        private void InitUi()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = false;
-            //this.topView.topNameBtn.TextID = StringId.shanchushebei;
-            this.topView.topNameBtn.Text ="鎴戠殑鏀惰棌";
-            this.AddChidren(topView.TopFLayoutView());
-            vv = new VerticalRefreshLayout
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-                BackgroundColor = MusicColor.WhiteColor,
-            };
-            this.AddChidren(vv);
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                this.RemoveFromParent();
-            };
-        }
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄧ晫闈�
-        /// </summary>
-        private void InitMiddle()
-        {
-            if (vv == null)
-            {
-                return;
-            }
-            vv.RemoveAll();
-            int count = this.mMovieCollectList  == null ? 0 : this.mMovieCollectList .Count;
-            imageFLayout = new CornerFramLayout(343, count * 168, 0);
-            vv.AddChidren(imageFLayout);
-            imageFLayout.X = Application.GetRealWidth(16);
-            imageFLayout.LoadImagePage(this.mMovieCollectList );
-            imageFLayout.AdjustRealHeight(16);
-
-            vv.BeginHeaderRefreshingAction += () =>
-            {
-                //鍏抽棴鍒锋柊View锛�
-                vv.EndHeaderRefreshing();
-                //寮哄埗鏇存柊
-                mMovieCollectList .Clear();
-                ReadData();
-            };
-            imageFLayout.selectImageAction += (movieLibrary) =>
-            {
-                CommonMethod.Current.MainThread(() =>
-                {
-                    DetailPage detailPage = new DetailPage(remoteControl, movieLibrary);
-                    MainPage.BasePageView.AddChidren(detailPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    detailPage.Show();
-                    detailPage.action += (isUpdate) =>
-                    {
-                        //鏄惁瑕佹洿鏂�
-                        if (isUpdate)
-                        {
-                            
-                            this.mMovieCollectList = AksCommonMethod.Current.CollectList;
-                            InitMiddle();
-                        }
-                    };
-                });
-            };
-
-        }
-
-        /// <summary>
-        /// 鍒濆鏁版嵁
-        /// </summary>
-        private void ReadData()
-        {
-            if (mMovieCollectList .Count > 0)
-            {
-                CommonMethod.Current.MainThread(() =>
-                {
-                    //鏈夌紦瀛樻暟鎹洿鎺ュ姞杞�
-                    InitMiddle();
-                });
-                return;
-            }
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    this.mMovieCollectList  = SendMethod.Current.GetcollectPage(this.remoteControl.deviceId, this.remoteControl.rcId, pageNo, SendMethod.pageSize);
-                    for (int i = 0; i < this.mMovieCollectList .Count; i++)
-                    {
-                        var mMovieLibrary = this.mMovieCollectList [i];
-                        var bytes = SendMethod.Current.GetImage(mMovieLibrary.posterUrl);
-                        mMovieLibrary.imageBytes = bytes;
-                        //缂撳瓨鏁版嵁
-                        AksCommonMethod.Current.AddCollectMovie(mMovieLibrary);
-                    }
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-                        InitMiddle();
-
-                    });
-                }
-            });
-
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs
deleted file mode 100644
index 704b7d7..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-锘縰sing System;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    public class BaseFramLayout : FrameLayout
-    {
-        public BaseFramLayout()
-        {
-        }
-        /// <summary>
-        /// 鏄惁鍙互鐐瑰嚮
-        /// </summary>
-        private bool mIsClick = true;
-
-        /// <summary>
-        /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
-        /// </summary>
-        /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
-        public void SetClick(bool isClick)
-        {
-            this.mIsClick = isClick;
-        }
-        /// <summary>
-        /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
-        /// </summary>
-        /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
-        public bool GetClick()
-        {
-            return this.mIsClick;
-        }
-
-        /// <summary>
-        /// 寤舵椂鏃堕棿ms
-        /// </summary>
-        public const int millisecondsTimeout = 100;
-
-        /// <summary>
-        /// 閫変腑棰滆壊
-        /// </summary>
-        public const uint seleBackgroundColor = 0xFFF2F3F7;
-        /// <summary>
-        /// 涓嶆敮鎸佹寜閿枃鏈鑹�
-        /// </summary>
-        public const uint unBackgroundColor = 0xFFA3AAB7;
-        /// <summary>
-        /// 涓嶆敮鎸佹暣涓鑹�
-        /// </summary>
-        public const uint unParentBackgroundColor = 0xFFF2F3F7;
-
-        /// <summary>
-        /// 璋冩暣鐪熷疄楂樺害
-        /// </summary>
-        /// <param name="bottomSpace">搴曢儴楂樺害(闈炵湡瀹炲��)</param>
-        public void AdjustRealHeight(int bottomSpace = 0)
-        {
-            int bottomHeight = -1;
-
-            for (int i = 0; i < this.ChildrenCount; i++)
-            {
-                var child = this.GetChildren(i);
-                if (child.Bottom > bottomHeight)
-                {
-                    bottomHeight = child.Bottom;
-                }
-            }
-            if (bottomHeight != -1)
-            {
-                this.Height = bottomHeight + Application.GetRealHeight(bottomSpace);
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
-        /// </summary>
-        /// <returns></returns>
-        public int GetLocationMostLastViewBottom()
-        {
-            int bottomHeight = -1;
-
-            for (int i = 0; i < this.ChildrenCount; i++)
-            {
-                var child = this.GetChildren(i);
-                if (child.Bottom > bottomHeight)
-                {
-                    bottomHeight = child.Bottom;
-                }
-            }
-            return bottomHeight;
-        }
-        /// <summary>
-        /// 璁剧疆楂樹寒棰滆壊(grb)
-        /// </summary>
-        /// <param name="seleColor">閫変腑棰滆壊鍊�</param>
-        /// <param name="unColor">鏈�変腑棰滆壊鍊�</param>
-        /// <param name="view">缁勪欢</param>
-        public void SetHighlightColor(View view, uint seleColor =seleBackgroundColor, uint unColor = 0x00000000) 
-        {
-            if (view == null)
-            {
-                return;
-            }
-            //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-            view.BackgroundColor = seleColor;
-            new System.Threading.Thread(() =>
-            {
-                System.Threading.Thread.Sleep(millisecondsTimeout);
-                Application.RunOnMainThread(() =>
-                {
-                    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-                    view.BackgroundColor = unColor;
-                });
-            })
-            { IsBackground = true }.Start();
-
-        }
-
-        /// <summary>
-        /// 璁剧疆Button涓撶敤
-        /// </summary>
-        /// <param name="button">缁勪欢</param>
-        public void SetButtonIsSelected(Button button)
-        {
-            if (button == null)
-            {
-                return;
-            }
-            //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-            button.IsSelected = true;
-            new System.Threading.Thread(() =>
-            {
-                System.Threading.Thread.Sleep(millisecondsTimeout);
-                Application.RunOnMainThread(() =>
-                {
-                    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-                    button.IsSelected = false;
-                });
-            })
-            { IsBackground = true }.Start();
-
-        }
-
-        /// <summary>
-        /// 璁剧疆楂樹寒鑳屾櫙鍥炬爣
-        /// </summary>
-        /// <param name="sele">閫変腑鍥剧墖璺緞</param>
-        /// <param name="unColor">鏈�変腑鍥剧墖璺緞<</param>
-        /// <param name="view">缁勪欢</param>
-        public void SetHighlightImagePath(FrameLayout frame, string seleImagePath, string unImagePath)
-        {
-            if (frame == null)
-            {
-                return;
-            }
-            //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-            frame.BackgroundImagePath = seleImagePath;
-            new System.Threading.Thread(() =>
-            {
-                System.Threading.Thread.Sleep(millisecondsTimeout);
-                Application.RunOnMainThread(() =>
-                {
-                    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-                    frame.BackgroundImagePath = unImagePath;
-                });
-            })
-            { IsBackground = true }.Start();
-
-        }
-
-
-
-    }
-
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
deleted file mode 100644
index 36723ff..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.Music;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    /// <summary>
-    /// 鑷畾涔夋寜閿鍣�
-    /// </summary>
-    public class ButtonFramLayout : BaseFramLayout
-    {
-
-        public const int widthFrameLayout = 78;
-        public const int heightFrameLayout = 84-6;
-        public const int lineW = 1;
-        public const int cornerValue = 8;
-
-       
-
-        public ButtonFramLayout(int width= widthFrameLayout, int height= heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-            //this.Radius = (uint)Application.GetRealHeight(cornerValue);
-        }
-
-        Button btnImage = new Button
-        {
-            Y = Application.GetRealHeight(12),
-            Width = Application.GetRealWidth(32),
-            Height = Application.GetRealWidth(32),
-            UnSelectedImagePath = "AksIcon/kai.png",
-            Gravity = Gravity.CenterHorizontal,
-            Name = "btnImage",
-        };
-        Button btnName = new Button
-        {
-            Y = Application.GetRealHeight(12 + 26 + 8),//(12 + 32 + 8)
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(20),
-            TextSize = TextSize.Text14,
-            TextColor = MusicColor.TextColor,
-            TextAlignment = TextAlignment.Center,
-            Gravity = Gravity.CenterHorizontal,
-            Padding = new Padding(0, 0, 0, 0),
-            Name = "btnName",
-
-
-        };
-        Button btnTopLine = new Button
-        {
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(lineW),
-            BackgroundColor = MusicColor.ViewColor,
-            Name = "btnTopLine",
-        };
-        Button btnBottomLine = new Button
-        {
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(lineW),
-            BackgroundColor = MusicColor.ViewColor,
-            Name = "btnBottomLine",
-            Y = Application.GetRealHeight(heightFrameLayout - 1),
-        };
-        Button btnLeftLine = new Button
-        {
-            Width = Application.GetRealWidth(lineW),
-            Height = Application.GetRealHeight(heightFrameLayout),
-            BackgroundColor = MusicColor.ViewColor,
-            Name = "btnLeftLine",
-
-        };
-        Button btnRightLine = new Button
-        {
-            Width = Application.GetRealWidth(lineW),
-            Height = Application.GetRealHeight(heightFrameLayout),
-            BackgroundColor = MusicColor.ViewColor,
-            X = Application.GetRealWidth(widthFrameLayout - 1),
-            Name = "btnRightLine",
-
-        };
-        /// <summary>
-        /// 娣诲姞甯冨眬
-        /// </summary>
-        /// <param name="parent"></param>
-        public void AddView(FrameLayout parent)
-        {
-            parent.AddChidren(this);
-            this.AddChidren(btnImage);
-            this.AddChidren(btnName);
-        }
-
-        public void AddImageView()
-        {
-            this.AddChidren(btnImage);
-
-        }
-        public void AddNameView()
-        {
-            this.AddChidren(btnName);
-        }
-
-        /// <summary>
-        /// 娣诲姞宸﹁竟绾�
-        /// </summary>
-        public void AddLeftLine()
-        {
-            btnLeftLine.Height = this.Height;
-            this.AddChidren(btnLeftLine);
-        }
-        /// <summary>
-        /// 娣诲姞鍙宠竟绾�
-        /// </summary>
-        public void AddRightLine()
-        {
-            btnRightLine.Height = this.Height;
-            btnRightLine.X = this.Width - Application.GetRealWidth(1);
-            this.AddChidren(btnRightLine);
-        }
-
-        /// <summary>
-        /// 娣诲姞椤堕儴杈圭嚎
-        /// </summary>
-        public void AddTopLine()
-        {
-            btnTopLine.Width = this.Width;
-            this.AddChidren(btnTopLine);
-        }
-        /// <summary>
-        /// 娣诲姞搴曢儴杈圭嚎
-        /// </summary>
-        public void AddBottomLine()
-        {
-            btnBottomLine.Y = this.Height - Application.GetRealHeight(1);
-            btnBottomLine.Width = this.Width;
-            this.AddChidren(btnBottomLine);
-        }
-
-        public Button GetImageButton()
-        {
-            return this.btnImage;
-        }
-        public Button GetNameButton()
-        {
-            return btnName;
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;绗簩涓槸鍥炬爣瀵硅薄;绗笁涓槸鐘舵�佸璞�</param>
-        public void SetClickListener(Action<FrameLayout, Button, Button> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                if (!this.GetClick()) {
-                    return;
-                }
-                action?.Invoke(this, btnImage, btnName);
-                SetHighlightColor(this);
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                //this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
-
-            };
-            this.MouseUpEventHandler += UpClick;
-            btnImage.MouseUpEventHandler += UpClick;
-            btnName.MouseUpEventHandler += UpClick;
-
-            //EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
-            //{
-            //    this.BackgroundColor = 0x00000000;
-            //    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            //};
-            //this.MouseUpOutsideEventHandler += CancelClick;
-            //btnImage.MouseUpOutsideEventHandler += CancelClick;
-            //btnName.MouseUpOutsideEventHandler += CancelClick;
-
-            //EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            //{
-
-            //    //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-            //    this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
-
-            //};
-
-            //this.MouseDownEventHandler += DownClick;
-            //btnImage.MouseDownEventHandler += DownClick;
-            //btnName.MouseDownEventHandler += DownClick;
-        }
-        /// <summary>
-        /// 璁剧疆鍥炬爣
-        /// </summary>
-        /// <param name="stringId"></param>
-        public void SetButtonImage(int stringId)
-        {
-
-            switch (stringId)
-            {
-                case StringId.kai:
-                    {
-                        this.btnImage.UnSelectedImagePath = "AksIcon/kai.png";
-                    }
-                    break;
-            }
-        }
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
deleted file mode 100644
index 6595c4d..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ /dev/null
@@ -1,616 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.Music;
-using Shared;
-using System.Collections.Generic;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    /// <summary>
-    /// 鑷畾涔夊渾瑙掑鍣�
-    /// </summary>
-    public class CornerFramLayout : BaseFramLayout
-    {
-        private int topMargin;
-        private int leftMargin;
-        private int bottomMargin;
-        private int rightMargin;
-        private int mWidth;
-        private int mHeight;
-        /// <summary>
-        /// 涓�琛屽嚑涓厓绱�
-        /// </summary>
-        private int mRowNumber;
-        /// <summary>
-        /// 鍒楄〃鏈�澶у��
-        /// </summary>
-        private int mListCount;
-        /// <summary>
-        /// 鎸夐敭鍥炶皟
-        /// </summary>
-        public Action<KeypadEntity> selectKeyAction = null; 
-        /// <summary>
-        /// 褰辩墖鍥炶皟
-        /// </summary>
-        public Action<MovieLibrary> selectImageAction = null;
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="width">瀹瑰櫒瀹藉害</param>
-        /// <param name="height">瀹瑰櫒楂樺害</param>
-        ///<param name="rowNumber">鍦嗚鍊�</param>
-        public CornerFramLayout(int width, int height, int radius = 0)
-        {
-            this.BackgroundColor = MusicColor.WhiteColor;
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-            this.Radius = (uint)Application.GetRealHeight(radius);
-            this.mWidth = this.Width;
-            this.mHeight = this.Height;
-
-
-        }
-        /// <summary>
-        /// 璁剧疆鍐呰竟璺�
-        /// </summary>
-        /// <param name="top">涓婅竟璺�</param>
-        /// <param name="bottom">涓嬭竟璺�</param>
-        /// <param name="left">宸﹁竟璺�</param>
-        /// <param name="right">鍙宠竟璺�</param>
-        public void SetMargin(int top, int bottom, int left, int right)
-        {
-            this.topMargin = top;
-            this.bottomMargin = bottom;
-            this.leftMargin = left;
-            this.rightMargin = right;
-        }
-
-
-
-        /// <summary>
-        /// 鑾峰彇娴嬭瘯鍒楄〃鏁版嵁
-        /// </summary>
-        public List<KeypadEntity> GetTestList()
-        {
-            return AksCommonMethod.Current.GetTYYKeypadList(null);
-        }
-
-        /// <summary>
-        /// 鍔ㄦ�佸姞杞芥寜閿晫闈�
-        /// </summary>
-        /// <param name="mList">鍒楄〃</param>
-        /// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
-        public void LoadButtonPage(List<KeypadEntity> mList, int mRowNumber, int defaultIndex = -1)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            if (mRowNumber == 0)
-            {
-                return;
-            }
-            this.mRowNumber = mRowNumber;
-            this.mListCount = mList.Count;
-            int line = 0;
-            int xCount = 0;
-            for (int i = 1; i <= mList.Count; i++)
-            {
-                var keypad = mList[i - 1];
-                ButtonFramLayout buttonFram = new ButtonFramLayout();
-                this.AddChidren(buttonFram);
-                buttonFram.Tag = keypad;
-                buttonFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(ButtonFramLayout.heightFrameLayout * line);
-                buttonFram.X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(ButtonFramLayout.widthFrameLayout * xCount);
-                buttonFram.AddImageView();
-                buttonFram.AddNameView();
-                if (!IsLastRight(i))
-                {
-                    buttonFram.AddRightLine();
-                }
-                if (!IsLastColumn(i))
-                {
-                    buttonFram.AddBottomLine();
-                }
-                buttonFram.GetImageButton().UnSelectedImagePath = keypad.localIconAddress;
-                buttonFram.GetNameButton().Text = keypad.name;
-
-                xCount++;
-                if (i % this.mRowNumber == 0)
-                {
-
-                    line++;
-                    xCount = 0;
-                }
-                //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
-                if (!keypad.isClicked)
-                {
-                    buttonFram.GetImageButton().Alpha = 0.5f;
-                    buttonFram.GetNameButton().TextColor =unBackgroundColor;
-                    buttonFram.SetClick(false);
-
-                }
-                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
-                {
-                    if (buttonFram.Tag == null)
-                    {
-                        return;
-                    }
-                    selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
-                });
-
-                //if (defaultIndex != -1 && defaultIndex == i)
-                //{
-                //    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
-                //    {
-                //        selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
-                //    }
-                //}
-
-
-            }
-        }
-
-        /// <summary>
-        /// 鍔ㄦ�佸姞杞芥寜閿晫闈�
-        /// </summary>
-        /// <param name="mList">鍒楄〃</param>
-        /// <param name="list"> 鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�,娌℃湁榛樿(new List<int>)</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
-        public void LoadButtonPage(List<KeypadEntity> mList, List<int> list,int defaultIndex=-1)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            int currnetheightValue = 0;
-            int currnetWidthValue = 0;
-            //鑾峰彇鐩稿涓�涓含搴﹀��
-            int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(ButtonFramLayout.heightFrameLayout / 2);
-            int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(ButtonFramLayout.widthFrameLayout / 2);
-            for (int i = 1; i <= mList.Count; i++)
-            {
-                var keypad = mList[i - 1];
-                ButtonFramLayout buttonFram = null;
-                if (list.Contains(i))
-                {
-                    buttonFram = new ButtonFramLayout(ButtonFramLayout.widthFrameLayout * 2);
-                    buttonFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue);
-                    buttonFram.X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(currnetWidthValue);
-                    currnetWidthValue += ButtonFramLayout.widthFrameLayout * 2;
-                }
-                else
-                {
-                    buttonFram = new ButtonFramLayout();
-                    buttonFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue);
-                    buttonFram.X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(currnetWidthValue);
-                    currnetWidthValue += ButtonFramLayout.widthFrameLayout;
-
-                }
-
-                this.AddChidren(buttonFram);
-                buttonFram.AddImageView();
-                buttonFram.AddNameView();
-                buttonFram.Tag = keypad;//鏍囪鏁版嵁
-                buttonFram.GetImageButton().UnSelectedImagePath = keypad.localIconAddress;
-                buttonFram.GetNameButton().Text = keypad.name;
-                if (widthDimensionValue > Application.GetRealWidth(currnetWidthValue))
-                {
-                    //鍔犲彸绾�
-                    buttonFram.AddRightLine();
-                }
-
-                if (heightDimensionValue > buttonFram.Bottom)
-                {
-                    //鍔犲簳绾�
-                    buttonFram.AddBottomLine();
-                }
-
-                if (widthDimensionValue < Application.GetRealWidth(currnetWidthValue))
-                {
-                    currnetheightValue += ButtonFramLayout.heightFrameLayout;
-                    currnetWidthValue = 0;
-                }
-                //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
-                if (!keypad.isClicked)
-                {
-                    buttonFram.GetImageButton().Alpha = 0.5f;
-                    buttonFram.GetNameButton().TextColor = unBackgroundColor;
-                    buttonFram.SetClick(false);
-                }
-                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
-                {
-                    if (buttonFram.Tag == null)
-                    {
-                        return;
-                    }
-                    selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
-                  
-                });
-
-                //if (defaultIndex != -1 && defaultIndex == i)
-                //{
-                //    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
-                //    {
-                //        selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
-                //    }
-                //}
-            }
-        }
-
-        /// <summary>
-        ///鍔ㄦ�佸姞杞芥暟瀛楁寜閿晫闈�
-        /// </summary>
-        /// <param name="mList">鍒楄〃</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
-        public void LoadNumberButtonPage(List<KeypadEntity> mList)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            int currnetheightValue = 0;
-            int currnetWidthValue = 0;
-            int heightMaxValue = 84 - 6;
-            int widthMaxValue = 78;
-            //鑾峰彇鐩稿涓�涓含搴﹀��
-            int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
-            int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
-            for (int i = 0; i < mList.Count; i++)
-            {
-                var keypad = mList[i];
-                Button button = new Button
-                {
-                    Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue),
-                    X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(currnetWidthValue),
-                    Width = Application.GetRealWidth(widthMaxValue),
-                    Height = Application.GetRealHeight(heightMaxValue),
-                    Text = keypad.name,
-                    TextSize = TextSize.Text20,
-                    TextColor = MusicColor.TextColor,
-                    TextAlignment = TextAlignment.Center,
-                    IsBold = true,
-                    Tag = keypad,
-                    BackgroundColor = MusicColor.WhiteColor,
-                    SelectedBackgroundColor = 0xFFF2F3F7,
-                    Radius = (uint)Application.GetRealHeight(8),
-                    SelectedTextColor = MusicColor.TextColor,
-                };
-                this.AddChidren(button);
-
-                currnetWidthValue += widthMaxValue;
-                if (widthDimensionValue < Application.GetRealWidth(currnetWidthValue))
-                {
-                    currnetheightValue += heightMaxValue;
-                    currnetWidthValue = 0;
-                }
-                //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
-                if (!keypad.isClicked)
-                {
-                    button.TextColor =unBackgroundColor;
-
-                }
-
-
-                button.MouseUpEventHandler += (sen, e) =>
-                {
-                    if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none"|| !((KeypadEntity)button.Tag).isClicked)
-                    {
-                        return;
-                    }
-                    selectKeyAction?.Invoke((KeypadEntity)button.Tag);
-                    SetButtonIsSelected(button);
-                };
-
-                //if (defaultIndex != -1 && defaultIndex == i)
-                //{
-                //    selectAction?.Invoke((int)buttonFram.Tag);
-                //}
-            }
-        }
-
-        /// <summary>
-        /// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
-        /// 褰辩墖甯冨眬
-        /// </summary>
-        /// <param name="mList">鍒楄〃</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
-        public void LoadImagePage(List<MovieLibrary> mList)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            int currnetheightValue = 0;
-            int currnetWidthValue = 0;
-            int heightMaxValue = ImageFramlayout.heightFrameLayout;
-            int widthMaxValue = ImageFramlayout.widthFrameLayout;
-            //鑾峰彇鐩稿涓�涓含搴﹀��
-            int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
-            int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
-            for (int i = 0; i < mList.Count; i++)
-            {
-                var movieLibrary = mList[i];
-                ImageFramlayout imageFram = new ImageFramlayout();
-                imageFram.AddView(this);
-                imageFram.Tag = movieLibrary;
-                imageFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue);
-                imageFram.X = Application.GetRealWidth(currnetWidthValue);
-                imageFram.btnName.Text = movieLibrary.name;
-                imageFram.btnImage.ImageBytes = movieLibrary.imageBytes;
-                imageFram.btnScore.Text = movieLibrary.rating;
-                currnetWidthValue += (widthMaxValue + 8);//8鏄殧闂村��
-                if (widthDimensionValue < Application.GetRealWidth(currnetWidthValue))
-                {
-                    currnetheightValue += (heightMaxValue + 20);//20鏄殧闂村��
-                    currnetWidthValue = 0;
-                }
-
-                imageFram.SetClickListener((fl) =>
-                {
-                    if (imageFram.Tag != null&& imageFram.Tag is MovieLibrary)
-                    {
-                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
-                    }
-                });
-                //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
-                //{
-                //    selectImageAction?.Invoke((int)imageFram.Tag);
-                //}
-            }
-        }
-        /// <summary>
-        /// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
-        /// 褰辩墖甯冨眬
-        /// </summary>
-        /// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
-        public void LoadImagePage(List<MovieLibrary> mList, int mRowNumber)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            if (mRowNumber == 0)
-            {
-                return;
-            }
-            this.mListCount = mList.Count;
-            this.mRowNumber = mRowNumber;
-            int line = 0;
-            int xCount = 0;
-            for (int i = 1; i <= mList.Count; i++)
-            {
-                var keypad = mList[i - 1];
-                ImageFramlayout imageFram = new ImageFramlayout();
-                imageFram.AddView(this);
-                imageFram.Tag = keypad;
-                imageFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight((ImageFramlayout.heightFrameLayout + 20) * line);
-                imageFram.X = Application.GetRealWidth((ImageFramlayout.widthFrameLayout + 8) * xCount);
-                imageFram.btnName.Text = keypad.name;
-
-                xCount++;
-                if (i % this.mRowNumber == 0)
-                {
-
-                    line++;
-                    xCount = 0;
-                }
-                imageFram.SetClickListener((fl) =>
-                {
-                    if (imageFram.Tag != null && imageFram.Tag is MovieLibrary)
-                    {
-                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
-                    }
-                });
-
-                //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
-                //{
-                //    selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
-                //}
-
-
-            }
-        }
-
-       private int currnetheightValue1 = 0;
-       private int currnetWidthValue1 = 0;
-       private int heightMaxValue1 = ImageFramlayout.heightFrameLayout;
-       private int widthMaxValue1 = ImageFramlayout.widthFrameLayout;
-        //鑾峰彇鐩稿涓�涓含搴﹀��
-       private int widthDimensionValue1 = Application.GetRealWidth(343) - Application.GetRealHeight(ImageFramlayout.widthFrameLayout / 2);
-        /// <summary>
-        /// 鍔犺浇褰辩墖鍒楄〃甯冨眬
-        /// (鐗规畩甯冨眬)
-        /// </summary>
-        /// <param name="mList">鍒楄〃</param>
-        public void LoadImagePage(List<ImageFramlayout> imageFramlayoutList)
-        {
-
-            if (imageFramlayoutList==null||imageFramlayoutList.Count == 0)
-            {
-                return;
-            }
-            //int currnetheightValue = 0;
-            //int currnetWidthValue = 0;
-            //int heightMaxValue = ImageFramlayout.heightFrameLayout;
-            //int widthMaxValue = ImageFramlayout.widthFrameLayout;
-            ////鑾峰彇鐩稿涓�涓含搴﹀��
-            //int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
-            //int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
-            for (int i = 0; i < imageFramlayoutList.Count; i++)
-            {
-                var imageFram = imageFramlayoutList[i];
-                if (imageFram == null)
-                {
-                    continue;
-                }
-                imageFram.AddView(this);
-                imageFram.Y =Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue1);
-                imageFram.X = Application.GetRealWidth(currnetWidthValue1);
-                currnetWidthValue1 += (widthMaxValue1 + 8);//8鏄殧闂村��
-                if (widthDimensionValue1 < Application.GetRealWidth(currnetWidthValue1))
-                {
-                    currnetheightValue1 += (heightMaxValue1 + 20);//20鏄殧闂村��
-                    currnetWidthValue1 = 0;
-                }
-
-                imageFram.SetClickListener((fl) =>
-                {
-                    if (imageFram.Tag != null && imageFram.Tag is MovieLibrary)
-                    {
-                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
-                    }
-                });
-            }
-        }
-        /// <summary>
-        /// 姘村钩婊戝姩甯冨眬
-        /// </summary>
-        /// <param name="mList">鍒楄〃</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
-        public void LoadHorizontalPage(List<FilterCategoryEntity> mList, int defaultIndex = -1)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            for (int i = 0; i < mList.Count; i++)
-            {
-                var filterCategory = mList[i];
-                BaseFramLayout horizontalFL = new BaseFramLayout
-                {
-                    Y = Application.GetRealHeight(i * 75),
-                    Height = Application.GetRealHeight(75),
-                    Width = this.Width,
-                };
-                this.AddChidren(horizontalFL);
-                Button btnTitleType = new Button
-                {
-                    X = Application.GetRealWidth(16),
-                    Y = Application.GetRealHeight(16),
-                    Height = Application.GetRealHeight(22),
-                    Width = Application.GetRealWidth(200),
-                    Text = filterCategory.name,
-                    TextSize = TextSize.Text16,
-                    TextColor = MusicColor.TextColor,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    IsBold = true,
-                    Tag = filterCategory,
-                };
-                horizontalFL.AddChidren(btnTitleType);
-
-                HorizontalFramLayout horizontal = new HorizontalFramLayout(375 - 16, 28);
-                horizontalFL.AddChidren(horizontal);
-                horizontal.Y = btnTitleType.Bottom + Application.GetRealHeight(8);
-                horizontal.X = Application.GetRealWidth(16);
-                horizontal.SelectTypeEvent += (filters) =>
-                {
-                    KeypadEntity keypad = new KeypadEntity();
-                    keypad.category = filters.category;
-                    keypad.filterValue = filters.filterValue;
-                    keypad.filterName = filters.filterName;
-                    selectKeyAction?.Invoke(keypad);
-                };
-                horizontal.InitControl(filterCategory.filters, defaultIndex);
-
-
-            }
-
-        }
-
-        /// <summary>
-        /// 鏈�鍚庝竴琛�
-        /// </summary>
-        /// <param name="index">褰撳墠绱㈠紩鍊�</param>
-        /// <returns></returns>
-        private bool IsLastColumn(int index)
-        {
-            if (this.mRowNumber == 0 || mListCount == 0)
-            {
-                return false;
-            }
-            int lineCount = mListCount / this.mRowNumber;//寰楀嚭琛屾暟
-            int number = mListCount % this.mRowNumber;
-            if (number != 0)
-            {
-                if (index > lineCount * this.mRowNumber)
-                {
-                    return true;
-                }
-            }
-            else
-            {
-                int value = --lineCount * this.mRowNumber;
-                if (index > value)
-                {
-                    return true;
-                }
-
-            }
-            return false;
-        }
-        /// <summary>
-        /// 鏈�鍚庡彸杈归偅涓�涓�
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        private bool IsLastRight(int value)
-        {
-            if (this.mRowNumber == 0)
-            {
-                return false;
-            }
-            if (value % this.mRowNumber == 0)
-            {
-                return true;
-            };
-            return false;
-        }
-
-
-        /// <summary>
-        /// 閲嶆柊璁$畻button瀹藉害
-        /// </summary>
-        /// <param name="button">鎺т欢</param>
-        /// <param name="widthMax">瀹藉害鏈�澶ф渶</param>
-        /// <param name="padding">鍐呰竟璺�</param>
-        private void AdjustRealWidth(Button button, int widthMax = 0, int padding = 0)
-        {
-            if (button == null)
-            {
-                return;
-            }
-            int width;
-            if (widthMax == 0)
-            {
-                //鍐呰竟璺�
-                width = button.GetTextWidth() + Application.GetRealWidth(padding * 2);
-            }
-            else
-            {
-                if (button.GetTextWidth() > Application.GetRealWidth(widthMax))
-                {
-
-                    button.TextSize = 10;//鎺т欢楂樺害涓嶅彉,鏀瑰彉瀛椾綋澶у皬,鍑嗗鎹㈣;
-                    width = Application.GetRealWidth(widthMax);
-                }
-                else
-                {
-                    width = button.GetTextWidth();
-                }
-
-            }
-
-            button.Width = width;
-        }
-
-
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/HorizontalFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/HorizontalFramLayout.cs
deleted file mode 100644
index 76a22bc..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/HorizontalFramLayout.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.Music;
-using System.Collections.Generic;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    /// <summary>
-    /// 姘村钩婊戝姩瀹瑰櫒
-    /// </summary>
-    public class HorizontalFramLayout : HorizontalScrolViewLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="width">瀹瑰櫒瀹藉害</param>
-        /// <param name="height">瀹瑰櫒楂樺害</param>
-        public HorizontalFramLayout(int width, int height)
-        {
-            this.Height = Application.GetRealHeight(height);
-            this.Width = Application.GetRealWidth(width);
-        }
-
-        /// <summary>
-        /// 閫夋嫨浜嬩欢
-        /// </summary>
-        public Action<Filters> SelectTypeEvent = null;
-
-        /// <summary>
-        /// 鍒濆鍖栨帶浠�
-        /// </summary>
-        /// <param name="mList">鏄剧ず鏁版嵁鍒楄〃</param>
-        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
-        public void InitControl(List<Filters> mList, int defaultIndex = -1)
-        {
-            if (mList == null || mList.Count == 0)
-            {
-                return;
-            }
-            bool isBool = false;
-            Button btnSelected = new Button();
-            for (int i = 0; i < mList.Count; i++)
-            {
-
-                var filters = mList[i];
-                Button button = new Button
-                {
-                    Height = Application.GetRealHeight(28),
-                    Width = Application.GetRealWidth(20),
-                    SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-                    BackgroundColor = 0x00000000,
-                    Text = mList[i].filterName,
-                    TextSize = TextSize.Text14,
-                    TextColor = MusicColor.TextColor,
-                    SelectedTextColor = MusicColor.WhiteColor,
-                    TextAlignment = TextAlignment.Center,
-                    Padding = new Padding(4, 4, 4, 4),
-                    Radius = (uint)Application.GetRealHeight(4),
-                    Tag = filters,
-                    Name = i.ToString(),
-                };
-
-                //閲嶆柊璁$畻缁勪欢瀹藉害
-                button.Width = button.GetTextWidth() + Application.GetRealWidth(4 + 4);
-                this.AddChidren(button);
-                //闂撮殧,寮勪釜绌虹殑杩涘幓鍗犱綅缃�
-                Button btnSpacing = new Button
-                {
-                    Height = Application.GetRealHeight(28),
-                    Width = Application.GetRealWidth(20),
-                    BackgroundColor = 0x00000000,
-                };
-                this.AddChidren(btnSpacing);
-                button.MouseDownEventHandler += (sen, e) =>
-                {
-                    if (btnSelected.Name == button.Name)
-                    {
-                        //鐐瑰嚮鍚屼竴涓粍浠舵棤鏁�
-                        return;
-                    }
-                    btnSelected.IsSelected = false;
-                    button.IsSelected = true;
-                    btnSelected = button;
-                    if (button.Tag == null || !(button.Tag is Filters))
-                    {
-                        return;
-                    }
-                    var filtersSelected = (Filters)button.Tag;
-
-                    SelectTypeEvent?.Invoke(filtersSelected);
-
-                };
-                if (defaultIndex != -1 && defaultIndex == i)
-                {
-                    btnSelected.IsSelected = false;
-                    button.IsSelected = true;
-                    btnSelected = button;
-                    isBool = true;
-                }
-            }
-
-            if (isBool)
-            {
-                if (defaultIndex < mList.Count)
-                {
-                    //榛樿绱㈠紩鍥炶皟,鍒濆鍖栨椂鎵ц
-                    SelectTypeEvent?.Invoke(mList[defaultIndex]);
-                }
-
-            }
-
-        }
-
-
-
-
-
-        /// <summary>
-        /// 鎺т欢鎽ф瘉
-        /// </summary>
-        public override void RemoveFromParent()
-        {
-            this.SelectTypeEvent = null;
-            base.RemoveFromParent();
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs
deleted file mode 100644
index 1bf713b..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.Music;
-using System.Collections.Generic;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    public class ImageFramlayout : BaseFramLayout
-    {
-
-        public const int widthFrameLayout = 109;
-        public const int heightFrameLayout = 168;
-
-        public ImageFramlayout(int width = widthFrameLayout, int height = heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-            this.BackgroundColor = 0x00000000;
-        }
-
-        public ImageView btnImage = new ImageView
-        {
-            Height = Application.GetRealHeight(140),
-            Width = Application.GetRealWidth(109),
-            Radius = (uint)Application.GetRealHeight(12),
-        };
-
-        public Button btnScore = new Button
-        {
-            Y = Application.GetRealHeight(110),
-            X = Application.GetRealWidth(21),
-            Height = Application.GetRealHeight(22),
-            Width = Application.GetRealWidth(80),
-            Text = "9.1",
-            TextColor = MusicColor.WhiteColor,
-            TextSize = TextSize.Text16,
-            TextAlignment = TextAlignment.CenterRight,
-            IsBold=true,
-        };
-
-        public Button btnName = new Button
-        {
-            //Y = Application.GetRealHeight(140 + 8),
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(20),
-            TextSize = TextSize.Text14,
-            TextColor = MusicColor.TextColor,
-            TextAlignment = TextAlignment.CenterLeft,
-            Padding = new Padding(0, 0, 0, 0),
-            IsMoreLines = true,
-        };
-
-        public void AddView(FrameLayout layout)
-        {
-            layout.AddChidren(this);
-            this.AddChidren(btnImage);
-            this.AddChidren(btnScore);
-            this.AddChidren(btnName);
-            btnName.Y = btnImage.Bottom + Application.GetRealHeight(8);
-
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄/param>
-        public void SetClickListener(Action<FrameLayout> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                //this.BackgroundColor = 0x00000000;
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-                action?.Invoke(this);
-            };
-            this.MouseUpEventHandler += UpClick;
-            btnImage.MouseUpEventHandler += UpClick;
-            btnScore.MouseUpEventHandler += UpClick;
-            btnName.MouseUpEventHandler += UpClick;
-
-
-            EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
-            {
-                //this.BackgroundColor = 0x00000000;
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            this.MouseUpOutsideEventHandler += CancelClick;
-            btnImage.MouseUpOutsideEventHandler += CancelClick;
-            btnScore.MouseUpOutsideEventHandler += CancelClick;
-            btnName.MouseUpOutsideEventHandler += CancelClick;
-
-            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            {
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                //this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
-               
-            };
-            this.MouseUpEventHandler += DownClick;
-            btnImage.MouseUpEventHandler += DownClick;
-            btnScore.MouseUpEventHandler += DownClick;
-            btnName.MouseUpEventHandler += DownClick;
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
deleted file mode 100644
index 50de22b..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    public class MenuFramLayout : BaseFramLayout
-    {
-        public const int widthFrameLayout = 180;
-        public const int heightFrameLayout = 180;
-        public const int cornerValue = 90;
-
-        public MenuFramLayout(int width = widthFrameLayout, int height = heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealWidth(height);
-            this.Radius = (uint)Application.GetRealWidth(cornerValue);
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.Gravity = Gravity.CenterHorizontal;
-        }
-        Button btnTop = new Button
-        {
-            Y = Application.GetRealWidth(16),
-            X = Application.GetRealWidth(78),
-            Width = Application.GetRealWidth(24),//楂樺害鍜屽楂樹笉涓�鏍�,浠ュ搴︿负缁村害璁$畻,鍚﹀垯鍙樺舰
-            Height = Application.GetRealWidth(20),
-            UnSelectedImagePath = "AksIcon/shang.png",
-            SelectedImagePath = "AksIcon/shang_selected.png",
-            Name = "涓�",
-        };
-
-        Button btnTopClick = new Button
-        {
-            X = Application.GetRealWidth(52),
-            Width = Application.GetRealWidth(76),
-            Height = Application.GetRealHeight(40),
-        };
-        Button btnBottom = new Button
-        {
-            Y = Application.GetRealWidth(144),
-            X = Application.GetRealWidth(78),
-            Width = Application.GetRealWidth(24),
-            Height = Application.GetRealWidth(20),
-            UnSelectedImagePath = "AksIcon/xia.png",
-            SelectedImagePath = "AksIcon/xia_selected.png",
-            Name = "涓�",
-        };
-        Button btnBottomClick = new Button
-        {
-            Y = Application.GetRealWidth(128),
-            X = Application.GetRealWidth(52),
-            Width = Application.GetRealWidth(76),
-            Height = Application.GetRealHeight(52),
-        };
-        Button btnLeft = new Button
-        {
-            Y = Application.GetRealWidth(78),
-            X = Application.GetRealWidth(16),
-            Width = Application.GetRealWidth(20),
-            Height = Application.GetRealWidth(24),
-            UnSelectedImagePath = "AksIcon/zuo.png",
-            SelectedImagePath = "AksIcon/zuo_selected.png",
-            Name = "宸�",
-
-        };
-
-        Button btnLeftClick = new Button
-        {
-            Y = Application.GetRealWidth(52),
-            Width = Application.GetRealWidth(52),
-            Height = Application.GetRealHeight(76),
-
-        };
-        Button btnRight = new Button
-        {
-            Y = Application.GetRealWidth(78),
-            X = Application.GetRealWidth(144),
-            Width = Application.GetRealWidth(20),
-            Height = Application.GetRealWidth(24),
-            UnSelectedImagePath = "AksIcon/you.png",
-            SelectedImagePath = "AksIcon/you_selected.png",
-            Name = "鍙�",
-
-        };
-
-        Button btnRightClick = new Button
-        {
-            X = Application.GetRealWidth(128),
-            Y = Application.GetRealWidth(52),
-            Width = Application.GetRealWidth(52),
-            Height = Application.GetRealHeight(76),
-
-        };
-
-        Button btnOkbj = new Button
-        {
-            Gravity = Gravity.Center,
-            Width = Application.GetRealWidth(76),
-            Height = Application.GetRealWidth(76),
-            Radius = (uint)Application.GetRealWidth(38),
-            BackgroundColor = MusicColor.WhiteColor,
-
-
-        };
-        Button btnOk = new Button
-        {
-            Gravity = Gravity.Center,
-            Width = Application.GetRealWidth(28),
-            Height = Application.GetRealWidth(28),
-            Radius = (uint)Application.GetRealWidth(14),
-            BackgroundColor = 0xff1B2D4D,
-            SelectedBackgroundColor = MusicColor.SelectedColor,
-            Name = "纭畾"
-        };
-
-        public void AddView(FrameLayout layout)
-        {
-            this.AddChidren(btnTop);
-            this.AddChidren(btnTopClick);
-            this.AddChidren(btnBottom);
-            this.AddChidren(btnBottomClick);
-            this.AddChidren(btnLeft);
-            this.AddChidren(btnLeftClick);
-            this.AddChidren(btnRight);
-            this.AddChidren(btnRightClick);
-            this.AddChidren(btnOkbj);
-            this.AddChidren(btnOk);
-
-
-            layout.AddChidren(this);
-            //btnBottom.Y = btnOkbj.Bottom + Application.GetRealWidth(16);
-
-        }
-
-        /// <summary>
-        /// 涓�
-        /// </summary>
-        /// <param name="action"></param>
-        public void SetTopClickListener(Action<KeypadEntity> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                KeypadEntity keypadEntity = new KeypadEntity();
-                keypadEntity.name = btnTop.Name;
-                keypadEntity.keypad = "key_up";
-                action?.Invoke(keypadEntity);
-                SetButtonIsSelected(btnTop);
-            };
-            btnTop.MouseUpEventHandler += UpClick;
-            btnTopClick.MouseUpEventHandler += UpClick;
-
-        }
-
-        /// <summary>
-        /// 涓�
-        /// </summary>
-        /// <param name="action"></param>
-        public void SetBottomClickListener(Action<KeypadEntity> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                KeypadEntity keypadEntity = new KeypadEntity();
-                keypadEntity.name = btnBottom.Name;
-                keypadEntity.keypad = "key_down";
-                action?.Invoke(keypadEntity);
-                SetButtonIsSelected(btnBottom);
-            };
-            btnBottom.MouseUpEventHandler += UpClick;
-            btnBottomClick.MouseUpEventHandler += UpClick;
-
-        }
-        /// <summary>
-        /// 宸�
-        /// </summary>
-        /// <param name="action"></param>
-        public void SetLeftClickListener(Action<KeypadEntity> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                KeypadEntity keypadEntity = new KeypadEntity();
-                keypadEntity.name = btnLeft.Name;
-                keypadEntity.keypad = "key_left";
-                action?.Invoke(keypadEntity);
-                SetButtonIsSelected(btnLeft);
-            };
-            btnLeft.MouseUpEventHandler += UpClick;
-            btnLeftClick.MouseUpEventHandler += UpClick;
-
-        }
-        /// <summary>
-        /// 鍙�
-        /// </summary>
-        /// <param name="action"></param>
-        public void SetRightClickListener(Action<KeypadEntity> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                KeypadEntity keypadEntity = new KeypadEntity();
-                keypadEntity.name = btnRight.Name;
-                keypadEntity.keypad = "key_right";
-                action?.Invoke(keypadEntity);
-                SetButtonIsSelected(btnRight);
-            };
-            btnRight.MouseUpEventHandler += UpClick;
-            btnRightClick.MouseUpEventHandler += UpClick;
-
-        }
-
-        /// <summary>
-        /// ok
-        /// </summary>
-        /// <param name="action"></param>
-        public void SetOkClickListener(Action<KeypadEntity> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                KeypadEntity keypadEntity = new KeypadEntity();
-                keypadEntity.name = btnOk.Name;
-                keypadEntity.keypad = "key_ok";
-                action?.Invoke(keypadEntity);
-                SetButtonIsSelected(btnOk);
-            };
-            btnOk.MouseUpEventHandler += UpClick;
-
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
deleted file mode 100644
index cd0e976..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-锘縰sing HDL_ON.UI.Music;
-using System;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    public class TypeMultiFramLayout
-    {
-        /// <summary>
-        /// 鏄惁鍙互鐐瑰嚮
-        /// </summary>
-        private bool mIsClick = true;
-
-        /// <summary>
-        /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
-        /// </summary>
-        /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
-        public void setClick(bool isClick)
-        {
-            this.mIsClick = isClick;
-        }
-        private uint UpBackgroundColor =BaseFramLayout.unParentBackgroundColor;
-        private uint DownBackgroundColor =BaseFramLayout.seleBackgroundColor;
-
-        /// <summary>
-        /// 澶氫釜绫诲瀷瀹瑰櫒
-        /// </summary>
-        public FrameLayout multiFramLayout = new FrameLayout
-        {
-            BackgroundColor = MusicColor.ViewColor,
-            X = Application.GetRealWidth(16),
-            Width = Application.GetRealWidth(311),
-            Height = Application.GetRealHeight(40),
-            Radius = (uint)Application.GetRealHeight(20),
-        };
-
-
-
-        public FrameLayout leftFramLayout = new FrameLayout
-        {
-            X = Application.GetRealWidth(16),
-            Gravity = Gravity.CenterVertical,
-            Width = Application.GetRealWidth(139),
-            Height = Application.GetRealHeight(23),
-            Radius = (uint)Application.GetRealHeight(20),
-
-        };
-
-
-        public Button btnLeftImage = new Button
-        {
-            Width = Application.GetRealWidth(16),
-            Height = Application.GetRealWidth(16),
-            UnSelectedImagePath = "AksIcon/shixuqi.png",
-            Gravity = Gravity.CenterVertical,
-            Name = "btnBottonLeftImage",
-        };
-
-        public Button btnLeftName = new Button
-        {
-            Width = Application.GetRealWidth(100 + 10),
-            Height = Application.GetRealHeight(23),
-            TextID = StringId.shixuqi,
-            TextSize = TextSize.Text16,
-            TextColor = MusicColor.TextColor,
-            TextAlignment = TextAlignment.CenterLeft,
-            Gravity = Gravity.CenterVertical,
-        };
-
-
-
-        public FrameLayout lineFramLayout = new FrameLayout
-        {
-            BackgroundColor = MusicColor.TextColor,
-            Y = Application.GetRealHeight(10),
-            Width = Application.GetRealWidth(1),
-            Height = Application.GetRealHeight(20),
-        };
-
-
-
-        public FrameLayout rightFramLayout = new FrameLayout
-        {
-            Gravity = Gravity.CenterVertical,
-            Width = Application.GetRealWidth(138),
-            Height = Application.GetRealHeight(23),
-            Radius = (uint)Application.GetRealHeight(20),
-
-        };
-
-
-        public Button btnRightImage = new Button
-        {
-            Width = Application.GetRealWidth(16),
-            Height = Application.GetRealWidth(16),
-            UnSelectedImagePath = "AksIcon/xuanze.png",
-            Gravity = Gravity.CenterRight,
-        };
-
-
-        public Button btnRightName = new Button
-        {
-            Width = Application.GetRealWidth(100 + 16),
-            Height = Application.GetRealHeight(23),
-            TextID = StringId.bofangqi,
-            TextSize = TextSize.Text16,
-            TextColor = MusicColor.TextColor,
-            TextAlignment = TextAlignment.CenterRight,
-            Gravity = Gravity.CenterVertical,
-            Padding = new Padding(0, 0, 0, 0),
-        };
-
-
-        public void AddView(FrameLayout layout)
-        {
-            layout.AddChidren(multiFramLayout);
-            multiFramLayout.AddChidren(leftFramLayout);
-            leftFramLayout.AddChidren(btnLeftImage);
-            leftFramLayout.AddChidren(btnLeftName);
-            multiFramLayout.AddChidren(lineFramLayout);
-            multiFramLayout.AddChidren(rightFramLayout);
-            rightFramLayout.AddChidren(btnRightImage);
-            rightFramLayout.AddChidren(btnRightName);
-            btnLeftName.X = btnLeftImage.Right + Application.GetRealWidth(4);
-            lineFramLayout.X = leftFramLayout.Right;
-            rightFramLayout.X = lineFramLayout.Right;
-            btnRightName.X = Application.GetRealWidth(4);
-        }
-
-
-        public void SetClickUpBackgroundColor(uint backgroundColor)
-        {
-            this.UpBackgroundColor = backgroundColor;
-
-        }
-
-        public void SetClickDownBackgroundColor(uint backgroundColor)
-        {
-            this.DownBackgroundColor = backgroundColor;
-        }
-
-        /// <summary>
-        /// 搴忔椂鍣ㄧ被鍨嬪鍣�
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄</param>
-        public void SetLeftFlClickListener(Action<FrameLayout> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                //leftFramLayout.BackgroundColor = this.UpBackgroundColor;
-
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            leftFramLayout.MouseUpEventHandler += UpClick;
-            btnLeftImage.MouseUpEventHandler += UpClick;
-            btnLeftName.MouseUpEventHandler += UpClick;
-
-
-            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            {
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                //leftFramLayout.BackgroundColor = this.DownBackgroundColor;
-                action?.Invoke(leftFramLayout);
-            };
-            leftFramLayout.MouseDownEventHandler += DownClick;
-            btnLeftImage.MouseDownEventHandler += DownClick;
-            btnLeftName.MouseDownEventHandler += DownClick;
-        }
-
-        /// <summary>
-        /// 鎾斁鍣ㄧ被鍨嬪鍣�
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄</param>
-        public void SetRightFlClickListener(Action<FrameLayout> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                action?.Invoke(rightFramLayout);
-                //rightFramLayout.BackgroundColor = this.UpBackgroundColor;
-
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            rightFramLayout.MouseUpEventHandler += UpClick;
-            btnRightImage.MouseUpEventHandler += UpClick;
-            btnRightName.MouseUpEventHandler += UpClick;
-
-
-            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            {
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                //rightFramLayout.BackgroundColor =AksCommonMethod.seleBackgroundColor;
-
-            };
-            rightFramLayout.MouseDownEventHandler += DownClick;
-            btnRightImage.MouseDownEventHandler += DownClick;
-            btnRightName.MouseDownEventHandler += DownClick;
-        }
-
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs
deleted file mode 100644
index bd98ba4..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-锘縰sing HDL_ON.UI.Music;
-using System;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    public class TypeSingleFramLayout
-    {
-        /// <summary>
-        /// 鏄惁鍙互鐐瑰嚮
-        /// </summary>
-        private bool mIsClick = true;
-        private uint UpBackgroundColor = BaseFramLayout.unParentBackgroundColor;
-        private uint DownBackgroundColor = BaseFramLayout.seleBackgroundColor;
-
-        /// <summary>
-        /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
-        /// </summary>
-        /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
-        public void setClick(bool isClick)
-        {
-            this.mIsClick = isClick;
-        }
-       
-        /// <summary>
-        /// 鍗曚釜绫诲瀷瀹瑰櫒
-        /// </summary>
-        public FrameLayout singleFramLayout = new FrameLayout
-        {
-            BackgroundColor = MusicColor.ViewColor,
-            //Gravity = Gravity.CenterHorizontal,
-            Width = Application.GetRealWidth(101),
-            Height = Application.GetRealHeight(34),//40
-            Radius = (uint)Application.GetRealHeight(17),
-        };
-
-        public Button btnLeftImage = new Button
-        {
-            X = Application.GetRealWidth(16),
-            Width = Application.GetRealWidth(16),
-            Height = Application.GetRealWidth(16),
-            UnSelectedImagePath = "AksIcon/yingku.png",
-            Gravity = Gravity.CenterVertical,
-            Name = "btnLeftImage",
-        };
-
-        public Button btnName = new Button
-        {
-
-            Width = Application.GetRealWidth(32),
-            Height = Application.GetRealHeight(23),
-            TextID = StringId.yingku,
-            TextSize = TextSize.Text16,
-            TextColor = MusicColor.TextColor,
-            TextAlignment = TextAlignment.Center,
-            Gravity = Gravity.CenterVertical,
-            Padding = new Padding(0, 0, 0, 0),
-            Name = "btnName",
-        };
-
-        public Button btnRightImage = new Button
-        {
-
-            Width = Application.GetRealWidth(5),
-            Height = Application.GetRealWidth(8),
-            UnSelectedImagePath = "AksIcon/yingkunext.png",
-            Gravity = Gravity.CenterVertical,
-            Name = "btnRightImage",
-        };
-
-
-        public void AddView(FrameLayout layout)
-        {
-            layout.AddChidren(singleFramLayout);
-            singleFramLayout.AddChidren(btnLeftImage);
-            singleFramLayout.AddChidren(btnName);
-            singleFramLayout.AddChidren(btnRightImage);
-            btnName.X = btnLeftImage.Right + Application.GetRealWidth(4);
-            btnRightImage.X = btnName.Right + Application.GetRealWidth(8);
-        }
-
-
-
-        public void SetClickUpBackgroundColor(uint backgroundColor)
-        {
-            this.UpBackgroundColor = backgroundColor;
-
-        }
-
-        public void SetClickDownBackgroundColor(uint backgroundColor)
-        {
-            this.DownBackgroundColor = backgroundColor;
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;</param>
-        public void SetClickListener(Action<FrameLayout> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                action?.Invoke(singleFramLayout);
-                //singleFramLayout.BackgroundColor = this.UpBackgroundColor;
-
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            singleFramLayout.MouseUpEventHandler += UpClick;
-            btnLeftImage.MouseUpEventHandler += UpClick;
-            btnName.MouseUpEventHandler += UpClick;
-            btnRightImage.MouseUpEventHandler += UpClick;
-
-            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            {
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                //singleFramLayout.BackgroundColor = this.DownBackgroundColor;
-
-            };
-            singleFramLayout.MouseDownEventHandler += DownClick;
-            btnLeftImage.MouseDownEventHandler += DownClick;
-            btnName.MouseDownEventHandler += DownClick;
-            btnRightImage.MouseDownEventHandler += DownClick;
-        }
-
-
-        /// <summary>
-        /// 鑷姩璁$畻鎺т欢闀垮害
-        /// </summary>
-        /// <param name="orientation">浣嶇疆(宸︽垨鍙�)</param>
-        /// <param name="frame">鐖跺鍣�</param>
-        /// <param name="btnName">澶囨敞鎺т欢</param>
-        /// <param name="btnImage">鍥炬爣澶囨敞鎺т欢</param>
-        /// <param name="btnNameWidth">澶囨敞鎺т欢瀹藉害</param>
-        /// <param name="btnNameWidthMaxValue">澶囨敞鎺т欢瀹藉害鏈�澶у��</param> 
-        /// <param name="parentDefaultWidthMaxValue">鐖舵帶浠跺搴﹂粯璁ゆ渶澶у��</param>
-        public void CustomCalculationWidth(Orientation orientation, FrameLayout frame, Button btnName, Button btnImage, int btnNameWidth,int btnNameWidthMaxValue = 110, int parentDefaultWidthMaxValue = 101)
-        {
-
-            int parentRightX = 226;
-            int parentLeftX = 16;
-
-
-            if (btnName.GetTextWidth() > Application.GetRealWidth(btnNameWidth))
-            {
-                frame.Width = Application.GetRealWidth(parentDefaultWidthMaxValue - btnNameWidth) + btnName.GetTextWidth();
-                if (orientation == Orientation.right)
-                {
-                    frame.X = Application.GetRealWidth(parentRightX + btnNameWidth) - btnName.GetTextWidth();
-                }
-                else if (orientation == Orientation.left)
-                {
-                    frame.X = Application.GetRealWidth(parentLeftX);
-                }
-                btnName.Width = btnName.GetTextWidth();
-                btnImage.X = btnName.Right + Application.GetRealWidth(8);
-            }
-
-            if (btnName.GetTextWidth() > Application.GetRealWidth(btnNameWidthMaxValue))
-            {
-
-                btnName.Width = Application.GetRealWidth(btnNameWidthMaxValue);
-                if (orientation == Orientation.right)
-                {
-                    frame.X =Application.GetRealWidth(parentRightX+ btnNameWidth) - btnName.Width;
-                }
-                else if (orientation == Orientation.left)
-                {
-                    frame.X = Application.GetRealWidth(parentLeftX);
-                }
-                frame.Width = Application.GetRealWidth(parentDefaultWidthMaxValue - btnNameWidth) + btnName.Width;
-                btnImage.X = btnName.Right + Application.GetRealWidth(8);
-            }
-
-        }
-
-        public enum Orientation
-        {
-            left,
-            right,
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
deleted file mode 100644
index 2ca711c..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.Music;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
-{
-    public class VerticalBoutonFLayout:BaseFramLayout
-    {
-        /// <summary>
-        /// 鏄惁鍙互鐐瑰嚮
-        /// </summary>
-        private bool mIsClick = true;
-
-        /// <summary>
-        /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
-        /// </summary>
-        /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
-        public void setClick(bool isClick)
-        {
-            this.mIsClick = isClick;
-        }
-        public const int widthFrameLayout = 80;
-        public const int heightFrameLayout = 140-15;
-        public const int cornerValue = 12;
-
-        public VerticalBoutonFLayout(int width = widthFrameLayout, int height = heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-            this.BackgroundColor = MusicColor.ViewColor;
-            Radius = (uint)Application.GetRealHeight(cornerValue);
-        }
-
-        public FrameLayout ONFLayout = new FrameLayout
-        {
-            Height = Application.GetRealWidth(40),
-            Width = Application.GetRealWidth(40),
-            Radius = (uint)Application.GetRealWidth(20),
-            BackgroundColor = MusicColor.WhiteColor,
-            Gravity = Gravity.CenterHorizontal,
-        };
-
-       public Button ONButton = new Button
-        {
-            Text = "ON",
-            Gravity = Gravity.Center,
-            TextColor = MusicColor.MusicTxet14SelectedColor,
-            TextSize = TextSize.Text14,
-            IsBold=true,
-        };
-
-       public Button btnName = new Button
-        {
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(17),
-            TextSize = TextSize.Text12,
-            TextColor = MusicColor.TextColor,
-            TextAlignment = TextAlignment.Center,
-            Gravity = Gravity.CenterHorizontal,
-            Padding = new Padding(0, 8, 0, 8),
-            IsMoreLines = true,
-            Text="none"
-        };
-
-        public FrameLayout OFFFLayout = new FrameLayout
-        {
-            Height = Application.GetRealWidth(40),
-            Width = Application.GetRealWidth(40),
-            Radius = (uint)Application.GetRealWidth(20),
-            BackgroundColor = MusicColor.WhiteColor,
-            Gravity = Gravity.CenterHorizontal,
-        };
-
-        public Button OFFButton = new Button
-        {
-            Text = "OFF",
-            Gravity = Gravity.Center,
-            TextColor = 0xFFA5AEBC,
-            TextSize = TextSize.Text14,
-            IsBold = true,
-        };
-
-
-        /// <summary>
-        /// 娣诲姞甯冨眬
-        /// </summary>
-        /// <param name="parent"></param>
-         public void AddView(FrameLayout parent)
-        {
-            parent.AddChidren(this);
-            this.AddChidren(ONFLayout);
-            ONFLayout.AddChidren(ONButton);
-            this.AddChidren(btnName);
-            this.AddChidren(OFFFLayout);
-            OFFFLayout.AddChidren(OFFButton);
-            ONFLayout.Y = Application.GetRealHeight(11);
-            btnName.Y = ONFLayout.Bottom + Application.GetRealHeight(11);
-            OFFFLayout.Y = btnName.Bottom + Application.GetRealHeight(11);
-
-        }
-
-
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;绗簩涓槸鍥炬爣瀵硅薄</param>
-         public void SetONClickListener(Action<FrameLayout, Button> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                ONFLayout.BackgroundColor = MusicColor.WhiteColor;
-                ONButton.TextColor = MusicColor.MusicTxet14SelectedColor;
-
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            ONFLayout.MouseUpEventHandler += UpClick;
-            ONButton.MouseUpEventHandler += UpClick;
-
-
-            //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
-            //{
-            //    this.BackgroundColor = 0x00000000;
-            //    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            //};
-            //this.MouseMoveEventHandler += MoveClick;
-            //btnImage.MouseMoveEventHandler += MoveClick;
-            //btnName.MouseMoveEventHandler += MoveClick;
-
-            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            {
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                ONFLayout.BackgroundColor = MusicColor.MusicTxet14SelectedColor;
-                ONButton.TextColor = MusicColor.WhiteColor;
-                action?.Invoke(ONFLayout, ONButton);
-            };
-            ONFLayout.MouseDownEventHandler += DownClick;
-            ONButton.MouseDownEventHandler += DownClick;
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;绗簩涓槸鍥炬爣瀵硅薄</param>
-        public void SetOFFClickListener(Action<FrameLayout, Button> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                action?.Invoke(OFFFLayout, OFFButton);
-                OFFFLayout.BackgroundColor = MusicColor.WhiteColor;
-                OFFButton.TextColor = 0xFFA5AEBC;
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            OFFFLayout.MouseUpEventHandler += UpClick;
-            OFFButton.MouseUpEventHandler += UpClick;
-
-
-            EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
-            {
-                OFFFLayout.BackgroundColor = MusicColor.WhiteColor;
-                OFFButton.TextColor = 0xFFA5AEBC;
-                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            };
-            OFFFLayout.MouseUpOutsideEventHandler += CancelClick;
-            OFFButton.MouseUpOutsideEventHandler += CancelClick;
-
-            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
-            {
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                OFFFLayout.BackgroundColor = MusicColor.MusicTxet14SelectedColor;
-                OFFButton.TextColor = MusicColor.WhiteColor;
-                
-            };
-            OFFFLayout.MouseDownEventHandler += DownClick;
-            OFFButton.MouseDownEventHandler += DownClick;
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs
deleted file mode 100644
index c3b59a0..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs
+++ /dev/null
@@ -1,549 +0,0 @@
-锘縰sing Shared;
-using System;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-	/// 褰辩墖璇︽儏鐣岄潰
-	/// </summary>
-    public class DetailPage : FrameLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="movieLibrary">褰辩墖瀵硅薄</param>
-        public DetailPage(RemoteControlEntity remoteControlEntity, MovieLibrary movieLibrary)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.movieLibrary = movieLibrary;
-            //浠庣紦瀛樿幏鍙�
-            this.movieLibraryInfo = AksCommonMethod.Current.GetMovieLibraryInfo(remoteControl.rcId + "_" + movieLibrary.movieId);
-        }
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        RemoteControlEntity remoteControl;
-        /// <summary>
-        /// 褰辩墖璇︽儏
-        /// </summary>
-        MovieLibraryInfoEntity movieLibraryInfo;
-
-        /// <summary>
-        /// 澶撮儴甯冨眬
-        /// </summary>
-        private TopView topView;
-
-        /// <summary>
-        /// 绔嬪嵆鎾斁
-        /// </summary>
-        Button btnPaly;
-
-        /// <summary>
-        /// 褰辩墖
-        /// </summary>
-        MovieLibrary movieLibrary;
-
-        /// <summary>
-        /// 骞翠唤
-        /// </summary>
-        Button btnYear;
-        /// <summary>
-        /// 鍦板尯
-        /// </summary>
-        Button btnRegion;
-        /// <summary>
-        /// 鏀惰棌
-        /// </summary>
-        Button btnCollectImage;
-        Button btnCollectText;
-        /// <summary>
-        /// 鐢靛奖绠�浠嬪唴瀹�
-        /// </summary>
-        Button btnIntroduceContent;
-        /// <summary>
-        /// 婕斿憳鍥剧墖鍒楄〃瀹瑰櫒
-        /// </summary>
-        HorizontalScrolViewLayout horizontalFram;
-
-        public Action<bool> action;
-
-
-        private bool isOldState;
-
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitTop();
-            this.InitMiddle();
-            //鍒濆鍖栦簨浠�
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            ReadData();
-
-        }
-        /// <summary>
-        /// 鍒濆鍖栧ご閮ㄧ晫闈�
-        /// </summary>
-        private void InitTop()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = false;
-            this.topView.topNameBtn.TextID = StringId.yingpianjieshao;
-            this.AddChidren(topView.TopFLayoutView());
-        }
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄧ晫闈�
-        /// </summary>
-        private void InitMiddle()
-        {
-            var vv = new VerticalRefreshLayout
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-                BackgroundColor = MusicColor.WhiteColor,
-            };
-            this.AddChidren(vv);
-            vv.BeginHeaderRefreshingAction += () =>
-            {
-                vv.EndHeaderRefreshing();
-                movieLibraryInfo = null;
-                ReadData();
-            };
-
-            BaseFramLayout baseFramLayout = new BaseFramLayout();
-            vv.AddChidren(baseFramLayout);
-
-            ImageView btnImage = new ImageView
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(16),
-                Width = Application.GetRealWidth(140),
-                Height = Application.GetRealHeight(180),
-                Radius = (uint)Application.GetRealHeight(12),
-                ImageBytes = movieLibrary.imageBytes,
-            };
-            baseFramLayout.AddChidren(btnImage);
-            //鐢靛奖鍚嶇О
-            Button btnName = new Button
-            {
-                X = btnImage.Right + Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(36),
-                Width = Application.GetRealWidth(178),
-                Height = Application.GetRealHeight(45),
-                Text = movieLibrary.name,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                TextAlignment = TextAlignment.CenterLeft,
-                IsBold = true,
-                IsMoreLines = true,
-            };
-            baseFramLayout.AddChidren(btnName);
-            this.AdjustRealWidth(btnName, 178);
-
-            //骞翠唤
-            btnYear = new Button
-            {
-                X = btnImage.Right + Application.GetRealWidth(16),
-                Y = btnName.Bottom + Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(34),
-                Height = Application.GetRealHeight(20),
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text14,
-                TextAlignment = TextAlignment.CenterLeft,
-                Text = movieLibraryInfo == null ? "" : movieLibraryInfo.releaseDate,
-            };
-            baseFramLayout.AddChidren(btnYear);
-            this.AdjustRealWidth(btnYear, 34);
-
-            //"/"
-            Button btnSlope = new Button
-            {
-                X = btnYear.Right + Application.GetRealWidth(8),
-                Y = btnName.Bottom + Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(34),
-                Height = Application.GetRealHeight(20),
-                Text = "/",
-                TextColor = MusicColor.LineColor,
-                TextSize = TextSize.Text14,
-            };
-            baseFramLayout.AddChidren(btnSlope);
-
-            //鍦板尯
-            btnRegion = new Button
-            {
-                X = btnSlope.Right + Application.GetRealWidth(8),
-                Y = btnName.Bottom + Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(140),
-                Height = Application.GetRealHeight(20),
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text14,
-                TextAlignment = TextAlignment.CenterLeft,
-                Text = movieLibraryInfo == null ? "" : movieLibraryInfo.area,
-            };
-            baseFramLayout.AddChidren(btnRegion);
-            this.AdjustRealWidth(btnRegion, 140);
-
-
-            //鐢靛奖鍒嗘暟
-            Button btnGrade = new Button
-            {
-                X = btnImage.Right + Application.GetRealWidth(16),
-                Y = btnYear.Bottom + Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(45),
-                Height = Application.GetRealHeight(43),
-                Text = movieLibraryInfo == null ? "" : movieLibraryInfo.rating,
-                TextSize = 32,
-                TextColor = MusicColor.TextColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                IsBold = true,
-            };
-            baseFramLayout.AddChidren(btnGrade);
-            this.AdjustRealWidth(btnGrade, 45);
-
-            //
-            Button btnScore = new Button
-            {
-                X = btnGrade.Right + Application.GetRealWidth(8),
-                Y = btnYear.Bottom + Application.GetRealHeight(46),
-                Width = Application.GetRealWidth(26),
-                Height = Application.GetRealHeight(17),
-                TextID = StringId.pingfen,
-                TextColor = 0xffA5AEBC,
-                TextSize = TextSize.Text12,
-                TextAlignment = TextAlignment.CenterLeft,
-            };
-            baseFramLayout.AddChidren(btnScore);
-
-
-            btnCollectImage = new Button
-            {
-                X = btnImage.Right + Application.GetRealWidth(167),
-                Y = btnRegion.Bottom + Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(32),
-                Height = Application.GetRealWidth(32),
-                UnSelectedImagePath = "MusicIcon/collect.png",
-                SelectedImagePath = "MusicIcon/collectSelected.png",
-                IsSelected = movieLibraryInfo == null ? false : movieLibraryInfo.collect,
-            };
-            baseFramLayout.AddChidren(btnCollectImage);
-
-
-            btnCollectText = new Button
-            {
-                X = btnImage.Right + Application.GetRealWidth(169),
-                Y = btnCollectImage.Bottom + Application.GetRealHeight(2),
-                Width = Application.GetRealWidth(36),
-                Height = Application.GetRealHeight(17),
-                TextID = StringId.weishoucang,
-                TextColor = 0xffA5AEBC,
-                TextSize = TextSize.Text12,
-                TextAlignment = TextAlignment.CenterLeft,
-            };
-            baseFramLayout.AddChidren(btnCollectText);
-            if (btnCollectImage.IsSelected) {
-                btnCollectText.TextID = StringId.yishoucang;
-            } else {
-                btnCollectText.TextID = StringId.weishoucang;
-            }
-            isOldState = btnCollectImage.IsSelected;
-
-            //鐢靛奖绠�浠�
-            Button btnIntroduceTitle = new Button
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnImage.Bottom + Application.GetRealHeight(28),
-                Width = Application.GetRealWidth(300),
-                Height = Application.GetRealHeight(23),
-                //TextID = StringId.,
-                Text = "鐢靛奖绠�浠�",
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                TextAlignment = TextAlignment.CenterLeft,
-                IsBold = true,
-            };
-            baseFramLayout.AddChidren(btnIntroduceTitle);
-
-
-            //鐢靛奖绠�浠嬪唴瀹�
-            btnIntroduceContent = new Button
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnIntroduceTitle.Bottom + Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(140),
-                //TextID = StringId.,
-                TextColor = MusicColor.TextCancelColor,
-                TextSize = TextSize.Text14,
-                TextAlignment = TextAlignment.TopLeft,
-                IsBold = true,
-                IsMoreLines = true,
-                Text = movieLibraryInfo == null ? "" : movieLibraryInfo.introduction,
-            };
-            baseFramLayout.AddChidren(btnIntroduceContent);
-
-            #region -----婕斿憳鐓х墖 鍚嶇О------
-            //婕斿憳
-            Button btnActor = new Button
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnIntroduceContent.Bottom + Application.GetRealHeight(28),
-                Width = Application.GetRealWidth(300),
-                Height = Application.GetRealHeight(23),
-                //TextID = StringId.yan,
-                Text = "婕斿憳",
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                TextAlignment = TextAlignment.CenterLeft,
-                IsBold = true,
-            };
-            baseFramLayout.AddChidren(btnActor);
-
-
-            horizontalFram = new HorizontalScrolViewLayout
-            {
-                Y = btnActor.Bottom + Application.GetRealHeight(12),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(112),
-                Width = Application.GetRealWidth(375 - 16),
-            };
-            baseFramLayout.AddChidren(horizontalFram);
-            LoadActorPage();
-
-            #endregion
-
-            //绔嬪嵆鎾斁
-            btnPaly = new Button
-            {
-                Y = horizontalFram.Bottom + Application.GetRealHeight(70),
-                Width = Application.GetRealWidth(220),
-                Height = Application.GetRealHeight(44),
-                TextID = StringId.lijibofang,
-                TextColor = MusicColor.WhiteColor,
-                TextSize = TextSize.Text16,
-                TextAlignment = TextAlignment.Center,
-                Gravity = Gravity.CenterHorizontal,
-                BackgroundColor = MusicColor.SelectedColor,
-                Radius = (uint)Application.GetRealHeight(22),
-            };
-            baseFramLayout.AddChidren(btnPaly);
-
-            baseFramLayout.AdjustRealHeight(37);
-        }
-        /// <summary>
-        /// 鍔犺浇婕斿憳鍥剧墖鍒楄〃
-        /// </summary>
-        private void LoadActorPage()
-        {
-            if (this.movieLibraryInfo == null || this.movieLibraryInfo.actors.Count == 0)
-            {
-                return;
-            }
-            for (int i = 0; i < this.movieLibraryInfo.actors.Count; i++)
-            {
-                var actors = this.movieLibraryInfo.actors[i];
-                FrameLayout actorFrame = new FrameLayout
-                {
-                    Height = Application.GetRealHeight(112),
-                    Width = Application.GetRealWidth(72),
-                };
-                horizontalFram.AddChidren(actorFrame);
-
-                ImageView btnActorImage = new ImageView
-                {
-                    Width = Application.GetRealWidth(72),
-                    Height = Application.GetRealHeight(84),
-                    Radius = (uint)Application.GetRealHeight(8),
-                    ImageBytes = actors.imageBytes,
-                };
-                actorFrame.AddChidren(btnActorImage);
-
-
-                Button btnActorName = new Button
-                {
-                    Y = btnActorImage.Bottom + Application.GetRealHeight(8),
-                    Width = Application.GetRealWidth(72),
-                    Height = Application.GetRealHeight(20),
-                    TextSize = TextSize.Text14,
-                    TextColor = MusicColor.TextColor,
-                    TextAlignment = TextAlignment.Center,
-                    IsMoreLines = true,
-                    Text = actors.actorName,
-                };
-                actorFrame.AddChidren(btnActorName);
-
-                //闂撮殧,寮勪釜绌虹殑杩涘幓鍗犱綅缃�
-                Button btnSpacing = new Button
-                {
-                    Width = Application.GetRealWidth(8),
-                };
-                horizontalFram.AddChidren(btnSpacing);
-            }
-        }
-
-        /// <summary>
-        /// 娉ㄥ唽浜嬩欢
-        /// </summary>
-        private void EventListener()
-        {
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                action?.Invoke(isOldState != btnCollectImage.IsSelected);
-                this.RemoveFromParent();
-            };
-            //绔嬪嵆鎾斁
-            this.btnPaly.MouseUpEventHandler += (sender, e) =>
-            {
-                CommonMethod.Current.Loading.Start();
-                CommonMethod.Current.SunThread(() =>
-                {
-                    try
-                    {
-                        SendMethod.Current.MovieLibraryPlay(remoteControl.deviceId, remoteControl.rcId, movieLibrary.movieId);
-                    }
-                    catch { }
-                    finally
-                    {
-                        CommonMethod.Current.MainThread(() =>
-                        {
-                            CommonMethod.Current.Loading.Hide();
-                        });
-                    }
-                });
-            };
-            //鏀惰棌
-            EventHandler<MouseEventArgs> CollectClick = (sender, e) =>
-             {
-                 btnCollectImage.IsSelected = !btnCollectImage.IsSelected;
-                 if (btnCollectImage.IsSelected)
-                 {
-                     btnCollectText.TextID = StringId.yishoucang;
-                 }
-                 else
-                 {
-                     btnCollectText.TextID = StringId.weishoucang;
-                 }
-                 CommonMethod.Current.Loading.Start();
-                 CommonMethod.Current.SunThread(() =>
-                 {
-                     try
-                     {
-                         var isBool = SendMethod.Current.IsCollect(remoteControl.deviceId, remoteControl.rcId, movieLibrary.movieId, btnCollectImage.IsSelected);
-                         if (isBool)
-                         {
-                             //鏇存柊缂撳瓨鏁版嵁
-                             movieLibraryInfo.collect = btnCollectImage.IsSelected;
-                             //鎴愬姛鍚庢墠鏇存柊缂撳瓨鏁版嵁
-                             if (btnCollectImage.IsSelected)
-                             {
-                                 
-                                 AksCommonMethod.Current.AddCollectMovie(movieLibrary);
-                             }
-                             else
-                             {
-                                 AksCommonMethod.Current.DelCollectMovie(movieLibrary);
-                             }
-                           
-                         }
-                     }
-                     catch { }
-                     finally
-                     {
-                         CommonMethod.Current.MainThread(() =>
-                         {
-                             CommonMethod.Current.Loading.Hide();
-                         });
-                     }
-                 });
-             };
-            btnCollectImage.MouseUpEventHandler += CollectClick;
-            btnCollectText.MouseUpEventHandler += CollectClick;
-
-        }
-
-        /// <summary>
-        /// 鍒濆鏁版嵁
-        /// </summary>
-        private void ReadData()
-        {
-            if (this.movieLibraryInfo != null)
-            {
-                return;
-            }
-
-           
-
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    this.movieLibraryInfo = SendMethod.Current.GetMovieLibraryInfo(remoteControl.deviceId, remoteControl.rcId, movieLibrary.movieId);
-                    if (movieLibraryInfo.actors.Count == 0)
-                    {
-                        return;
-                    }
-                    for (int i = 0; i < movieLibraryInfo.actors.Count; i++)
-                    {
-                        movieLibraryInfo.actors[i].imageBytes = SendMethod.Current.GetImage(movieLibraryInfo.actors[i].actorUrl);
-                    }
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-                        btnYear.Text = movieLibraryInfo.releaseDate;
-                        btnRegion.Text = movieLibraryInfo.area;
-                        btnCollectImage.IsSelected = movieLibraryInfo.collect;
-                        btnIntroduceContent.Text = movieLibraryInfo.introduction;
-                        LoadActorPage();
-                        AksCommonMethod.Current.AddMovieLibraryInfo(movieLibraryInfo);
-                    });
-                }
-            });
-        }
-        /// <summary>
-        /// 閲嶆柊璁$畻button瀹藉害
-        /// </summary>
-        /// <param name="button">鎺т欢</param>
-        /// <param name="widthMax">瀹藉害鏈�澶ф渶</param>
-        /// <param name="padding">鍐呰竟璺�</param>
-        private void AdjustRealWidth(Button button, int widthMax = 0, int padding = 0)
-        {
-            if (button == null)
-            {
-                return;
-            }
-            int width;
-            if (widthMax == 0)
-            {
-                //鍐呰竟璺�
-                width = button.GetTextWidth() + Application.GetRealWidth(padding * 2);
-            }
-            else
-            {
-                if (button.GetTextWidth() > Application.GetRealWidth(widthMax))
-                {
-
-                    width = Application.GetRealWidth(widthMax);
-                }
-                else
-                {
-                    width = button.GetTextWidth();
-                }
-
-            }
-
-            button.Width = width;
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/FilterCategoryEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/FilterCategoryEntity.cs
deleted file mode 100644
index e2750ce..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/FilterCategoryEntity.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.Entity
-{
-    /// <summary>
-    /// 褰卞簱鍒嗙被瀹炰綋
-    /// </summary>
-    public class FilterCategoryEntity
-    {
-        /// <summary>
-        /// 涓�绾у垎绫绘爣璇�
-        /// </summary>
-        public string category = string.Empty;
-        /// <summary>
-        /// 涓�绾у垎绫诲悕绉�
-        /// </summary>
-        public string name = string.Empty;
-
-        public List<Filters> filters = new List<Filters>();
-
-    }
-    /// <summary>
-    /// 鍒嗙被杩囨护
-    /// </summary>
-    public class Filters
-    {
-        /// <summary>
-        /// 涓�绾у垎绫绘爣璇�(鑷畾涔�)
-        /// </summary>
-        public string category = string.Empty;
-        /// <summary>
-        /// 浜岀骇鍒嗙被杩囨护鍊�
-        /// </summary>
-        public string filterValue = string.Empty;
-        /// <summary>
-        /// 浜岀骇鍒嗙被杩囧悕绉�
-        /// </summary>
-        public string filterName = string.Empty;
-    }
-
-  
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs
deleted file mode 100644
index 4d6479e..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.Entity
-{
-    /// <summary>
-    /// 鎸夐敭瀹炰綋
-    /// </summary>
-    public class KeypadEntity: Filters
-    {
-        /// <summary>
-        /// 鎸夐敭璇嗗埆鐮�
-        /// </summary>
-        public string keypad = string.Empty;
-        /// <summary>
-        /// 鎸夐敭鍚嶇О
-        /// </summary>
-        public string name = string.Empty;
-        /// <summary>
-        /// 鎸夐敭鏈湴鍥炬爣鍦板潃(鑷畾涔�)
-        /// </summary>
-        public string localIconAddress = string.Empty;
-        /// <summary>
-        /// 鏄惁鍙互鐐瑰嚮(鑷畾涔�)
-        /// </summary>
-        public bool isClicked = true;
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/MovieLibraryEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/MovieLibraryEntity.cs
deleted file mode 100644
index 6100184..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/MovieLibraryEntity.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.Entity
-{
-    /// <summary>
-    /// 褰辩墖鍒嗛〉鑾峰彇瀹炰綋
-    /// </summary>
-    public class MovieLibraryEntity
-    {
-
-        public List<MovieLibrary> list = new List<MovieLibrary>();
-        /// <summary>
-        /// 鎬绘潯鏁�
-        /// </summary>
-        public long totalCount;
-        /// <summary>
-        /// 鎬婚〉鏁�
-        /// </summary>
-        public long totalPage;
-        /// <summary>
-        /// 褰撳墠椤�
-        /// </summary>
-        public long pageNo;
-        /// <summary>
-        /// 椤垫暟
-        /// </summary>
-        public long pageSize;
-
-
-       
-    }
-
-    public class MovieLibrary
-    {
-        /// <summary>
-        /// 褰辩墖id
-        /// </summary>
-        public string movieId = string.Empty;
-        /// <summary>
-        /// 褰辩墖鍚嶇О
-        /// </summary>
-        public string name = string.Empty;
-        /// <summary>
-        /// 褰辩墖娴锋姤鍥剧墖
-        /// </summary>
-        public string posterUrl = string.Empty;
-        /// <summary>
-        /// 璇勫垎
-        /// </summary>
-        public string rating = string.Empty;
-        /// <summary>
-        /// 褰辩墖鏁版嵁
-        /// </summary>
-        public byte[] imageBytes;
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/MovieLibraryInfoEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/MovieLibraryInfoEntity.cs
deleted file mode 100644
index 0e0cced..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/MovieLibraryInfoEntity.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.Entity
-{
-    /// <summary>
-    /// 褰辩墖璇︽儏瀹炰綋
-    /// </summary>
-    public class MovieLibraryInfoEntity
-    {
-        /// <summary>
-        /// 閬ユ帶鍣╥d(鑷畾涔�)
-        /// </summary>
-        public string rcId = string.Empty;
-        /// <summary>
-        /// 璁惧id(鑷畾涔�)
-        /// </summary>
-        public string deviceId = string.Empty;
-        /// <summary>
-        /// 褰辩墖id
-        /// </summary>
-        public string movieId = string.Empty;
-        /// <summary>
-        /// 褰辩墖鍚嶇О
-        /// </summary>
-        public string name = string.Empty;
-        /// <summary>
-        /// 鏀惰棌鐘舵��
-        /// </summary>
-        public bool collect;
-        /// <summary>
-        /// 褰辩墖娴锋姤鍥剧墖鍦板潃
-        /// </summary>
-        public string posterUrl = string.Empty;
-        /// <summary>
-        /// 涓婃槧鏃堕棿
-        /// </summary>
-        public string releaseDate = string.Empty;
-        /// <summary>
-        /// 鍦板尯
-        /// </summary>
-        public string area = string.Empty;
-        /// <summary>
-        /// 璇勫垎
-        /// </summary>
-        public string rating = string.Empty;
-        /// <summary>
-        /// 绠�浠�
-        /// </summary>
-        public string introduction = string.Empty;
-        /// <summary>
-        /// 涓绘紨鍒楄〃
-        /// </summary>
-        public List<Actors> actors = new List<Actors>();
-
-
-    }
-
-
-    public class Actors
-    {
-        /// <summary>
-        /// 涓绘紨鍥剧墖鍦板潃
-        /// </summary>
-        public string actorUrl = string.Empty;
-        /// <summary>
-        /// 涓绘紨鍚嶇О
-        /// </summary>
-        public string actorName = string.Empty;
-        /// <summary>
-        /// 褰辩墖鏁版嵁(鑷畾涔�)
-        /// </summary>
-        public byte[] imageBytes;
-
-    }
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs
deleted file mode 100644
index 467373a..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.Entity
-{
-    /// <summary>
-    /// 閬ユ帶鍣ㄥ疄浣�
-    /// </summary>
-    public class RemoteControlEntity
-    {
-
-        /// <summary>
-        /// 鑷畾涔夌殑
-        /// </summary>
-        public string deviceId = string.Empty;
-        /// <summary>
-        /// 1 = 鎾斁鍣�
-        ///2 = 鍔熸斁
-        ///3 = 鐢佃
-        ///4 = 鏈洪《鐩�
-        ///5 = 鎶曞奖浠�
-        ///6 = 涓囪兘閬ユ帶鍣�
-        /// </summary>
-        public int type;
-        /// <summary>
-        /// 閬ユ帶鍣╥d
-        /// </summary>
-        public string rcId = string.Empty;
-        /// <summary>
-        /// 閬ユ帶鍣ㄥ悕绉�
-        /// </summary>
-        public string name = string.Empty;
-        /// <summary>
-        /// 鎸夐敭鍒楄〃
-        /// </summary>
-        public List<KeypadEntity> keypads = new List<KeypadEntity>();
-
-    }
-
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/SequencerEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/SequencerEntity.cs
deleted file mode 100644
index 7e1d3a7..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/SequencerEntity.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing System;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks.Entity
-{
-    /// <summary>
-    /// 鏃跺簭鍣ㄥ疄浣�
-    /// </summary>
-    public class SequencerEntity
-    {
-        /// <summary>
-        ///1 = 鏍囧噯
-        ///2 = 鑷畾涔�
-        /// </summary>
-        public int type;
-        /// <summary>
-        /// 鏃跺簭鍣╥d
-        /// </summary>
-        public string seqId = string.Empty;
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ悕绉�
-        /// </summary>
-        public string name = string.Empty;
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
deleted file mode 100644
index 11e01c8..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-锘�                     using System;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-	/// 鍔熸斁鐣岄潰
-	/// </summary>
-    public class GfPage : BaseFramLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        public GfPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.sequencerList = sequencerList;
-        }
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        private RemoteControlEntity remoteControl;
-        public Action<IntType> action;
-        CornerFramLayout cornerFram;
-        TypeMultiFramLayout typeMultiFramLayout;
-        TypeSingleFramLayout gfSingleFramLayout;
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠剁洃鍚櫒
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        private void ReadData()
-        {
-
-        }
-
-        private void EventListener()
-        {
-            cornerFram.selectKeyAction += (keypadEntity) => 
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-
-            if (gfSingleFramLayout != null)
-            {
-                //璁惧鍒囨崲
-                gfSingleFramLayout.SetClickListener((f) =>
-                {
-                    action?.Invoke(IntType.HiFi);
-                });
-            }
-
-            if (typeMultiFramLayout != null)
-            {
-                //鏃跺簭鍣�
-                typeMultiFramLayout.SetLeftFlClickListener((f) =>
-                {
-                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
-                    MainPage.BasePageView.AddChidren(sxqPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    sxqPage.Show();
-
-                });
-                //璁惧鍒囨崲
-                typeMultiFramLayout.SetRightFlClickListener((f) =>
-                {
-                    action?.Invoke(IntType.HiFi);
-                });
-            }
-
-        }
-
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            Button btnTitle = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(22),
-                Width = Application.GetRealWidth(200),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                Text = this.remoteControl.name,
-                IsBold = true,
-            };
-            this.AddChidren(btnTitle);
-
-
-
-            cornerFram = new CornerFramLayout(343, 284 - 18, 17);
-            cornerFram.X = Application.GetRealWidth(16);
-            cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
-            this.AddChidren(cornerFram);
-            cornerFram.SetMargin(16, 0, 16, 0);
-            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetGFKeypadList(this.remoteControl), 4);
-
-
-            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 72, 17);
-            cornerBottomFram.X = Application.GetRealWidth(16);
-            cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);
-            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-            cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
-            this.AddChidren(cornerBottomFram);
-
-
-            if (sequencerList.Count == 0)
-            {
-                //娌℃湁鏃跺簭鍣�
-                gfSingleFramLayout = new TypeSingleFramLayout();
-                gfSingleFramLayout.AddView(cornerBottomFram);
-                gfSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
-                gfSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
-                gfSingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical;
-                gfSingleFramLayout.btnName.Text = this.remoteControl.name;
-                gfSingleFramLayout.btnName.X = Application.GetRealWidth(16);
-                gfSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
-                gfSingleFramLayout.btnRightImage.X = gfSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                gfSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
-                gfSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
-                gfSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
-                gfSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
-                gfSingleFramLayout.btnLeftImage.Visible = false;
-                gfSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
-                gfSingleFramLayout.singleFramLayout,
-                gfSingleFramLayout.btnName,
-                gfSingleFramLayout.btnRightImage,
-                48, 200);
-            }
-            else
-            {
-                //鏈夋椂搴忓櫒
-                typeMultiFramLayout = new TypeMultiFramLayout();
-                typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
-                typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
-
-            }
-            this.AdjustRealHeight(16);
-
-
-
-
-        }
-
-        /// <summary>
-        /// 鎸夐敭鎺у埗
-        /// </summary>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
-        private void KeyControl(string keypad, string keyName, bool isSupport)
-        {
-            //CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
deleted file mode 100644
index a635f30..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ /dev/null
@@ -1,388 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鏈洪《鐩掔晫闈�
-    /// </summary>
-    public class JdhPage:BaseFramLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        public JdhPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.sequencerList = sequencerList;
-        }
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        private RemoteControlEntity remoteControl;
-
-        public Action<IntType> action;
-        /// <summary>
-        /// 鏈�涓婇潰鍔熻兘閿鍣�
-        /// </summary>
-        CornerFramLayout cornerTopFram;
-        /// <summary>
-        /// 鏁板瓧鎸夐敭瀹瑰櫒
-        /// </summary>
-        CornerFramLayout numberFrame;
-        /// <summary>
-        /// 鑿滃崟瀹瑰櫒
-        /// </summary>
-        MenuFramLayout menuFram;
-        /// <summary>
-        /// 鍒囨崲璁惧瀹瑰櫒
-        /// </summary>
-        TypeMultiFramLayout typeMultiFramLayout;
-
-        TypeSingleFramLayout jdhSingleFramLayout; 
-
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠剁洃鍚櫒
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        private void ReadData()
-        {
-
-        }
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鍣�
-        /// </summary>
-        private void EventListener()
-        {
-            //鍔熻兘閿帶鍒�
-            cornerTopFram.selectKeyAction += (keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-            //鏁板瓧閿帶鍒�
-            numberFrame.selectKeyAction += (keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-            //鑿滃崟涓婃寜閿�
-            menuFram.SetTopClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟涓嬫寜閿�
-            menuFram.SetBottomClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟宸︽寜閿�
-            menuFram.SetLeftClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟鍙虫寜閿�
-            menuFram.SetRightClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟ok鎸夐敭
-            menuFram.SetOkClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-
-            if (jdhSingleFramLayout != null)
-            {
-
-                //璁惧鍒囨崲
-                jdhSingleFramLayout.SetClickListener((f) =>
-                {
-                    action?.Invoke(IntType.STB);
-                });
-            }
-            if (typeMultiFramLayout != null)
-            {
-                //鏃跺簭鍣�
-                typeMultiFramLayout.SetLeftFlClickListener((f) =>
-                {
-                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
-                    MainPage.BasePageView.AddChidren(sxqPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    sxqPage.Show();
-
-                });
-                //璁惧鍒囨崲
-                typeMultiFramLayout.SetRightFlClickListener((f) =>
-                {
-                    action?.Invoke(IntType.STB);
-                });
-            }
-
-        }
-
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            Button btnTitle = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(22),
-                Width = Application.GetRealWidth(200),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                Text= this.remoteControl.name,
-                IsBold = true,
-            };
-            this.AddChidren(btnTitle);
-
-            cornerTopFram = new CornerFramLayout(343, 368-24, 17);
-            cornerTopFram.X = Application.GetRealWidth(16);
-            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
-            this.AddChidren(cornerTopFram);
-            cornerTopFram.SetMargin(16, 0, 16, 0);
-            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(this.remoteControl),new List<int> { 5, 6 });
-
-            #region  ----棰戦亾 鎺у埗----
-            FrameLayout middLayout = new FrameLayout
-            {
-                Y = cornerTopFram.Bottom,
-                Height = Application.GetRealHeight(61),
-            };
-            this.AddChidren(middLayout);
-
-            FrameLayout leftLayout = new FrameLayout
-            {
-                X = Application.GetRealWidth(105),
-                Y = Application.GetRealHeight(16),
-                Height = Application.GetRealHeight(29),
-                Width = Application.GetRealWidth(32),
-
-            };
-            middLayout.AddChidren(leftLayout);
-
-
-            Button leftBtnTitle = new Button
-            {
-                Height = Application.GetRealHeight(22),
-                Width = leftLayout.Width,
-                TextAlignment = TextAlignment.Center,
-                TextColor = MusicColor.TextColor,
-                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-                TextSize = TextSize.Text16,
-                TextID = StringId.pindao,
-                Padding = new Padding(0, 0, 0, 0),
-                IsBold = true,
-            };
-            leftLayout.AddChidren(leftBtnTitle);
-
-
-            Button leftBtnLine = new Button
-            {
-                Y = leftBtnTitle.Bottom + Application.GetRealHeight(4),
-                Height = Application.GetRealHeight(2),
-                Width = leftBtnTitle.GetTextWidth(),
-                BackgroundColor = MusicColor.TextColor,
-                SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-                Gravity = Gravity.CenterHorizontal,
-            };
-            leftLayout.AddChidren(leftBtnLine);
-            //棰戦亾鐐瑰嚮鎺т欢
-            FrameLayout clickLeftLayout = new FrameLayout
-            {
-                Height = leftLayout.Height,
-                Width = leftLayout.Width,
-            };
-            leftLayout.AddChidren(clickLeftLayout);
-
-
-            FrameLayout rightLayout = new FrameLayout
-            {
-                X = leftLayout.Right + Application.GetRealWidth(100),
-                Y = leftLayout.Y,
-                Height = leftLayout.Height,
-                Width = leftLayout.Width,
-            };
-            middLayout.AddChidren(rightLayout);
-
-
-            Button rightBtnTitle = new Button
-            {
-                Height = Application.GetRealHeight(22),
-                Width = rightLayout.Width,
-                TextAlignment = TextAlignment.Center,
-                TextColor = MusicColor.TextColor,
-                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-                TextSize = TextSize.Text16,
-                TextID = StringId.kongzhi,
-                Padding = new Padding(0, 0, 0, 0),
-                IsBold=true,
-            };
-            rightLayout.AddChidren(rightBtnTitle);
-
-            Button rightBtnLine = new Button
-            {
-                Y = rightBtnTitle.Bottom + Application.GetRealHeight(4),
-                Height = Application.GetRealHeight(2),
-                Width = rightBtnTitle.GetTextWidth(),
-                BackgroundColor = MusicColor.TextColor,
-                SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-                Gravity = Gravity.CenterHorizontal,
-            };
-            rightLayout.AddChidren(rightBtnLine);
-
-            //鐢佃鐐瑰嚮鎺т欢
-            FrameLayout clickRightLayout = new FrameLayout
-            {
-                Height = leftLayout.Height,
-                Width = leftLayout.Width,
-            };
-            rightLayout.AddChidren(clickRightLayout);
-
-
-
-            #endregion
-
-
-            //鏁板瓧鎸夐敭瀹瑰櫒
-            numberFrame = new CornerFramLayout(343, 368-24, 17);
-            numberFrame.X = Application.GetRealWidth(16);
-            numberFrame.Y = middLayout.Bottom;
-            numberFrame.BackgroundColor = MusicColor.WhiteColor;
-            numberFrame.SetMargin(16, 0, 16, 0);
-            numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
-            this.AddChidren(numberFrame);
-
-
-            //鑿滃崟瀹瑰櫒
-            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
-            cornerBottomFram.X = Application.GetRealWidth(16);
-            cornerBottomFram.Y = middLayout.Bottom;
-            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-            this.AddChidren(cornerBottomFram);
-
-            menuFram = new MenuFramLayout();
-            menuFram.Y = Application.GetRealHeight(24);
-            menuFram.AddView(cornerBottomFram);
-
-            if (sequencerList.Count == 0)
-            {
-                //娌℃湁鏃跺簭鍣�
-                jdhSingleFramLayout = new TypeSingleFramLayout();
-                jdhSingleFramLayout.AddView(cornerBottomFram);
-                jdhSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                jdhSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
-                jdhSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
-                jdhSingleFramLayout.btnName.Text = this.remoteControl.name;
-                jdhSingleFramLayout.btnName.X = Application.GetRealWidth(16);
-                jdhSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
-                jdhSingleFramLayout.btnRightImage.X = jdhSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                jdhSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
-                jdhSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
-                jdhSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
-                jdhSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
-                jdhSingleFramLayout.btnLeftImage.Visible = false;
-                jdhSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
-                jdhSingleFramLayout.singleFramLayout,
-                jdhSingleFramLayout.btnName,
-                 jdhSingleFramLayout.btnRightImage,
-                 48, 200);
-            }
-            else
-            {
-
-                typeMultiFramLayout = new TypeMultiFramLayout();
-                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
-            }
-
-            //鍒濆鍊�
-            leftBtnTitle.IsSelected = true;
-            leftBtnLine.IsSelected = true;
-            leftBtnLine.Visible = true;
-            rightBtnTitle.IsSelected = false;
-            rightBtnLine.IsSelected = false;
-            rightBtnLine.Visible = false;
-            numberFrame.Visible = true;
-            cornerBottomFram.Visible = false;
-
-            //棰戦亾鐐瑰嚮浜嬩欢
-            clickLeftLayout.MouseDownEventHandler += (sen, e) =>
-            {
-                leftBtnTitle.IsSelected = true;
-                leftBtnLine.IsSelected = true;
-                leftBtnLine.Visible = true;
-                rightBtnTitle.IsSelected = false;
-                rightBtnLine.IsSelected = false;
-                rightBtnLine.Visible = false;
-                numberFrame.Visible = true;
-                cornerBottomFram.Visible = false;
-                this.AdjustRealHeight(16);
-
-            };
-            //鎺у埗鐐瑰嚮浜嬩欢
-            clickRightLayout.MouseDownEventHandler += (sen, e) =>
-            {
-                leftBtnTitle.IsSelected = false;
-                leftBtnLine.IsSelected = false;
-                leftBtnLine.Visible = false;
-                rightBtnTitle.IsSelected = true;
-                rightBtnLine.IsSelected = true;
-                rightBtnLine.Visible = true;
-                numberFrame.Visible = false;
-                cornerBottomFram.Visible = true;
-                this.AdjustRealHeight(-60);
-
-            };
-
-            this.AdjustRealHeight(16);
-        }
-
-        /// <summary>
-        /// 鎸夐敭鎺у埗
-        /// </summary>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
-        private void KeyControl(string keypad, string keyName, bool isSupport)
-        {
-            //CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
deleted file mode 100644
index 977282f..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鎾斁鍣ㄧ晫闈�
-    /// </summary>
-    public class MusicPage : BaseFramLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        public MusicPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.sequencerList = sequencerList;
-        }
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        private RemoteControlEntity remoteControl;
-        public Action<IntType> action;
-        CornerFramLayout cornerFram;
-        /// <summary>
-        /// 褰卞簱
-        /// </summary>
-        TypeSingleFramLayout ykSingleFramLayout;
-        TypeSingleFramLayout bfqSingleFramLayout;
-        MenuFramLayout menuFram;
-        TypeMultiFramLayout typeMultiFramLayout;
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠�
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        private void ReadData()
-        {
-
-        }
-
-        private void EventListener()
-        {
-
-            cornerFram.selectKeyAction += (keypadEntity) =>
-            {
-
-                if (keypadEntity == null)
-                {
-                    return;
-                }
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-           
-
-            menuFram.SetTopClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            menuFram.SetBottomClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            menuFram.SetLeftClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            menuFram.SetRightClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-
-            });
-            menuFram.SetOkClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-
-
-            if (bfqSingleFramLayout != null)
-            {
-                bfqSingleFramLayout.SetClickListener((f) =>
-                {
-                    action?.Invoke(IntType.Player);
-                });
-            }
-            if (ykSingleFramLayout != null)
-            {
-                ykSingleFramLayout.SetClickListener((f) =>
-                {
-                    YkPage ykPage = new YkPage(this.remoteControl);
-                    MainPage.BasePageView.AddChidren(ykPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    ykPage.Show();
-                });
-            }
-            if (typeMultiFramLayout != null)
-            {
-                typeMultiFramLayout.SetLeftFlClickListener((f) =>
-                {
-                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
-                    MainPage.BasePageView.AddChidren(sxqPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    sxqPage.Show();
-
-                });
-                typeMultiFramLayout.SetRightFlClickListener((f) =>
-                {
-                    action?.Invoke(IntType.Player);
-                });
-            }
-
-        }
-
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            Button btnTitle = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(22),
-                Width = Application.GetRealWidth(200),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                //TextID = StringId.bofangqi,
-                Text = this.remoteControl.name,
-                Padding = new Padding(0, 0, 0, 0),
-                IsBold = true,
-            };
-            this.AddChidren(btnTitle);
-
-            cornerFram = new CornerFramLayout(343, 452 - 30, 17);
-            this.AddChidren(cornerFram);
-            cornerFram.X = Application.GetRealWidth(16);
-            cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
-            cornerFram.SetMargin(16, 0, 16, 0);
-            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(this.remoteControl), 4);
-
-
-            if (sequencerList.Count == 0)
-            {
-                //娌℃湁鏃跺簭鍣�
-                CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364 - 32-32-40, 17);
-                this.AddChidren(cornerBottomFram);
-                cornerBottomFram.X = Application.GetRealWidth(16);
-                cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);
-                cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-                cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
-
-                //鎾斁鍣�
-                bfqSingleFramLayout = new TypeSingleFramLayout();
-                bfqSingleFramLayout.AddView(cornerBottomFram);
-                bfqSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
-                bfqSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(16);
-                bfqSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
-                bfqSingleFramLayout.btnName.Text = this.remoteControl.name;
-                bfqSingleFramLayout.btnName.X= Application.GetRealWidth(16);
-                bfqSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
-                bfqSingleFramLayout.btnRightImage.X = bfqSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                bfqSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
-                bfqSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
-                bfqSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
-                bfqSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
-                bfqSingleFramLayout.btnLeftImage.Visible = false;
-                bfqSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.left,
-                    bfqSingleFramLayout.singleFramLayout,
-                    bfqSingleFramLayout.btnName,
-                     bfqSingleFramLayout.btnRightImage,
-                     48);
-
-                //褰卞簱
-                ykSingleFramLayout = new TypeSingleFramLayout();
-                ykSingleFramLayout.AddView(cornerBottomFram);
-                ykSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
-                ykSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
-
-                menuFram = new MenuFramLayout();
-                menuFram.AddView(cornerBottomFram);
-                menuFram.Y = ykSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);
-                this.AdjustRealHeight(16);
-
-            }
-            else
-            {
-                //鏈夋椂搴忓櫒
-                CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364 - 32, 17);
-                this.AddChidren(cornerBottomFram);
-                cornerBottomFram.X = Application.GetRealWidth(16);
-                cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);
-                cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-                cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
-
-
-                ykSingleFramLayout = new TypeSingleFramLayout();
-                ykSingleFramLayout.AddView(cornerBottomFram);
-                ykSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
-                ykSingleFramLayout.singleFramLayout.Gravity = Gravity.CenterHorizontal;
-
-
-
-                menuFram = new MenuFramLayout();
-                menuFram.AddView(cornerBottomFram);
-                menuFram.Y = ykSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);
-
-
-                typeMultiFramLayout = new TypeMultiFramLayout();
-                typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                //typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi;
-                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
-
-                this.AdjustRealHeight(16);
-            }
-        }
-
-        /// <summary>
-        /// 鎸夐敭鎺у埗
-        /// </summary>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
-        private void KeyControl(string keypad, string keyName, bool isSupport)
-        {
-            //CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
deleted file mode 100644
index 0b0e43a..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-锘縰sing System;
-using Shared;
-using System.Collections.Generic;
-using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
-using HDL_ON.DAL.Server;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using HDL_ON.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using Newtonsoft.Json.Linq;
-using RestSharp;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    public class SendMethod
-    {
-        public SendMethod()
-        {
-        }
-
-        private static SendMethod sendMethod = null;
-        /// <summary>
-        /// 鑾峰彇瀵硅薄
-        /// </summary>
-        public static SendMethod Current
-        {
-            get
-            {
-                if (sendMethod == null)
-                {
-                    sendMethod = new SendMethod();
-                }
-
-                return sendMethod;
-
-            }
-
-        }
-        public const int pageSize=20;
-
-        #region  ------鏃跺簭鍣�-------
-        /// <summary>
-        /// 鑾峰彇鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<SequencerEntity> GetSequencerLits(string deviceId, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", deviceId);
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Aks_XsqList, "鑾峰彇鏃跺簭鍣ㄥ垪琛�");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<SequencerEntity>();
-            }
-            var List = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SequencerEntity>>(responsePackNew.Data.ToString());
-            if (List == null) 
-            {
-                return new List<SequencerEntity>();
-            }
-            return List;
-        }
-
-        /// <summary>
-        /// 鏃跺簭鍣ㄦ墽琛�
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="seqId">鏃跺簭鍣╥d</param>
-        /// <param name="onOff">鏃跺簭鍣ㄥ紑鍏�</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public bool SequencerExecute(string deviceId, string seqId, string onOff, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", deviceId);
-            d.Add("seqId", seqId);//鏃跺簭鍣╥d
-            d.Add("onOff", onOff);//鏃跺簭鍣ㄥ紑鍏�
-            //d.Add("zoneType", deviceId);//鍖哄煙
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Aks_XsqExecute, "鏃跺簭鍣ㄦ墽琛�");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        #endregion
-
-
-        #region   ------閬ユ帶鍣�-------
-        /// <summary>
-        ///鑾峰彇閬ユ帶鍣ㄥ垪琛�
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<RemoteControlEntity> GetRemoteControlLits(string deviceId, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", deviceId);
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Aks_Controlist, "鑾峰彇閬ユ帶鍣ㄥ垪琛�");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<RemoteControlEntity>();
-            }
-            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RemoteControlEntity>>(responsePackNew.Data.ToString());
-            if (list == null)
-            {
-                return new List<RemoteControlEntity>();
-            }
-            if (list.Count > 0)
-            {
-                for (int i = 0; i < list.Count; i++)
-                {
-                    var remoteControl = list[i];
-                    remoteControl.deviceId = deviceId;
-                }
-            }
-          
-            return list;
-        }
-
-        /// <summary>
-        ///閬ユ帶鍣ㄦ寜閿墽琛�
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="rcId">閬ユ帶鍣╥d</param>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public bool KeypadExecute(string deviceId, string rcId, string keypad, string keyName, bool isSupport, TipType tipType = TipType.flicker)
-        {
-
-            //if (!isSupport) {
-            //    CommonMethod.Current.ShowTip("鎸夐敭涓嶆敮鎸�.", 3);
-            //    return false;
-            //}
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", deviceId);//璁惧id
-            d.Add("rcId", rcId);//閬ユ帶鍣╥d
-            d.Add("keypad", keypad);//鎸夐敭鏍囪瘑
-            //d.Add("zoneType", deviceId);//鍖哄煙
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d,NewAPI.Api_Post_Aks_KeypadExecute, $"閬ユ帶鍣ㄣ�恵keyName}銆戞寜閿墽琛�");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return false;
-            }
-            return true;
-        }
-        #endregion
-
-
-        #region   ------褰卞簱-------
-        /// <summary>
-        ///鑾峰彇褰卞簱杩囨护鍒嗙被
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<FilterCategoryEntity> GetFilterCategoryLits(string deviceId, string rcId, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", deviceId);//璁惧id
-            d.Add("rcId", rcId);//閬ユ帶鍣╥d
-            //d.Add("zoneType", deviceId);//鍖哄煙
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Aks_FilterCategory, "鑾峰彇褰卞簱杩囨护鍒嗙被");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<FilterCategoryEntity>();
-            }
-            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FilterCategoryEntity>>(responsePackNew.Data.ToString());
-            if (list == null)
-            {
-                return new List<FilterCategoryEntity>();
-            }
-            if (list.Count > 0)
-            {
-                for (int i = 0; i < list.Count; i++)
-                {
-                    var filterCategory = list[i];
-                    foreach (var o in filterCategory.filters)
-                    {
-                        o.category = filterCategory.category;
-                    }
-                }
-            }
-            return list;
-        }
-
-        /// <summary>
-        /// 褰辩墖鍒嗛〉鑾峰彇
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="rcId">閬ユ帶鍣╥d</param>
-        /// <param name="filterCategorys">杩囨护鏁版嵁</param>
-        /// <param name="pageNo">褰撳墠椤�</param>
-        /// <param name="pageSize">椤垫暟</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<MovieLibrary> GetMovieLibraryPage(string deviceId, string rcId, List<Filters> filterCategorys,  int pageNo, int pageSize, TipType tipType = TipType.flicker)
-        {
-
-            JObject jObject = new JObject();
-        
-            jObject.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            jObject.Add("deviceId", deviceId);//璁惧id
-            jObject.Add("rcId", rcId);//閬ユ帶鍣╥d
-            if (filterCategorys != null && filterCategorys.Count != 0)
-            {
-                //杩囨护鍒嗙被鏁版嵁
-                JArray jArray = new JArray();
-                foreach (var filter in filterCategorys)
-                {
-                    JObject obj = new JObject();
-                    obj.Add("category", filter.category);
-                    obj.Add("filterValue", filter.filterValue);
-                    jArray.Add(obj);
-                }
-                jObject.Add("filterCategorys", jArray);//鎸夐敭鏍囪瘑
-            }
-            jObject.Add("pageNo", pageNo);//褰撳墠椤�
-            jObject.Add("pageSize", pageSize);//椤垫暟
-            //d.Add("zoneType", deviceId);//鍖哄煙
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryPage, "褰辩墖鍒嗛〉鑾峰彇");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<MovieLibrary>();
-            }
-            var movieLibraryEntity = Newtonsoft.Json.JsonConvert.DeserializeObject<MovieLibraryEntity>(responsePackNew.Data.ToString());
-            if (movieLibraryEntity == null)
-            {
-                return new List<MovieLibrary>();
-            }
-            return movieLibraryEntity.list;
-        }
-
-
-
-        /// <summary>
-        /// 褰辩墖璇︽儏鑾峰彇
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="rcId">閬ユ帶鍣╥d</param>
-        /// <param name="movieId">褰辩墖id</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public MovieLibraryInfoEntity GetMovieLibraryInfo(string deviceId, string rcId, string movieId, TipType tipType = TipType.flicker)
-        {
-
-            JObject jObject = new JObject();
-            jObject.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            jObject.Add("deviceId", deviceId);//璁惧id
-            jObject.Add("rcId", rcId);//閬ユ帶鍣╥d
-            jObject.Add("movieId", movieId);//褰辩墖id
-            //d.Add("zoneType", deviceId);//鍖哄煙
-
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryInfo, "褰辩墖璇︽儏鑾峰彇");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new MovieLibraryInfoEntity();
-            }
-            var movieLibraryEntity = Newtonsoft.Json.JsonConvert.DeserializeObject<MovieLibraryInfoEntity>(responsePackNew.Data.ToString());
-            if (movieLibraryEntity == null)
-            {
-                return new MovieLibraryInfoEntity();
-            }
-            movieLibraryEntity.rcId = rcId;
-            movieLibraryEntity.deviceId = deviceId;
-            return movieLibraryEntity;
-        }
-
-
-
-        /// <summary>
-        /// 褰辩墖鏀惰棌/鍙栨秷鏀惰棌
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="rcId">閬ユ帶鍣╥d</param>
-        /// <param name="movieId">褰辩墖id</param>
-        /// <param name="collect">true = 鏀惰棌,false = 鍙栨秷鏀惰棌</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public bool IsCollect(string deviceId, string rcId, string movieId, bool collect, TipType tipType = TipType.flicker)
-        {
-
-            JObject jObject = new JObject();
-            jObject.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            jObject.Add("deviceId", deviceId);//璁惧id
-            jObject.Add("rcId", rcId);//閬ユ帶鍣╥d
-            jObject.Add("movieId", movieId);//褰辩墖id
-            jObject.Add("collect", collect);//褰辩墖id
-            //d.Add("zoneType", deviceId);//鍖哄煙
-
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryCollect, "褰辩墖鏀惰棌");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-
-
-        /// <summary>
-        /// 鏀惰棌褰辩墖鍒嗛〉鑾峰彇
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="rcId">閬ユ帶鍣╥d</param>
-        /// <param name="filterCategorys">杩囨护鏁版嵁</param>
-        /// <param name="pageNo">褰撳墠椤�</param>
-        /// <param name="pageSize">椤垫暟</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public List<MovieLibrary> GetcollectPage(string deviceId, string rcId, int pageNo, int pageSize, TipType tipType = TipType.flicker)
-        {
-
-            JObject jObject = new JObject();
-            jObject.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            jObject.Add("deviceId", deviceId);//璁惧id
-            jObject.Add("rcId", rcId);//閬ユ帶鍣╥d
-            jObject.Add("pageNo", pageNo);//褰撳墠椤�
-            jObject.Add("pageSize", pageSize);//椤垫暟
-            //d.Add("zoneType", deviceId);//鍖哄煙
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryCollectPage, "鏀惰棌褰辩墖鍒嗛〉鑾峰彇");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<MovieLibrary>();
-            }
-            var movieLibraryEntity = Newtonsoft.Json.JsonConvert.DeserializeObject<MovieLibraryEntity>(responsePackNew.Data.ToString());
-            if (movieLibraryEntity == null)
-            {
-                return new List<MovieLibrary>();
-            }
-            return movieLibraryEntity.list;
-        }
-
-
-        /// <summary>
-        /// 褰辩墖鎾斁
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="rcId">閬ユ帶鍣╥d</param>
-        /// <param name="movieId">褰辩墖id</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public bool MovieLibraryPlay(string deviceId, string rcId, string movieId, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", deviceId);
-            d.Add("rcId", rcId);//閬ユ帶鍣╥d
-            d.Add("movieId", movieId);//褰辩墖id
-            //d.Add("zoneType", deviceId);//鍖哄煙
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Aks_MovieLibraryPlay, "褰辩墖鎾斁");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰辩墖鍥剧墖
-        /// </summary>
-        /// <param name="imageUrl">鍥剧墖鍦板潃</param>
-        public byte[] GetImage(string imageUrl, int mTimeout = 3)
-        {
-            return RequestHttpsBase(imageUrl, mTimeout);
-        }
-
-        #endregion
-
-
-        /// <summary>
-        /// 缃戠粶璇锋眰
-        /// </summary>
-        /// <param name="mTimeout"></param>
-        /// <returns></returns>
-        private byte[] RequestHttpsBase(string imageUrl, int mTimeout = 3)
-        {
-
-            try
-            {
-                Log($"{DateTime.Now}->鍙戦��->鑾峰彇褰辩墖璧勬簮", imageUrl, "");
-                RestClient client = new RestClient(imageUrl);
-                RestRequest request = new RestRequest(Method.GET);
-                request.Timeout = mTimeout * 1000;
-                //request.AddHeader("content-type", "application/json");
-                IRestResponse response = client.Execute(request);
-                return response.RawBytes;
-
-            }
-            catch (Exception ex)
-            {
-                return null;
-            }
-
-
-        }
-
-        /// <summary>
-        ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� 
-        /// </summary>
-        /// <param name="o">鍙戦�佹暟鎹�</param>
-        /// <param name="api_Url">璇锋眰鍦板潃(涓嶆槸缁濆鍦板潃)</param>
-        /// <param name="tag">鏍囪->鎻忚堪鎺ュ彛(鑷畾涔�)</param>
-        /// <returns></returns>
-        public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 3)
-        {
-            Log($"{DateTime.Now}->鍙戦��->{tag}", api_Url, o.ToString());
-            var requestJson = HttpUtil.GetSignRequestJson(o);
-            var r = HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
-            Log($"{DateTime.Now}->鍥炲->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r));
-            return r;
-
-        }
-
-
-        /// <summary>
-        /// <summary>
-        /// 妫�楠屾暟鎹洖澶嶆垚鍔熸垨鑰呭け璐�
-        /// </summary>
-        /// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�</param>
-        /// <returns></returns>
-        private bool DataChecking(ResponsePackNew responsePackNew, TipType tipType)
-        {
-            if (responsePackNew.Data == null || responsePackNew.Code != "0" || responsePackNew.Data.ToString() == "")
-            {
-                if (TipType.flicker == tipType)
-                {
-                    if (responsePackNew == null)
-                    {
-                        responsePackNew = new ResponsePackNew { message = "娌″洖澶�,璇风‘璁ょ綉缁滄槸鍚︽甯�.", Code = "-1", };
-                    }
-                    Application.RunOnMainThread(() =>
-                    {
-                        //new Tip()
-                        //{
-                        //    CloseTime = 1,
-                        //    Text = responsePackNew.message + "(" + responsePackNew.Code + ")",
-                        //    Direction = AMPopTipDirection.None,
-                        //}.Show(MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1));
-                        CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")",3);
-                    });
-                }
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-        /// 鎵撳嵃鏃ュ織
-        /// </summary>
-        /// <param name="tag">鎵撳嵃鏍囪</param>
-        /// <param name="content">鎵撳嵃鍐呭</param>
-        public void Log(string tag, string url, string content)
-        {
-#if DEBUG
-            Console.WriteLine(tag + $"\r\n{url}\r\n{content}");
-#endif
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
deleted file mode 100644
index 6bcd53a..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-锘縰sing Shared;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using HDL_ON.UI.CSS;
-using HDL_ON.Entity;
-using HDL_ON.DriverLayer;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.Intelligence.Automation;
-using System.Linq;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鏃跺簭鍣ㄧ晫闈�
-    /// </summary>
-    public class SxqPage : FrameLayout
-    {
-        /// <summary>
-        /// 澶撮儴甯冨眬
-        /// </summary>
-        private TopView topView;
-        /// <summary>
-        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
-        /// </summary>
-        public Action action;
-
-
-        public VerticalScrolViewLayout vv;
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-
-        /// <summary>
-        /// 璁惧id
-        /// </summary>
-        private string deviceId;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        /// <param name="deviceId">璁惧id</param>
-        public SxqPage(List<SequencerEntity> sequencerList, string deviceId)
-        {
-            this.sequencerList = sequencerList;
-            this.deviceId = deviceId;
-        }
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitTop();
-            this.InitMiddle();
-            //鍒濆鍖栦簨浠�
-            this.EventListener();
-            //璇诲彇鏁版嵁
-
-        }
-
-
-        /// <summary>
-        /// 鍒濆鍖栧ご閮ㄧ晫闈�
-        /// </summary>
-        private void InitTop()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = false;
-            this.topView.topNameBtn.TextID = StringId.shixuqi;
-            this.AddChidren(topView.TopFLayoutView());
-        }
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄧ晫闈�
-        /// </summary>
-        private void InitMiddle()
-        {
-            vv = new VerticalScrolViewLayout()
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-                BackgroundColor = MusicColor.WhiteColor,
-            };
-            this.AddChidren(vv);
-            BaseFramLayout fLayout = new BaseFramLayout();
-            this.vv.AddChidren(fLayout);
-            int line = 0;
-            int xCount = 0;
-            int rowNumber = 4;
-            var list1 = this.sequencerList.FindAll((o) => o.type == 1);
-            for (int i = 1; i <= list1.Count; i++)
-            {
-                var sequencer = list1[i - 1];
-
-                VerticalBoutonFLayout buttonFram = new VerticalBoutonFLayout();
-                buttonFram.AddView(fLayout);
-                buttonFram.Tag = sequencer;
-                buttonFram.Y = Application.GetRealWidth(16) + Application.GetRealHeight((VerticalBoutonFLayout.heightFrameLayout + 8) * line);
-                buttonFram.X = Application.GetRealWidth(16) + Application.GetRealWidth((VerticalBoutonFLayout.widthFrameLayout + 8) * xCount);
-                buttonFram.btnName.Text = sequencer.name;
-                xCount++;
-                if (i % rowNumber == 0)
-                {
-                    line++;
-                    xCount = 0;
-                }
-                buttonFram.SetONClickListener((fl, btn) =>
-                {
-                    if (buttonFram.Tag != null && buttonFram.Tag is SequencerEntity)
-                    {
-
-                        var sequ = (SequencerEntity)buttonFram.Tag;
-                        SequencerControlExecute(sequ.seqId, "on");
-                    }
-
-                });
-                buttonFram.SetOFFClickListener((fl, btn) =>
-                {
-                    if (buttonFram.Tag != null && buttonFram.Tag is SequencerEntity)
-                    {
-                        var sequ = (SequencerEntity)buttonFram.Tag;
-                        SequencerControlExecute(sequ.seqId, "off");
-                    }
-                });
-
-
-            }
-            fLayout.AdjustRealHeight(8);
-
-            var list2 = this.sequencerList.FindAll((o) => o.type == 2);
-            for (int i = 0; i < list2.Count; i++)
-            {
-                Button btnName = new Button
-                {
-                    Y = fLayout.Height,
-                    X = Application.GetRealWidth(16) + Application.GetRealWidth((VerticalBoutonFLayout.widthFrameLayout + 8) * i),
-                    Width = Application.GetRealWidth(80),
-                    Height = Application.GetRealHeight(44),
-                    TextSize = TextSize.Text14,
-                    TextColor = MusicColor.TextColor,
-                    TextAlignment = TextAlignment.Center,
-                    Text = list2[i].name,
-                    BackgroundColor = MusicColor.ViewColor,
-                    SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-                    Radius = (uint)Application.GetRealHeight(12),
-                    Padding=new Padding(0,5,0,5),
-                    Tag = list2[i]
-                };
-                btnName.MouseDownEventHandler += (sen, e) =>
-                {
-                    btnName.IsSelected = true;
-                    if (btnName.Tag != null && btnName.Tag is SequencerEntity)
-                    {
-                        var sequ = (SequencerEntity)btnName.Tag;
-                        SequencerControlExecute(sequ.seqId, "on");
-                    }
-                };
-                btnName.MouseUpEventHandler += (sen, e) =>
-                {
-                    btnName.IsSelected = false;
-                    //寮硅捣棰滆壊
-                };
-                fLayout.AddChidren(btnName);
-            }
-            fLayout.AdjustRealHeight(16);
-        }
-        /// <summary>
-        /// 娉ㄥ唽浜嬩欢
-        /// </summary>
-        private void EventListener()
-        {
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                this.RemoveFromParent();
-            };
-        }
-
-        /// <summary>
-        /// 鏃跺簭鍣ㄦ寚浠ゅ彂閫�
-        /// </summary>
-        /// <param name="seqId">鏃跺簭鍣╥d</param>
-        /// <param name="onOff">鏃跺簭鍣ㄥ紑鍏�</param>
-        private void SequencerControlExecute(string seqId, string onOff)
-        {
-            CommonMethod.Current.SunThread(() =>
-            {
-                SendMethod.Current.SequencerExecute(this.deviceId, seqId, onOff);
-            });
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
deleted file mode 100644
index 0cd10f0..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ /dev/null
@@ -1,396 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鐢佃鐣岄潰
-    /// </summary>
-    public class TvPage : BaseFramLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        public TvPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.sequencerList = sequencerList;
-        }
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        private RemoteControlEntity remoteControl;
-        public Action<IntType> action;
-        /// <summary>
-        /// 鏈�涓婇潰鍔熻兘閿鍣�
-        /// </summary>
-        CornerFramLayout cornerTopFram;
-        /// <summary>
-        /// 鏁板瓧鎸夐敭瀹瑰櫒
-        /// </summary>
-        CornerFramLayout numberFrame;
-        /// <summary>
-        /// 鑿滃崟瀹瑰櫒
-        /// </summary>
-        MenuFramLayout menuFram;
-        /// <summary>
-        /// 鍒囨崲璁惧瀹瑰櫒
-        /// </summary>
-        TypeMultiFramLayout typeMultiFramLayout;
-
-        TypeSingleFramLayout tvSingleFramLayout;
-
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠剁洃鍚櫒
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        private void ReadData()
-        {
-
-        }
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鍣�
-        /// </summary>
-        private void EventListener()
-        {
-            //鍔熻兘閿帶鍒�
-            cornerTopFram.selectKeyAction += (keypadEntity) =>
-            {
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-            //鏁板瓧閿帶鍒�
-            numberFrame.selectKeyAction += (keypadEntity) =>
-            {
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-            //鑿滃崟涓婃寜閿�
-            menuFram.SetTopClickListener((keypadEntity) =>
-            {
-
-
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟涓嬫寜閿�
-            menuFram.SetBottomClickListener((keypadEntity) =>
-            {
-
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟宸︽寜閿�
-            menuFram.SetLeftClickListener((keypadEntity) =>
-            {
-
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟鍙虫寜閿�
-            menuFram.SetRightClickListener((keypadEntity) =>
-            {
-
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟ok鎸夐敭
-            menuFram.SetOkClickListener((keypadEntity) =>
-            {
-
-                KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-
-            if (tvSingleFramLayout != null)
-            {
-                //璁惧鍒囨崲
-                tvSingleFramLayout.SetClickListener((f) =>
-                {
-                    action?.Invoke(IntType.TV);
-                });
-            }
-
-            if (typeMultiFramLayout != null)
-            {
-                //鏃跺簭鍣�
-                typeMultiFramLayout.SetLeftFlClickListener((f) =>
-                {
-                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
-                    MainPage.BasePageView.AddChidren(sxqPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    sxqPage.Show();
-
-                });
-                //璁惧鍒囨崲
-                typeMultiFramLayout.SetRightFlClickListener((f) =>
-                {
-                    action?.Invoke(IntType.TV);
-                });
-            }
-
-        }
-
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            Button btnTitle = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(22),
-                Width = Application.GetRealWidth(200),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                Text= this.remoteControl.name,
-                IsBold = true,
-            };
-            this.AddChidren(btnTitle);
-
-            cornerTopFram = new CornerFramLayout(343, 368-24, 17);
-            cornerTopFram.X = Application.GetRealWidth(16);
-            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
-            this.AddChidren(cornerTopFram);
-            cornerTopFram.SetMargin(16, 0, 16, 0);
-            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTvKeypadList(this.remoteControl),new List<int> { 5, 6 });
-
-            #region  ----棰戦亾 鎺у埗----
-            FrameLayout middLayout = new FrameLayout
-            {
-                Y = cornerTopFram.Bottom,
-                Height = Application.GetRealHeight(61),
-            };
-            this.AddChidren(middLayout);
-
-            FrameLayout leftLayout = new FrameLayout
-            {
-                X = Application.GetRealWidth(105),
-                Y = Application.GetRealHeight(16),
-                Height = Application.GetRealHeight(29),
-                Width = Application.GetRealWidth(32),
-
-            };
-            middLayout.AddChidren(leftLayout);
-
-
-            Button leftBtnTitle = new Button
-            {
-                Height = Application.GetRealHeight(22),
-                Width = leftLayout.Width,
-                TextAlignment = TextAlignment.Center,
-                TextColor = MusicColor.TextColor,
-                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-                TextSize = TextSize.Text16,
-                TextID = StringId.pindao,
-                Padding = new Padding(0, 0, 0, 0),
-                IsBold = true,
-            };
-            leftLayout.AddChidren(leftBtnTitle);
-
-
-            Button leftBtnLine = new Button
-            {
-                Y = leftBtnTitle.Bottom + Application.GetRealHeight(4),
-                Height = Application.GetRealHeight(2),
-                Width = leftBtnTitle.GetTextWidth(),
-                BackgroundColor = MusicColor.TextColor,
-                SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-                Gravity = Gravity.CenterHorizontal,
-            };
-            leftLayout.AddChidren(leftBtnLine);
-            //棰戦亾鐐瑰嚮鎺т欢
-            FrameLayout clickLeftLayout = new FrameLayout
-            {
-                Height = leftLayout.Height,
-                Width = leftLayout.Width,
-            };
-            leftLayout.AddChidren(clickLeftLayout);
-
-
-            FrameLayout rightLayout = new FrameLayout
-            {
-                X = leftLayout.Right + Application.GetRealWidth(100),
-                Y = leftLayout.Y,
-                Height = leftLayout.Height,
-                Width = leftLayout.Width,
-            };
-            middLayout.AddChidren(rightLayout);
-
-
-            Button rightBtnTitle = new Button
-            {
-                Height = Application.GetRealHeight(22),
-                Width = rightLayout.Width,
-                TextAlignment = TextAlignment.Center,
-                TextColor = MusicColor.TextColor,
-                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-                TextSize = TextSize.Text16,
-                TextID = StringId.kongzhi,
-                Padding = new Padding(0, 0, 0, 0),
-                IsBold = true,
-            };
-            rightLayout.AddChidren(rightBtnTitle);
-
-            Button rightBtnLine = new Button
-            {
-                Y = rightBtnTitle.Bottom + Application.GetRealHeight(4),
-                Height = Application.GetRealHeight(2),
-                Width = rightBtnTitle.GetTextWidth(),
-                BackgroundColor = MusicColor.TextColor,
-                SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-                Gravity = Gravity.CenterHorizontal,
-            };
-            rightLayout.AddChidren(rightBtnLine);
-
-            //鐢佃鐐瑰嚮鎺т欢
-            FrameLayout clickRightLayout = new FrameLayout
-            {
-                Height = leftLayout.Height,
-                Width = leftLayout.Width,
-            };
-            rightLayout.AddChidren(clickRightLayout);
-
-
-
-            #endregion
-
-            
-            //鏁板瓧鎸夐敭瀹瑰櫒
-            numberFrame = new CornerFramLayout(343, 368-24, 17);
-            numberFrame.X = Application.GetRealWidth(16);
-            numberFrame.Y = middLayout.Bottom;
-            numberFrame.BackgroundColor = MusicColor.WhiteColor;
-            numberFrame.SetMargin(16,0,16,0);
-            numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
-            this.AddChidren(numberFrame);
-          
-
-            //鑿滃崟瀹瑰櫒
-            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
-            cornerBottomFram.X = Application.GetRealWidth(16);
-            cornerBottomFram.Y = middLayout.Bottom;
-            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-            this.AddChidren(cornerBottomFram);
-
-            menuFram = new MenuFramLayout();
-            menuFram.Y = Application.GetRealHeight(24);
-            menuFram.AddView(cornerBottomFram);
-
-
-            if (sequencerList.Count == 0)
-            {
-                //娌℃湁鏃跺簭鍣�
-                tvSingleFramLayout = new TypeSingleFramLayout();
-                tvSingleFramLayout.AddView(cornerBottomFram);
-                tvSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                tvSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
-                tvSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
-                tvSingleFramLayout.btnName.Text = this.remoteControl.name;
-                tvSingleFramLayout.btnName.X = Application.GetRealWidth(16);
-                tvSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
-                tvSingleFramLayout.btnRightImage.X = tvSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                tvSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
-                tvSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
-                tvSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
-                tvSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
-                tvSingleFramLayout.btnLeftImage.Visible = false;
-                tvSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
-                  tvSingleFramLayout.singleFramLayout,
-                  tvSingleFramLayout.btnName,
-                   tvSingleFramLayout.btnRightImage,
-                   48, 200);
-            }
-            else
-            {
-
-
-                typeMultiFramLayout = new TypeMultiFramLayout();
-                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
-            }
-
-            //鍒濆鍊�
-            leftBtnTitle.IsSelected = true;
-            leftBtnLine.IsSelected = true;
-            leftBtnLine.Visible = true;
-            rightBtnTitle.IsSelected = false;
-            rightBtnLine.IsSelected = false;
-            rightBtnLine.Visible = false;
-            numberFrame.Visible = true;
-            cornerBottomFram.Visible = false;
-
-            //棰戦亾鐐瑰嚮浜嬩欢
-            clickLeftLayout.MouseDownEventHandler += (sen, e) =>
-            {
-                leftBtnTitle.IsSelected = true;
-                leftBtnLine.IsSelected = true;
-                leftBtnLine.Visible = true;
-                rightBtnTitle.IsSelected = false;
-                rightBtnLine.IsSelected = false;
-                rightBtnLine.Visible = false;
-                numberFrame.Visible = true;
-                cornerBottomFram.Visible = false;
-                this.AdjustRealHeight(16);
-
-            };
-            //鎺у埗鐐瑰嚮浜嬩欢
-            clickRightLayout.MouseDownEventHandler += (sen, e) =>
-            {
-                leftBtnTitle.IsSelected = false;
-                leftBtnLine.IsSelected = false;
-                leftBtnLine.Visible = false;
-                rightBtnTitle.IsSelected = true;
-                rightBtnLine.IsSelected = true;
-                rightBtnLine.Visible = true;
-                numberFrame.Visible = false;
-                cornerBottomFram.Visible = true;
-                this.AdjustRealHeight(-60);
-
-            };
-
-            this.AdjustRealHeight(16);
-        }
-
-
-        /// <summary>
-        /// 鎸夐敭鎺у埗
-        /// </summary>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
-        private void KeyControl(string keypad, string keyName,bool isSupport)
-        {
-            //CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
deleted file mode 100644
index 1f1afab..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 鎶曞奖浠晫闈�
-    /// </summary>
-    public class TyyPage : BaseFramLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        public TyyPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.sequencerList = sequencerList;
-        }
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        private RemoteControlEntity remoteControl;
-        public Action<IntType> action;
-        CornerFramLayout cornerTopFram;
-        MenuFramLayout menuFram;
-        TypeMultiFramLayout typeMultiFramLayout;
-
-        TypeSingleFramLayout tyySingleFramLayout;
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠剁洃鍚櫒
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        private void ReadData()
-        {
-
-        }
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鍣�
-        /// </summary>
-        private void EventListener()
-        {
-
-
-
-            //鍔熻兘閿帶鍒�
-            cornerTopFram.selectKeyAction += (keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            };
-
-            //鑿滃崟涓婃寜閿�
-            menuFram.SetTopClickListener((keypadEntity) =>
-            {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟涓嬫寜閿�
-            menuFram.SetBottomClickListener((keypadEntity) =>
-            {
-
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟宸︽寜閿�
-            menuFram.SetLeftClickListener((keypadEntity) =>
-            {
-
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟鍙虫寜閿�
-            menuFram.SetRightClickListener((keypadEntity) =>
-            {
-
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            //鑿滃崟ok鎸夐敭
-            menuFram.SetOkClickListener((keypadEntity) =>
-            {
-
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
-            });
-            if (typeMultiFramLayout != null)
-            {
-                //鏃跺簭鍣�
-                typeMultiFramLayout.SetLeftFlClickListener((f) =>
-                {
-                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
-                    MainPage.BasePageView.AddChidren(sxqPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    sxqPage.Show();
-
-                });
-                //璁惧鍒囨崲
-                typeMultiFramLayout.SetRightFlClickListener((f) =>
-                {
-                    action?.Invoke(IntType.Projector);
-                });
-            }
-            if (tyySingleFramLayout != null)
-            {
-                //璁惧鍒囨崲
-                tyySingleFramLayout.SetClickListener((f) =>
-                {
-                    action?.Invoke(IntType.Projector);
-                });
-            }
-
-
-        }
-
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            Button btnTitle = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(22),
-                Width = Application.GetRealWidth(200),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                Text = this.remoteControl.name,
-                IsBold = true,
-            };
-            this.AddChidren(btnTitle);
-
-            cornerTopFram = new CornerFramLayout(343, 452 - 30, 17);
-            cornerTopFram.X = Application.GetRealWidth(16);
-            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
-            this.AddChidren(cornerTopFram);
-            cornerTopFram.SetMargin(16, 0, 16, 0);
-            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(this.remoteControl), new List<int> { 3, 4, 5 });
-
-
-            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292 - 30, 17);
-            cornerBottomFram.X = Application.GetRealWidth(16);
-            cornerBottomFram.Y = cornerTopFram.Bottom + Application.GetRealHeight(16);
-            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-            cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
-            this.AddChidren(cornerBottomFram);
-
-            menuFram = new MenuFramLayout();
-            menuFram.Y = Application.GetRealHeight(24);
-            menuFram.AddView(cornerBottomFram);
-            if (sequencerList.Count == 0)
-            {
-                //娌℃湁鏃跺簭鍣�
-                tyySingleFramLayout = new TypeSingleFramLayout();
-                tyySingleFramLayout.AddView(cornerBottomFram);
-                tyySingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
-                tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
-                tyySingleFramLayout.btnName.Text = this.remoteControl.name;
-                tyySingleFramLayout.btnName.X = Application.GetRealWidth(16);
-                tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48);
-                tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
-                tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
-                tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
-                tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
-                tyySingleFramLayout.btnLeftImage.Visible = false;
-               tyySingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
-                    tyySingleFramLayout.singleFramLayout,
-                    tyySingleFramLayout.btnName,
-                     tyySingleFramLayout.btnRightImage,
-                     48,200);
-
-            }
-            else
-            {
-                typeMultiFramLayout = new TypeMultiFramLayout();
-                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
-                typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
-            }
-
-            this.AdjustRealHeight(16);
-        }
-
-        /// <summary>
-        /// 鎸夐敭鎺у埗
-        /// </summary>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
-        private void KeyControl(string keypad, string keyName, bool isSupport)
-        {
-            //CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
deleted file mode 100644
index 3e82841..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-锘縰sing Shared;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using System.Linq;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    /// 褰卞簱鐣岄潰
-    /// </summary>
-    public class YkPage : FrameLayout
-    {
-
-
-        private Dictionary<string, Filters> FiltersList = new Dictionary<string, Filters>();
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        public YkPage(RemoteControlEntity remoteControlEntity)
-        {
-            this.remoteControl = remoteControlEntity;
-        }
-
-        List<ImageFramlayout> imageFramlayoutList =new List<ImageFramlayout>();
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        RemoteControlEntity remoteControl;
-        /// <summary>
-        /// 褰辩墖涓�绾у垎绫诲垪琛�
-        /// </summary>
-        List<FilterCategoryEntity> mFilterCategoryList;
-        /// <summary>
-        /// 褰辩墖鍒楄〃
-        /// </summary>
-        List<MovieLibrary> mMovieLibraryList=new List<MovieLibrary>();
-        /// <summary>
-        /// 椤堕儴甯冨眬
-        /// </summary>
-        TopView topView;
-
-        FrameLayout fLayout;
-        /// <summary>
-        /// 褰辩墖涓婁笅婊戝姩鐖跺鍣�
-        /// </summary>
-        VerticalRefreshLayout vv;
-        /// <summary>
-        /// 姘村钩婊戝姩鐖跺鍣�
-        /// </summary>
-        CornerFramLayout horizontalFl;
-
-        CornerFramLayout imageFLayout;
-        /// <summary>
-        /// 椤垫暟
-        /// </summary>
-        private int pageNo = 1;
-
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-        /// <summary>
-        /// 鍒濆鍖栫晫闈�
-        /// </summary>
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = true;
-            this.topView.setBtn.Width = Application.GetMinRealAverage(32);
-            this.topView.setBtn.Height = Application.GetMinRealAverage(32);
-            this.topView.setBtn.UnSelectedImagePath = "AksIcon/like.png";
-            this.topView.topNameBtn.TextID = StringId.yingku;
-            this.AddChidren(topView.TopFLayoutView());
-            fLayout = new FrameLayout
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-                BackgroundColor = MusicColor.WhiteColor,
-            };
-            this.AddChidren(fLayout);
-            //this.LoadFTypeLayout();
-            //this.LoadImageFLayout();
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                this.RemoveFromParent();
-            };
-            //鏀惰棌鍥炬爣鐐瑰嚮浜嬩欢
-            this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                CommonMethod.Current.MainThread(() =>
-                {
-
-                    CollectPage collectPage = new CollectPage(remoteControl);
-                    MainPage.BasePageView.AddChidren(collectPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    collectPage.Show();
-                });
-            };
-        }
-        /// <summary>
-        /// 鍔犺浇涓�绾у垎绫诲竷灞�
-        /// </summary>
-        private void LoadFTypeLayout()
-        {
-
-            fLayout.RemoveAll();
-            int count = this.mFilterCategoryList == null ? 0 : this.mFilterCategoryList.Count;
-            horizontalFl = new CornerFramLayout(375, count * 75);
-            fLayout.AddChidren(horizontalFl);
-            horizontalFl.LoadHorizontalPage(this.mFilterCategoryList);
-            horizontalFl.AdjustRealHeight(20);
-
-            vv = new VerticalRefreshLayout()
-            {
-                Y = horizontalFl.Bottom,
-                Height = fLayout.Height - horizontalFl.Bottom,
-            };
-            fLayout.AddChidren(vv);
-            //浜岀骇杩囨护浜嬩欢
-            horizontalFl.selectKeyAction += (filters) =>
-            {
-                pageNo = 1;//杩樺師椤垫暟
-                AddMemoryFilters(filters);
-                UpdateData(true);
-            };
-
-        }
-        /// <summary>
-        /// 鍔犺浇褰辩墖鍒楄〃甯冨眬
-        /// </summary>
-        private void LoadImageFLayout()
-        {
-            if (vv == null)
-            {
-                return;
-            }
-            vv.RemoveAll(); 
-            int count = this.mMovieLibraryList == null ? 0 : this.mMovieLibraryList.Count;
-            imageFLayout = new CornerFramLayout(343, count * 168, 0);
-            vv.AddChidren(imageFLayout);
-            imageFLayout.X = Application.GetRealWidth(16);
-            //imageFLayout.LoadImagePage(this.mMovieLibraryList);
-            imageFLayout.LoadImagePage(imageFramlayoutList);
-            imageFLayout.AdjustRealHeight(16);
-
-
-            //鏇村鐨�
-            var btnMore = new Button
-            {
-                Width = Application.GetRealWidth(375),
-                Height = Application.GetRealHeight(30),
-                TextSize = TextSize.Text14,
-                TextColor = MusicColor.TextColor,
-                TextID = StringId.LoadMore,
-                TextAlignment = TextAlignment.TopCenter,
-                Padding = new Padding(0, 20, 0, 20),
-            };
-            vv.AddChidren(btnMore);
-
-            btnMore.MouseDownEventHandler += (sender,e) => {
-                //涓诲姩鏇存柊鏁版嵁
-                UpdateData(false);
-            };
-          
-            //褰辩墖浜嬩欢
-            imageFLayout.selectImageAction += (movieLibrary) =>
-            {
-                
-                CommonMethod.Current.MainThread(() =>
-                {
-                    DetailPage detailPage = new DetailPage(remoteControl, movieLibrary);
-                    MainPage.BasePageView.AddChidren(detailPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    detailPage.Show();
-                });
-
-            };
-            //涓嬫媺鍒锋柊
-            vv.BeginHeaderRefreshingAction += () =>
-            {
-                //鍏抽棴鍒锋柊View锛�
-                vv.EndHeaderRefreshing();
-                //涓诲姩鏇存柊鏁版嵁
-                //UpdateData();
-            };
-
-         
-          
-        }
-
-
-
-
-
-        /// <summary>
-        /// 鍔犺浇鍥剧墖瀹瑰櫒
-        /// </summary>
-        /// <param name="movieLibrary">movieLibrary</param>
-        private void AddImageFramlayout(MovieLibrary movieLibrary)
-        {
-            CommonMethod.Current.MainThread(() =>
-            {
-                if (movieLibrary == null)
-                {
-                    return;
-                }
-                ImageFramlayout imageFram = new ImageFramlayout();
-                //imageFram.AddView(this);
-                imageFram.Tag = movieLibrary;
-                imageFram.btnName.Text = movieLibrary.name;
-                imageFram.btnImage.ImageBytes = movieLibrary.imageBytes;
-                imageFram.btnScore.Text = movieLibrary.rating;
-                //娣诲姞缂撳瓨
-                imageFramlayoutList.Add(imageFram);
-            });
-        }
-
-
-        /// <summary>
-        /// 鍒濆鍖栨暟鎹�
-        /// </summary>
-        private void ReadData()
-        {
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    this.mFilterCategoryList = SendMethod.Current.GetFilterCategoryLits(this.remoteControl.deviceId, this.remoteControl.rcId);
-                    var newList = SendMethod.Current.GetMovieLibraryPage(this.remoteControl.deviceId, this.remoteControl.rcId, new List<Filters>(), pageNo, SendMethod.pageSize);
-                    DataTreating(newList);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-                        this.LoadFTypeLayout();
-                        this.LoadImageFLayout();
-
-                    });
-                }
-            });
-
-        }
-
-        /// <summary>
-        /// 涓诲姩鏇存柊鏁版嵁
-        /// </summary>
-        /// <param name="isUpdateData">鏄惁鏄簩绾ц繃婊�,true琛ㄧず鏄簩绾ц繃婊よ繃鏉ョ殑</param>
-        private void UpdateData(bool isUpdateData)
-        {
-
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    var newList = SendMethod.Current.GetMovieLibraryPage(this.remoteControl.deviceId, this.remoteControl.rcId, this.FiltersList.Values.ToList(), pageNo, SendMethod.pageSize);
-                    DataTreating(newList);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-                        if (isUpdateData)
-                        {
-                            //娓呯┖鎵�鏈夋棫褰辩墖鏁版嵁,閲嶆柊鍔犺浇鏂板奖鐗囨暟鎹�
-                            this.LoadImageFLayout();
-                        }
-                        else
-                        {
-                            //杩藉姞鏂版暟鎹湪鏃ф暟鎹悗闈�
-                            imageFLayout.LoadImagePage(imageFramlayoutList);
-                            imageFLayout.AdjustRealHeight(16);
-                        }
-
-                    });
-                }
-            });
-
-        }
-
-        /// <summary>
-        /// 鏁版嵁澶勭悊閫昏緫
-        /// </summary>
-        /// <param name="newList">鏂板垪琛ㄦ暟鎹�</param>
-        private void DataTreating(List<MovieLibrary> newList)
-        {
-            if (newList == null || newList.Count == 0)
-            {
-                return;
-            }
-            //鏈夋柊鏁版嵁锛屾竻绌烘棫鏁版嵁
-            imageFramlayoutList.Clear();
-
-            for (int i = 0; i < newList.Count; i++)
-            {
-                var mMovieLibrary = newList[i];
-                //鍥剧墖鐨勫瓧鑺傛祦
-                var bytes = SendMethod.Current.GetImage(mMovieLibrary.posterUrl);
-                //鏇存柊鍊�
-                mMovieLibrary.imageBytes = bytes;
-
-            }
-          
-            for (int i = 0; i < newList.Count; i++)
-            {
-                //鍘婚噸
-                var mMovieLibrary = this.mMovieLibraryList.Find((o) => o.movieId == newList[i].movieId);
-                if (mMovieLibrary == null)
-                {
-                    //鏂板垪琛ㄩ粯璁ゅ姞鍦ㄦ渶鍓嶉潰
-                    this.mMovieLibraryList.Insert(0, newList[i]);
-
-                }
-                //娣诲姞鍥剧墖瀹瑰櫒
-                AddImageFramlayout(newList[i]);
-
-            }
-
-            if (newList.Count == SendMethod.pageSize)
-            {
-                //鏇存柊椤垫暟
-                pageNo++;
-            }
-
-        }
-
-
-        /// <summary>
-        /// 娣诲姞杩囨护鏁版嵁
-        /// </summary>
-        /// <param name="filters">杩囨护鏉′欢</param>
-        private void AddMemoryFilters(Filters filters)
-        {
-            if (FiltersList.ContainsKey(filters.category))
-            {
-                FiltersList.Remove(filters.category);
-            }
-            FiltersList.Add(filters.category, filters);
-        }
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
deleted file mode 100644
index e246608..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ /dev/null
@@ -1,1268 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
-namespace HDL_ON.UI.UI2.FuntionControlView.Aks
-{
-    /// <summary>
-    ///铏氭嫙閬ユ帶鍣ㄧ晫闈�
-    /// </summary>
-    public class YkqPage : BaseFramLayout
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
-        /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
-        public YkqPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
-        {
-            this.remoteControl = remoteControlEntity;
-            this.sequencerList = sequencerList;
-        }
-        /// <summary>
-        /// 鏃跺簭鍣ㄥ垪琛�
-        /// </summary>
-        private List<SequencerEntity> sequencerList;
-        /// <summary>
-        /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
-        /// </summary>
-        private RemoteControlEntity remoteControl;
-        public Action<IntType> action;
-        /// <summary>
-        /// 鍒囨崲璁惧瀹瑰櫒
-        /// </summary>
-        TypeMultiFramLayout typeMultiFramLayout;
-        TypeSingleFramLayout tyySingleFramLayout;
-
-        Button switchBtn;
-        CustomFrameLayout xinxiFL;
-        CustomFrameLayout shoucangFL;
-        CustomFrameLayout dianyingFL;
-        CustomFrameLayout yuleFL;
-        CustomFrameLayout dianshiFL;
-        CustomFrameLayout redFL;
-        CustomFrameLayout yellowFL;
-        CustomFrameLayout blueFL;
-        CustomFrameLayout number1FL;
-        CustomFrameLayout number2FL;
-        CustomFrameLayout number3FL;
-        CustomFrameLayout number4FL;
-        CustomFrameLayout number5FL;
-        CustomFrameLayout number6FL;
-        CustomFrameLayout number7FL;
-        CustomFrameLayout number8FL;
-        CustomFrameLayout number9FL;
-        CustomFrameLayout yinguiFL;
-        CustomFrameLayout number0FL;
-        CustomFrameLayout zimuFL;
-        CustomFrameLayout jingyinFL;
-        CustomFrameLayout toupingFL;
-        CustomFrameLayout zhuyeFL;
-        FrameLayout okFl;
-        Button btnLeft;
-        Button btnShang;
-        Button btnRight;
-        Button btnXia;
-        Button btnOk;
-        Button btnYingliangjia;
-        Button btnYingliangjian;
-        Button btnPindaojia;
-        Button btnPindaojian;
-        CustomFrameLayout caidanFL;
-        CustomFrameLayout fanhuiFL;
-        CustomFrameLayout shanyibuFL;
-        CustomFrameLayout bofangFL;
-        CustomFrameLayout xiayibuFL;
-        CustomFrameLayout kuaituiFL;
-        CustomFrameLayout zantingFL;
-        CustomFrameLayout kusinjinFL;
-        CustomFrameLayout dengguanFL;
-        CustomFrameLayout tingzhiFL;
-        CustomFrameLayout dankongdengFL;
-
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠剁洃鍚櫒
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        private void ReadData()
-        {
-
-        }
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鍣�
-        /// </summary>
-        private void EventListener()
-        {
-            //寮�鍏�
-            switchBtn.MouseUpEventHandler += (senser, e) =>
-            {
-                KeyControl("on_off", "寮�/鍏�");
-                this.SetButtonIsSelected(switchBtn);
-            };
-            //淇℃伅
-            xinxiFL.SetClickListener(() =>
-            {
-                KeyControl("info", "淇℃伅");
-            });
-            //鏀惰棌
-            shoucangFL.SetClickListener(() =>
-            {
-                KeyControl("collect", "鏀惰棌");
-            });
-            //鐢靛奖
-            dianyingFL.SetClickListener(() =>
-            {
-                KeyControl("movie", "鐢靛奖");
-            });
-            //濞变箰
-            yuleFL.SetClickListener(() =>
-            {
-                KeyControl("recreation", "濞变箰");
-            });
-            //鐢佃
-            dianshiFL.SetClickListener(() =>
-            {
-                KeyControl("tv", "鐢佃");
-            });
-            //绾㈣壊
-            redFL.SetClickListener(() =>
-            {
-                KeyControl("red", "绾㈣壊");
-            });
-            //榛勮壊
-            yellowFL.SetClickListener(() =>
-            {
-                KeyControl("yellow", "榛勮壊");
-            });
-            //钃濊壊
-            blueFL.SetClickListener(() =>
-            {
-                KeyControl("blue", "钃濊壊");
-            });
-            //1
-            number1FL.SetClickListener(() =>
-            {
-                KeyControl("number_1", "1");
-            });
-            //2
-            number2FL.SetClickListener(() =>
-            {
-                KeyControl("number_2", "2");
-            });
-            //3
-            number3FL.SetClickListener(() =>
-            {
-                KeyControl("number_3", "3");
-
-            });
-            //4
-            number4FL.SetClickListener(() =>
-            {
-                KeyControl("number_4", "4");
-
-            });
-            //5
-            number5FL.SetClickListener(() =>
-            {
-                KeyControl("number_5", "5");
-
-            });
-            //6
-            number6FL.SetClickListener(() =>
-            {
-                KeyControl("number_6", "6");
-            });
-            //7
-            number7FL.SetClickListener(() =>
-            {
-                KeyControl("number_7", "7");
-            });
-            //8
-            number8FL.SetClickListener(() =>
-            {
-                KeyControl("number_8", "8");
-            });
-            //9
-            number9FL.SetClickListener(() =>
-            {
-                KeyControl("number_9", "9");
-
-            });
-
-            //闊宠建
-            yinguiFL.SetClickListener(() =>
-            {
-                KeyControl("audio_track", "闊宠建");
-            });
-            //0
-            number0FL.SetClickListener(() =>
-            {
-                KeyControl("number_0", "0");
-
-            });
-            //瀛楀箷
-            zimuFL.SetClickListener(() =>
-            {
-                KeyControl("subtitle", "瀛楀箷");
-
-            });
-            //闈欓煶
-            jingyinFL.SetClickListener(() =>
-            {
-                KeyControl("mute", "闈欓煶");
-
-            });
-            //鎶曞睆
-            toupingFL.SetClickListener(() =>
-            {
-                KeyControl("main", "鎶曞睆");
-
-            });
-            //涓婚〉
-            zhuyeFL.SetClickListener(() =>
-            {
-                KeyControl("home", "涓婚〉");
-
-            });
-            //宸�
-            btnLeft.MouseUpEventHandler += (sender, e) =>
-            {
-               
-                KeyControl("key_left", "宸�");
-                this.SetHighlightImagePath(okFl, "AksIcon/ykq_left_selected.png", "AksIcon/ykq_ok.png");
-
-            };
-            //涓�
-            btnShang.MouseUpEventHandler += (sender, e) =>
-            {
-                KeyControl("key_up", "涓�");
-                this.SetHighlightImagePath(okFl, "AksIcon/ykq_shang_selected.png", "AksIcon/ykq_ok.png");
-
-            };
-
-            //鍙�
-            btnRight.MouseDownEventHandler += (sender, e) =>
-            {
-
-           
-                KeyControl("key_right", "鍙�");
-                this.SetHighlightImagePath(okFl, "AksIcon/ykq_right_selected.png", "AksIcon/ykq_ok.png");
-
-            };
-
-            //涓�
-            btnXia.MouseUpEventHandler += (sender, e) =>
-            {
-               
-
-                KeyControl("key_down", "涓�");
-                this.SetHighlightImagePath(okFl, "AksIcon/ykq_xia_selected.png", "AksIcon/ykq_ok.png");
-            };
-            //OK
-            btnOk.MouseDownEventHandler += (sender, e) =>
-            {
-
-                KeyControl("key_ok", "纭畾");
-                this.SetHighlightImagePath(okFl, "AksIcon/ykq_ok_selected.png", "AksIcon/ykq_ok.png");
-            };
-            //闊抽噺+
-            btnYingliangjia.MouseUpEventHandler += (sen, e) =>
-            {
-                KeyControl("volume_up", "闊抽噺+");
-                this.SetButtonIsSelected(btnYingliangjia);
-            };
-            //闊抽噺-
-            btnYingliangjian.MouseUpEventHandler += (sen, e) =>
-            {
-                KeyControl("volume_down", "闊抽噺-");
-                this.SetButtonIsSelected(btnYingliangjian);
-            };
-            //棰戦亾+
-            btnPindaojia.MouseUpEventHandler += (sen, e) =>
-            {
-                KeyControl("ch_up", "棰戦亾+");
-                this.SetButtonIsSelected(btnPindaojia);
-            };
-            //棰戦亾-
-            btnPindaojian.MouseUpEventHandler += (sen, e) =>
-            {
-                KeyControl("ch_down", "棰戦亾-");
-                this.SetButtonIsSelected(btnPindaojian);
-            };
-
-            //鑿滃崟
-            caidanFL.SetClickListener(() =>
-            {
-                KeyControl("menu", "鑿滃崟");
-
-            });
-            //杩斿洖
-            fanhuiFL.SetClickListener(() =>
-            {
-                KeyControl("cancel", "杩斿洖");
-
-            });
-            //涓婁竴閮�
-            shanyibuFL.SetClickListener(() =>
-            {
-                KeyControl("part_up", "涓婁竴閮�");
-
-            });
-            //鎾斁
-            bofangFL.SetClickListener(() =>
-            {
-                KeyControl("play", "鎾斁");
-
-            });
-            //涓嬩竴閮�
-            xiayibuFL.SetClickListener(() =>
-            {
-                KeyControl("part_down", "涓嬩竴閮�");
-            });
-            //蹇��
-            kuaituiFL.SetClickListener(() =>
-            {
-                KeyControl("fast_rewind", "蹇��");
-            });
-            //鏆傚仠
-            zantingFL.SetClickListener(() =>
-            {
-                KeyControl("pause", "鏆傚仠");
-            });
-            //蹇繘
-            kusinjinFL.SetClickListener(() =>
-            {
-                KeyControl("fast_forward", "蹇繘");
-            });
-            //鐏叧
-            dengguanFL.SetClickListener(() =>
-            {
-                KeyControl("lamp", "鐏叧");
-
-            });
-            //鍋滄
-            tingzhiFL.SetClickListener(() =>
-            {
-                KeyControl("stop", "鍋滄");
-
-            });
-            //鍗曟帶鐏�
-            dankongdengFL.SetClickListener(() =>
-            {
-                KeyControl("lamp_plc", "鍗曟帶鐏�");
-
-            });
-
-            if (typeMultiFramLayout != null)
-            {
-                //鏃跺簭鍣�
-                typeMultiFramLayout.SetLeftFlClickListener((f) =>
-                {
-                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
-                    MainPage.BasePageView.AddChidren(sxqPage);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    sxqPage.Show();
-
-                });
-                //璁惧鍒囨崲
-                typeMultiFramLayout.SetRightFlClickListener((f) =>
-                {
-                    action?.Invoke(IntType.Control);
-                });
-            }
-            if (tyySingleFramLayout != null)
-            {
-                tyySingleFramLayout.SetClickListener((f) =>
-                {
-                    action?.Invoke(IntType.Control);
-                });
-            }
-
-        }
-        /// <summary>
-        /// 鍒濆鍖栫晫闈�
-        /// </summary>
-        private void InitUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            Button btnTitle = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Height = Application.GetRealHeight(22),
-                Width = Application.GetRealWidth(200),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text16,
-                Text = this.remoteControl.name,
-                IsBold = true,
-            };
-            this.AddChidren(btnTitle);
-
-
-            FrameLayout bottomLayout = new FrameLayout
-            {
-                Y = btnTitle.Bottom + Application.GetRealHeight(16),
-                Width = Application.GetRealWidth(240),
-                Height = Application.GetRealHeight(1095 - 122 - 60),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
-                Radius = (uint)Application.GetRealHeight(17),
-                BackgroundColor = 0xff798394,
-                Gravity = Gravity.CenterHorizontal,
-            };
-            this.AddChidren(bottomLayout);
-
-
-            FrameLayout layout = new FrameLayout
-            {
-                Y = btnTitle.Bottom + Application.GetRealHeight(16),
-                //X = Application.GetRealWidth(71),
-                Width = Application.GetRealWidth(232),
-                Height = Application.GetRealHeight(1095 - 122 - 60),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
-                Radius = (uint)Application.GetRealHeight(17),
-                BackgroundColor = 0xff19181E,
-                Gravity = Gravity.CenterHorizontal,
-
-            };
-            this.AddChidren(layout);
-
-
-            FrameLayout switchFl = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(32),
-                Height = Application.GetRealWidth(48),
-                Width = Application.GetRealWidth(48),
-                Gravity = Gravity.CenterHorizontal,
-                BackgroundColor = 0xff201F25,
-                Radius = (uint)Application.GetRealWidth(24),
-
-            };
-            layout.AddChidren(switchFl);
-
-            switchBtn = new Button
-            {
-                Height = Application.GetRealWidth(48),
-                Width = Application.GetRealWidth(48),
-                Gravity = Gravity.Center,
-                UnSelectedImagePath = "AksIcon/ykq_kai.png",
-                SelectedImagePath = "AksIcon/ykq_kaiguang_selected.png"
-            };
-            switchFl.AddChidren(switchBtn);
-            switchBtn.MouseDownEventHandler += (senser, e) =>
-            {
-                switchBtn.IsSelected = true;
-            };
-            switchBtn.MouseUpOutsideEventHandler += (senser, e) =>
-            {
-                switchBtn.IsSelected = false;
-            };
-
-            int h = 49 - 6;
-            int offset = 28;//x杞村亸绉婚噺
-            int septal = 36;//闂撮殧
-            #region
-            var line1Fl = new FrameLayout
-            {
-                Y = switchFl.Bottom + Application.GetRealHeight(12),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line1Fl);
-
-
-            xinxiFL = new CustomFrameLayout();
-            line1Fl.AddChidren(xinxiFL);
-            xinxiFL.X = Application.GetRealWidth(offset);
-            xinxiFL.AddImageView();
-            xinxiFL.AddTextButtonView();
-            xinxiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_xinxi.png";
-            xinxiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_xinxi_selected.png";
-            xinxiFL.GetTextButton().Text = "淇℃伅";
-            xinxiFL.AddClickView();
-
-
-            shoucangFL = new CustomFrameLayout();
-            line1Fl.AddChidren(shoucangFL);
-            shoucangFL.X = xinxiFL.Right + Application.GetRealWidth(110);
-            shoucangFL.AddImageView();
-            shoucangFL.AddTextButtonView();
-            shoucangFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_shoucang.png";
-            shoucangFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_shoucang_selected.png";
-            shoucangFL.GetTextButton().Text = "鏀惰棌";
-            shoucangFL.AddClickView();
-
-
-            var line2Fl = new FrameLayout
-            {
-                Y = line1Fl.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line2Fl);
-
-            dianyingFL = new CustomFrameLayout();
-            line2Fl.AddChidren(dianyingFL);
-            dianyingFL.X = Application.GetRealWidth(offset);
-            dianyingFL.AddImageView();
-            dianyingFL.AddTextButtonView();
-            dianyingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dianying.png";
-            dianyingFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dianying_selected.png";
-            dianyingFL.GetTextButton().Text = "鐢靛奖";
-            dianyingFL.AddClickView();
-
-
-            yuleFL = new CustomFrameLayout();
-            line2Fl.AddChidren(yuleFL);
-            yuleFL.X = dianyingFL.Right + Application.GetRealWidth(septal);
-            yuleFL.AddImageView();
-            yuleFL.AddTextButtonView();
-            yuleFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_yule.png";
-            yuleFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_yule_selected.png";
-            yuleFL.GetTextButton().Text = "濞变箰";
-            yuleFL.AddClickView();
-
-            dianshiFL = new CustomFrameLayout();
-            line2Fl.AddChidren(dianshiFL);
-            dianshiFL.X = yuleFL.Right + Application.GetRealWidth(septal);
-            dianshiFL.AddImageView();
-            dianshiFL.AddTextButtonView();
-            dianshiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dianshi.png";
-            dianshiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dianshi_selected.png";
-            dianshiFL.GetTextButton().Text = "鐢佃";
-            dianshiFL.AddClickView();
-
-
-
-            var line3Fl = new FrameLayout
-            {
-                Y = line2Fl.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line3Fl);
-
-            redFL = new CustomFrameLayout();
-            line3Fl.AddChidren(redFL);
-            redFL.X = Application.GetRealWidth(offset);
-            redFL.AddColorButtonView();
-            redFL.GetColorButto().BackgroundColor = MusicColor.RedColor;
-            redFL.AddClickView();
-
-
-            yellowFL = new CustomFrameLayout();
-            line3Fl.AddChidren(yellowFL);
-            yellowFL.X = redFL.Right + Application.GetRealWidth(septal);
-            yellowFL.AddColorButtonView();
-            yellowFL.GetColorButto().BackgroundColor = 0xffFC9C04;
-            yellowFL.AddClickView();
-
-
-            blueFL = new CustomFrameLayout();
-            line3Fl.AddChidren(blueFL);
-            blueFL.X = yellowFL.Right + Application.GetRealWidth(septal);
-            blueFL.AddColorButtonView();
-            blueFL.GetColorButto().BackgroundColor = MusicColor.MusicTxet14SelectedColor;
-            blueFL.AddClickView();
-
-
-
-
-            var line4Fl = new FrameLayout
-            {
-                Y = line3Fl.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line4Fl);
-
-            number1FL = new CustomFrameLayout();
-            line4Fl.AddChidren(number1FL);
-            number1FL.X = Application.GetRealWidth(offset);
-            number1FL.AddNumberButtonView();
-            number1FL.GetNumberButto().Text = "1";
-            number1FL.AddClickView();
-
-
-            number2FL = new CustomFrameLayout();
-            line4Fl.AddChidren(number2FL);
-            number2FL.X = number1FL.Right + Application.GetRealWidth(septal);
-            number2FL.AddNumberButtonView();
-            number2FL.GetNumberButto().Text = "2";
-            number2FL.AddClickView();
-
-
-            number3FL = new CustomFrameLayout();
-            line4Fl.AddChidren(number3FL);
-            number3FL.X = number2FL.Right + Application.GetRealWidth(septal);
-            number3FL.AddNumberButtonView();
-            number3FL.GetNumberButto().Text = "3";
-            number3FL.AddClickView();
-
-
-
-
-
-            var line5Fl = new FrameLayout
-            {
-                Y = line4Fl.Bottom,
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line5Fl);
-
-            number4FL = new CustomFrameLayout();
-            line5Fl.AddChidren(number4FL);
-            number4FL.X = Application.GetRealWidth(offset);
-            number4FL.AddNumberButtonView();
-            number4FL.GetNumberButto().Text = "4";
-            number4FL.AddClickView();
-
-
-
-
-            number5FL = new CustomFrameLayout();
-            line5Fl.AddChidren(number5FL);
-            number5FL.X = number4FL.Right + Application.GetRealWidth(septal);
-            number5FL.AddNumberButtonView();
-            number5FL.GetNumberButto().Text = "5";
-            number5FL.AddClickView();
-
-
-            number6FL = new CustomFrameLayout();
-            line5Fl.AddChidren(number6FL);
-            number6FL.X = number5FL.Right + Application.GetRealWidth(septal);
-            number6FL.AddNumberButtonView();
-            number6FL.GetNumberButto().Text = "6";
-            number6FL.AddClickView();
-
-
-
-
-            var line6Fl = new FrameLayout
-            {
-                Y = line5Fl.Bottom,
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line6Fl);
-
-            number7FL = new CustomFrameLayout();
-            line6Fl.AddChidren(number7FL);
-            number7FL.X = Application.GetRealWidth(offset);
-            number7FL.AddNumberButtonView();
-            number7FL.GetNumberButto().Text = "7";
-            number7FL.AddClickView();
-
-
-            number8FL = new CustomFrameLayout();
-            line6Fl.AddChidren(number8FL);
-            number8FL.X = number7FL.Right + Application.GetRealWidth(septal);
-            number8FL.AddNumberButtonView();
-            number8FL.GetNumberButto().Text = "8";
-            number8FL.AddClickView();
-
-
-            number9FL = new CustomFrameLayout();
-            line6Fl.AddChidren(number9FL);
-            number9FL.X = number8FL.Right + Application.GetRealWidth(septal);
-            number9FL.AddNumberButtonView();
-            number9FL.GetNumberButto().Text = "9";
-            number9FL.AddClickView();
-
-
-
-            var line7Fl = new FrameLayout
-            {
-                Y = line6Fl.Bottom,
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line7Fl);
-
-            yinguiFL = new CustomFrameLayout();
-            line7Fl.AddChidren(yinguiFL);
-            yinguiFL.X = Application.GetRealWidth(offset);
-            yinguiFL.AddImageView();
-            yinguiFL.AddTextButtonView();
-            yinguiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_yingui.png";
-            yinguiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_yingui_selected.png";
-            yinguiFL.GetTextButton().Text = "闊宠建";
-            yinguiFL.AddClickView();
-
-
-            number0FL = new CustomFrameLayout();
-            line7Fl.AddChidren(number0FL);
-            number0FL.X = yinguiFL.Right + Application.GetRealWidth(septal);
-            number0FL.AddNumberButtonView();
-            number0FL.GetNumberButto().Text = "0";
-            number0FL.AddClickView();
-
-
-            zimuFL = new CustomFrameLayout();
-            line7Fl.AddChidren(zimuFL);
-            zimuFL.X = number0FL.Right + Application.GetRealWidth(septal);
-            zimuFL.AddImageView();
-            zimuFL.AddTextButtonView();
-            zimuFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_zimu.png";
-            zimuFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_zimu_selected.png";
-            zimuFL.GetTextButton().Text = "瀛楀箷";
-            zimuFL.AddClickView();
-            zimuFL.AddClickView();
-
-
-
-
-
-            var line8Fl = new FrameLayout
-            {
-                Y = line7Fl.Bottom + Application.GetRealHeight(16),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line8Fl);
-
-            jingyinFL = new CustomFrameLayout();
-            line8Fl.AddChidren(jingyinFL);
-            jingyinFL.X = Application.GetRealWidth(offset);
-            jingyinFL.AddImageView();
-            jingyinFL.AddTextButtonView();
-            jingyinFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_jingyin.png";
-            jingyinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_jingyin_selected.png";
-            jingyinFL.GetTextButton().Text = "闈欓煶";
-            jingyinFL.AddClickView();
-
-
-            toupingFL = new CustomFrameLayout();
-            line8Fl.AddChidren(toupingFL);
-            toupingFL.X = jingyinFL.Right + Application.GetRealWidth(septal);
-            toupingFL.AddImageView();
-            toupingFL.AddTextButtonView();
-            toupingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_toupin.png";
-            toupingFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_touping_selected.png";
-            toupingFL.GetTextButton().Text = "鎶曞睆";
-            toupingFL.AddClickView();
-
-
-            zhuyeFL = new CustomFrameLayout();
-            line8Fl.AddChidren(zhuyeFL);
-            zhuyeFL.X = toupingFL.Right + Application.GetRealWidth(septal);
-            zhuyeFL.AddImageView();
-            zhuyeFL.AddTextButtonView();
-            zhuyeFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_zhuye.png";
-            zhuyeFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_zhuye_selected.png";
-            zhuyeFL.GetTextButton().Text = "涓婚〉";
-            zhuyeFL.AddClickView();
-
-
-
-            #region   鑿滃崟甯冨眬
-
-
-            var baseFl = new BaseFramLayout
-            {
-                Y = line8Fl.Bottom,
-                Height = Application.GetRealHeight(207 - 32 - 12),
-            };
-            layout.AddChidren(baseFl);
-
-
-            btnYingliangjia = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(26),
-                Width = Application.GetRealWidth(36),
-                Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_yingliangjia.png",
-                SelectedImagePath = "AksIcon/ykq_yingliangjia_selected.png",
-            };
-            baseFl.AddChidren(btnYingliangjia);
-           
-
-
-            btnYingliangjian = new Button
-            {
-                Y = btnYingliangjia.Bottom + Application.GetRealHeight(71),
-                X = Application.GetRealWidth(26),
-                Width = Application.GetRealWidth(36),
-                Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_yingliangjian.png",
-                SelectedImagePath = "AksIcon/ykq_yingliangjian_selected.png",
-            };
-            baseFl.AddChidren(btnYingliangjian);
-            
-
-
-            btnPindaojia = new Button
-            {
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(170),
-                Width = Application.GetRealWidth(36),
-                Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_pindaojia.png",
-                SelectedImagePath = "AksIcon/ykq_pindaojia_selected.png",
-            };
-            baseFl.AddChidren(btnPindaojia);
-           
-
-
-            btnPindaojian = new Button
-            {
-                Y = btnPindaojia.Bottom + Application.GetRealHeight(71),
-                X = Application.GetRealWidth(170),
-                Width = Application.GetRealWidth(36),
-                Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_pindaojian.png",
-                SelectedImagePath = "AksIcon/ykq_pindaojian_selected.png",
-            };
-            baseFl.AddChidren(btnPindaojian);
-           
-
-
-
-            okFl = new FrameLayout
-            {
-                Y = Application.GetRealHeight(16),
-                Height = Application.GetRealWidth(143),
-                Width = Application.GetRealWidth(143),
-                BackgroundImagePath = "AksIcon/ykq_ok.png",
-                Gravity = Gravity.CenterHorizontal,
-            };
-            baseFl.AddChidren(okFl);
-
-
-            btnLeft = new Button
-            {
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealHeight(20),
-                Gravity = Gravity.CenterVertical,
-            };
-
-            okFl.AddChidren(btnLeft);
-
-
-
-
-            btnShang = new Button
-            {
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealHeight(30),
-                Gravity = Gravity.CenterHorizontal,
-            };
-
-            okFl.AddChidren(btnShang);
-
-            btnRight = new Button
-            {
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealHeight(20),
-                Gravity = Gravity.CenterRight,
-            };
-
-            okFl.AddChidren(btnRight);
-
-            btnXia = new Button
-            {
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealHeight(30),
-                Gravity = Gravity.BottomCenter,
-            };
-            okFl.AddChidren(btnXia);
-
-
-
-            btnOk = new Button
-            {
-                Width = Application.GetRealWidth(52),
-                Height = Application.GetRealWidth(52),
-                Gravity = Gravity.Center,
-            };
-            okFl.AddChidren(btnOk);
-
-            #endregion
-
-
-
-
-            var line9Fl = new FrameLayout
-            {
-                Y = baseFl.Bottom,
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line9Fl);
-
-            caidanFL = new CustomFrameLayout();
-            line9Fl.AddChidren(caidanFL);
-            caidanFL.X = Application.GetRealWidth(offset);
-            caidanFL.AddImageView();
-            caidanFL.AddTextButtonView();
-            caidanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_caidan.png";
-            caidanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_caidan_selected.png";
-            caidanFL.GetTextButton().Text = "鑿滃崟";
-            caidanFL.AddClickView();
-
-
-            fanhuiFL = new CustomFrameLayout();
-            line9Fl.AddChidren(fanhuiFL);
-            fanhuiFL.X = caidanFL.Right + Application.GetRealWidth(110);
-            fanhuiFL.AddImageView();
-            fanhuiFL.AddTextButtonView();
-            fanhuiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_fanhui.png";
-            fanhuiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_fanhui_selected.png";
-            fanhuiFL.GetTextButton().Text = "杩斿洖";
-            fanhuiFL.AddClickView();
-
-
-
-            var line10Fl = new FrameLayout
-            {
-                Y = line9Fl.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line10Fl);
-
-            shanyibuFL = new CustomFrameLayout();
-            line10Fl.AddChidren(shanyibuFL);
-            shanyibuFL.X = Application.GetRealWidth(offset);
-            shanyibuFL.AddImageView();
-            shanyibuFL.AddTextButtonView();
-            shanyibuFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_shangyibu.png";
-            shanyibuFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_shangyibu_selected.png";
-            shanyibuFL.GetTextButton().Text = "涓婁竴閮�";
-            shanyibuFL.AddClickView();
-
-
-            bofangFL = new CustomFrameLayout();
-            line10Fl.AddChidren(bofangFL);
-            bofangFL.X = shanyibuFL.Right + Application.GetRealWidth(septal);
-            bofangFL.AddImageView();
-            bofangFL.AddTextButtonView();
-            bofangFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_bofan.png";
-            bofangFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_bofan_selected.png";
-            bofangFL.GetTextButton().Text = "鎾斁";
-            bofangFL.AddClickView();
-
-
-            xiayibuFL = new CustomFrameLayout();
-            line10Fl.AddChidren(xiayibuFL);
-            xiayibuFL.X = bofangFL.Right + Application.GetRealWidth(septal);
-            xiayibuFL.AddImageView();
-            xiayibuFL.AddTextButtonView();
-            xiayibuFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_xiayibu.png";
-            xiayibuFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_xiayibu_selected.png";
-            xiayibuFL.GetTextButton().Text = "涓嬩竴閮�";
-            xiayibuFL.AddClickView();
-
-
-
-
-
-
-            var line11Fl = new FrameLayout
-            {
-                Y = line10Fl.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line11Fl);
-
-            kuaituiFL = new CustomFrameLayout();
-            line11Fl.AddChidren(kuaituiFL);
-            kuaituiFL.X = Application.GetRealWidth(offset);
-            kuaituiFL.AddImageView();
-            kuaituiFL.AddTextButtonView();
-            kuaituiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaitui.png";
-            kuaituiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaijin_selected.png";
-            kuaituiFL.GetTextButton().Text = "蹇��";
-            kuaituiFL.AddClickView();
-
-
-
-
-            zantingFL = new CustomFrameLayout();
-            line11Fl.AddChidren(zantingFL);
-            zantingFL.X = kuaituiFL.Right + Application.GetRealWidth(septal);
-            zantingFL.AddImageView();
-            zantingFL.AddTextButtonView();
-            zantingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_zanting.png";
-            zantingFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_zanting_selected.png";
-            zantingFL.GetTextButton().Text = "鏆傚仠";
-            zantingFL.AddClickView();
-
-
-
-
-            kusinjinFL = new CustomFrameLayout();
-            line11Fl.AddChidren(kusinjinFL);
-            kusinjinFL.X = zantingFL.Right + Application.GetRealWidth(septal);
-            kusinjinFL.AddImageView();
-            kusinjinFL.AddTextButtonView();
-            kusinjinFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaijin.png";
-            kusinjinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaitui_selected.png";
-            kusinjinFL.GetTextButton().Text = "蹇繘";
-            kusinjinFL.AddClickView();
-
-
-
-
-
-
-            var line12Fl = new FrameLayout
-            {
-                Y = line11Fl.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(h),
-            };
-            layout.AddChidren(line12Fl);
-
-            dengguanFL = new CustomFrameLayout();
-            line12Fl.AddChidren(dengguanFL);
-            dengguanFL.X = Application.GetRealWidth(offset);
-            dengguanFL.AddImageView();
-            dengguanFL.AddTextButtonView();
-            dengguanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dengguan.png";
-            dengguanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dengguang_selected.png";
-            dengguanFL.GetTextButton().Text = "鐏厜1";
-            dengguanFL.AddClickView();
-
-
-            tingzhiFL = new CustomFrameLayout();
-            line12Fl.AddChidren(tingzhiFL);
-            tingzhiFL.X = dengguanFL.Right + Application.GetRealWidth(septal);
-            tingzhiFL.AddImageView();
-            tingzhiFL.AddTextButtonView();
-            tingzhiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_tingzhi.png";
-            tingzhiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_tingzhi_selected.png";
-            tingzhiFL.GetTextButton().Text = "鍋滄";
-            tingzhiFL.AddClickView();
-
-
-
-            dankongdengFL = new CustomFrameLayout();
-            line12Fl.AddChidren(dankongdengFL);
-            dankongdengFL.X = tingzhiFL.Right + Application.GetRealWidth(septal);
-            dankongdengFL.AddImageView();
-            dankongdengFL.AddTextButtonView();
-            dankongdengFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dankongdeng.png";
-            dankongdengFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dankongdeng_selected.png";
-            dankongdengFL.GetTextButton().Text = "鐏厜2";
-            dankongdengFL.AddClickView();
-
-            #endregion
-
-
-
-
-            //搴曢儴瀹瑰櫒
-            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 72, 17);
-            cornerBottomFram.X = Application.GetRealWidth(16);
-            cornerBottomFram.Y = layout.Bottom + Application.GetRealHeight(16);
-            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
-            this.AddChidren(cornerBottomFram);
-
-
-            if (sequencerList.Count == 0)
-            {
-                //娌℃湁鏃跺簭鍣�
-                tyySingleFramLayout = new TypeSingleFramLayout();
-                tyySingleFramLayout.AddView(cornerBottomFram);
-                tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
-                tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
-                tyySingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical;
-                tyySingleFramLayout.btnName.Text = this.remoteControl.name;
-                tyySingleFramLayout.btnName.X = Application.GetRealWidth(16);
-                tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48);
-                tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
-                tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
-                tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
-                tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
-                tyySingleFramLayout.btnLeftImage.Visible = false;
-
-                tyySingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
-                  tyySingleFramLayout.singleFramLayout,
-                  tyySingleFramLayout.btnName,
-                   tyySingleFramLayout.btnRightImage,
-                   48, 200);
-
-            }
-            else
-            {
-
-                typeMultiFramLayout = new TypeMultiFramLayout();
-                typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
-                typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
-            }
-
-            this.AdjustRealHeight(16);
-        }
-
-        /// <summary>
-        /// 鎸夐敭鎺у埗
-        /// </summary>
-        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
-        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-
-        private void KeyControl(string keypad, string keyName, bool isSupport = true)
-        {
-            //CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
-                }
-                catch { }
-                finally
-                {
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-
-        }
-
-    }
-
-    /// <summary>
-    /// 鑷繁寮勪竴涓狥rameLayout
-    /// </summary>
-    class CustomFrameLayout : BaseFramLayout
-    {
-        public const int widthFrameLayout = 36;
-        public const int heightFrameLayout = 49 - 6;
-        public CustomFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-        }
-        Button btnImage = new Button
-        {
-            Width = Application.GetRealWidth(32),
-            Height = Application.GetRealWidth(32),
-            Gravity = Gravity.TopCenter,
-
-        };
-        Button btnText = new Button
-        {
-            Width = Application.GetRealWidth(36),
-            Height = Application.GetRealHeight(16),
-            TextSize = TextSize.Text12,
-            TextColor = MusicColor.WhiteColor,
-            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-            TextAlignment = TextAlignment.Center,
-            Gravity = Gravity.CenterHorizontal,
-            Padding = new Padding(0, 0, 0, 0),
-        };
-        Button btnNumber = new Button
-        {
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(heightFrameLayout),
-            Gravity = Gravity.Center,
-            TextSize = 20,
-            TextColor = MusicColor.WhiteColor,
-            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-            IsBold = true,
-
-        };
-        Button btn = new Button
-        {
-            Width = Application.GetRealWidth(12),
-            Height = Application.GetRealWidth(12),
-            Gravity = Gravity.Center,
-            Radius = (uint)Application.GetRealWidth(6),
-            BackgroundColor = 0x00000000,
-            SelectedBackgroundColor = 0xFFF2F3F7,
-        };
-
-        public FrameLayout clickFl = new FrameLayout
-        {
-            Width = Application.GetRealWidth(widthFrameLayout),
-            Height = Application.GetRealHeight(heightFrameLayout),
-        };
-
-
-        public void AddImageView()
-        {
-            this.AddChidren(btnImage);
-
-        }
-        public void AddTextButtonView()
-        {
-            btnText.Y = btnImage.Bottom;
-            this.AddChidren(btnText);
-        }
-        public void AddColorButtonView()
-        {
-            this.AddChidren(btn);
-        }
-
-        public void AddNumberButtonView()
-        {
-            this.AddChidren(btnNumber);
-        }
-        public Button GetImageButton()
-        {
-            return this.btnImage;
-        }
-        public Button GetTextButton()
-        {
-            return this.btnText;
-        }
-
-        public Button GetColorButto()
-        {
-            return this.btn;
-        }
-        public Button GetNumberButto()
-        {
-            return this.btnNumber;
-        }
-
-        public void AddClickView()
-        {
-            this.AddChidren(clickFl);
-
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// 鏄畾瑕佹坊鍔燗ddClickView(),鐐瑰嚮浜嬩欢鎵嶇敓鏁�;
-        /// </summary>
-        /// <param name="action">鍥炶皟(鐖剁被瀵硅薄)</param>
-        public void SetClickListener(Action action)
-        {
-            clickFl.MouseUpEventHandler += (sender, e) =>
-            {
-                action?.Invoke();
-                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                btnImage.IsSelected = true;
-                btnText.IsSelected = true;
-                btnNumber.IsSelected = true;
-                btn.IsSelected = true;
-                new System.Threading.Thread(() =>
-                {
-                    System.Threading.Thread.Sleep(millisecondsTimeout);
-                    Application.RunOnMainThread(() =>
-                    {
-                        //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-                        btnImage.IsSelected = false;
-                        btnText.IsSelected = false;
-                        btnNumber.IsSelected = false;
-                        btn.IsSelected = false;
-                    });
-                })
-                { IsBackground = true }.Start();
-              
-            };
-
-            
-
-        }
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index d9ae722..95e5906 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -4,7 +4,6 @@
 using HDL_ON.DriverLayer;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 using Newtonsoft.Json.Linq;
 using Shared;
 
@@ -228,382 +227,7 @@
             //    });
             #endregion
 
-            #region 鍒犻櫎璁惧琛�  搴忓垪鍙� 鍨嬪彿
-            if (this.function.spk == SPK.VideoDoorLock)
-            {
-                contentView.AddChidren(new Button()
-                {
-                    Height = Application.GetRealWidth(8),
-                });
 
-                #region 寮�閿佽缃�
-                var unlockSettingView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(55),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(unlockSettingView);
-
-                //unlockSettingView.AddChidren(new Button
-                //{
-                //    Gravity = Gravity.CenterHorizontal,
-                //    BackgroundColor = CSS_Color.DividingLineColor,
-                //    Width = Application.GetRealWidth(343),
-                //    Height = Application.GetRealHeight(1)
-                //});
-
-                var unlockRightBtn = new Button()
-                {
-                    X = Application.GetRealWidth(339),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetMinRealAverage(16),
-                    Height = Application.GetMinRealAverage(16),
-                    UnSelectedImagePath = "Public/RightIcon.png",
-                };
-                unlockSettingView.AddChidren(unlockRightBtn);
-
-                var btnUnlockText = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.UnlockSetting,
-                };
-                unlockSettingView.AddChidren(btnUnlockText);
-
-                EventHandler<MouseEventArgs> unlockSettingEvent = (sender, e) =>
-                {
-                    var page = new UnlockSettingPage(function);
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                };
-                btnUnlockText.MouseUpEventHandler = unlockSettingEvent;
-                #endregion
-
-                #region 闊抽璁剧疆
-                var audioSetupView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(55),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(audioSetupView);
-
-                audioSetupView.AddChidren(new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1)
-                });
-
-                var btnAudioSetupRight = new Button()
-                {
-                    X = Application.GetRealWidth(339),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetMinRealAverage(16),
-                    Height = Application.GetMinRealAverage(16),
-                    UnSelectedImagePath = "Public/RightIcon.png",
-                };
-                audioSetupView.AddChidren(btnAudioSetupRight);
-
-                var btnAudioSetupText = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.AudioSetup,
-                };
-                audioSetupView.AddChidren(btnAudioSetupText);
-                btnAudioSetupText.MouseUpEventHandler = (sender, e) => {
-                    var page = new VideoDoorlockAudioSetupPage(function);
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
-                };
-                #endregion
-
-                #region 鐢垫睜绠$悊
-                var batteryManagementView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(55),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(batteryManagementView);
-
-                batteryManagementView.AddChidren(new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1)
-                });
-
-                var btnBatteryManagementRight = new Button()
-                {
-                    X = Application.GetRealWidth(339),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetMinRealAverage(16),
-                    Height = Application.GetMinRealAverage(16),
-                    UnSelectedImagePath = "Public/RightIcon.png",
-                };
-                batteryManagementView.AddChidren(btnBatteryManagementRight);
-
-                var btnBatteryManagementText = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.BatteryManagement,
-                };
-                batteryManagementView.AddChidren(btnBatteryManagementText);
-                btnBatteryManagementText.MouseUpEventHandler = (sender, e) => {
-                    var page = new VideoDoorlockBatteryManagementPage();
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                };
-
-               
-                #endregion
-
-                #region 搴忓垪鍙�
-                var serialView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(55),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(serialView);
-
-                var serialLineBtn = new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1)
-                };
-                serialView.AddChidren(serialLineBtn);
-                var serialTextBtn = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(160),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.xuliehao,
-                };
-                serialView.AddChidren(serialTextBtn);
-                var serialValuesBtn = new Button()
-                {
-                    X = Application.GetRealWidth(106),
-                    Width = Application.GetRealWidth(237),
-                    TextAlignment = TextAlignment.CenterRight,
-                    TextColor = CSS_Color.PromptingColor1,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    Text = this.function.sid,
-                };
-                serialView.AddChidren(serialValuesBtn);
-                #endregion
-
-                #region 鍨嬪彿
-                var modelView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(55),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(modelView);
-
-                var modelLineBtn = new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1)
-                };
-                modelView.AddChidren(modelLineBtn);
-                var modelTextBtn = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(160),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.xinghao,
-                };
-                modelView.AddChidren(modelTextBtn);
-                var modelValuesBtn = new Button()
-                {
-                    X = Application.GetRealWidth(106),
-                    Width = Application.GetRealWidth(237),
-                    TextAlignment = TextAlignment.CenterRight,
-                    TextColor = CSS_Color.PromptingColor1,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    Text = this.function.omodel,
-                };
-                modelView.AddChidren(modelValuesBtn);
-                #endregion
-
-                #region 鍒犻櫎璁惧琛�
-                contentView.AddChidren(new Button() {
-                    Height = Application.GetRealHeight(48),
-                });
-
-                var delTextBtn = new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(220),
-                    Height = Application.GetRealWidth(44),
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.WarningColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.DeleteDevice,
-                    Radius = (uint)Application.GetRealWidth(22),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(delTextBtn);
-
-                EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
-                {
-
-                    new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
-                    {
-                        UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.DelDevice(this.function, (isBool) =>
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                if (!isBool)
-                                {
-                                    new Tip()
-                                    {
-                                        CloseTime = 1,
-                                        Text = Language.StringByID(StringId.delFail),
-                                        Direction = AMPopTipDirection.None,
-                                    }.Show(bodyView);
-                                    return;
-                                }
-                                //鍒犻櫎鏈湴鏂囦欢                                  
-                                UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DeleteFunction(this.function);
-                                this.RemoveFromParent();
-                                this.actionDel?.Invoke();
-                            });
-
-                        });
-
-                    });
-                };
-                delTextBtn.MouseUpEventHandler = ClickEvent;
-
-                #endregion
-
-
-            }
-            #endregion
-
-            #region 鍒犻櫎娴蜂俊鐢佃璁惧 
-            if (this.function.spk == SPK.ElectricalTvHisense)
-            {
-                contentView.AddChidren(new Button()
-                {
-                    Height = Application.GetRealWidth(8),
-                });
-
-                #region 鍒犻櫎璁惧琛�
-                contentView.AddChidren(new Button()
-                {
-                    Height = Application.GetRealHeight(48),
-                });
-
-                var delTextBtn = new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(220),
-                    Height = Application.GetRealWidth(44),
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.WarningColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextID = StringId.jiebangshebei,
-                    Radius = (uint)Application.GetRealWidth(22),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                //濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
-                if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
-                {
-                    contentView.AddChidren(delTextBtn);
-                }
-
-
-                EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
-                {
-
-                    new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
-                    {
-                        HDL_ON.UI.UI2.FuntionControlView.HisenseTV.Send.Current.DelDevice(this.function.deviceId, (isBool) =>
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    if (!isBool)
-                                    {
-                                        new Tip()
-                                        {
-                                            CloseTime = 1,
-                                            Text = Language.StringByID(StringId.delFail),
-                                            Direction = AMPopTipDirection.None,
-                                        }.Show(bodyView);
-                                        return;
-                                    }
-                                //鍒犻櫎鏈湴鏂囦欢                                  
-                                UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DeleteFunction(this.function);
-                                    this.RemoveFromParent();
-                                    this.actionDel?.Invoke();
-                                });
-
-                            });
-
-                    });
-                };
-                delTextBtn.MouseUpEventHandler = ClickEvent;
-
-                #endregion
-
-
-            }
-            #endregion
-#if stage2
-            #region 娣诲姞鍒版闈�
-            var addToDesktopView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(55),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(addToDesktopView);
-
-            var btnAddToDesktopText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Width = Application.GetRealWidth(160),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.AddToDesktop,
-            };
-            addToDesktopView.AddChidren(btnAddToDesktopText);
-
-            var btnAddToDesktopRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/RightIcon.png",
-            };
-            addToDesktopView.AddChidren(btnAddToDesktopRight);
-
-            #endregion
-#endif
 
             if (function.spk == SPK.ElectricEnergy)
             {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs
deleted file mode 100644
index 7200e98..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-锘縰sing System;
-namespace HDL_ON.UI.UI2.FuntionControlView.HisenseTV
-{
-    /// <summary>
-	/// 娴蜂俊鐢佃鍔熻兘灞炴�у父閲�
-	/// </summary>
-    public class HisenseTVFunctionalAttributeConstant
-    {
-        /// <summary>
-        /// 缃戠粶鍞ら啋(value:on)
-        /// </summary>
-        public const string wol = "wol";
-        /// <summary>
-        /// 鍏�(value:0-鍏�/1-寮�)
-        /// </summary>
-        public const string on_off = "on_off";
-        /// <summary>
-        /// 闊抽噺澧炲姞(Value榛樿鈥濃��)
-        /// </summary>
-        public const string volume_add = "volume+";
-        /// <summary>
-        /// 闊抽噺鍑忓皯(Value榛樿鈥濃��)
-        /// </summary>
-        public const string volume_subtract = "volume-";
-        /// <summary>
-        /// 闈欓煶(value:0-鍙栨秷闈欓煶,1-闈欓煶)
-        /// </summary>
-        public const string mute = "mute";
-        /// <summary>
-        /// 鎿嶄綔鑿滃崟(value:0-涓�;1-涓�;2-宸�;3-鍙�;4-纭畾;5-杩斿洖;11-鑿滃崟椤�;)
-        /// </summary>
-        public const string operation = "operation";
-        /// <summary>
-        /// 鎾斁(Value榛樿鈥濃��)
-        /// </summary>
-        public const string media_play = "media_play";
-        /// <summary>
-        /// 鏆傚仠(Value榛樿鈥濃��)
-        /// </summary>
-        public const string media_pause = "media_pause";
-        /// <summary>
-        /// 蹇繘(Value榛樿鈥濃��)
-        /// </summary>
-        public const string fast_forward = "fast_forward";
-        /// <summary>
-        /// 蹇��(Value榛樿鈥濃��)
-        /// </summary>
-        public const string fast_back = "fast_back";
-        /// <summary>
-        /// 棣栭〉(Value榛樿鈥濃��)
-        /// </summary>
-        public const string home_page = "home_page";
-        /// <summary>
-        /// 淇″彿婧�(Value:0-LiveTV;2-PS;3-HDMI_1;4-HDMI_2;5-HDMI_3;6-HDMI_4;11-AV;)
-        /// </summary>
-        public const string signal = "signal";
-        /// <summary>
-        /// 绯荤粺璁剧疆(Value榛樿鈥濃��)
-        /// </summary>
-        public const string system_setting = "system_setting";
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
deleted file mode 100644
index d0a93d8..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
+++ /dev/null
@@ -1,1027 +0,0 @@
-锘縰sing Shared;
-using System;
-using System.Collections.Generic;
-using HDL_ON.Entity;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.HisenseTV
-{
-    /// <summary>
-    /// 娴蜂俊鐢佃鐣岄潰
-    /// </summary>
-    public class HisenseTvPage : BaseFramLayout
-    {
-
-
-        #region   -------鍙橀噺澹版槑---------  
-        /// <summary>
-        /// 璁惧
-        /// </summary>
-        private Function device;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢
-        /// </summary>
-        private Button btnDeviceName;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢
-        /// </summary>
-        private Button btnRoomName;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑鏀惰棌鎺т欢
-        /// </summary>
-        private Button btnCollectionIcon;
-        /// <summary>
-        /// 澶撮儴甯冨眬
-        /// </summary>
-        private TopView topView;
-        /// <summary>
-        ///涓儴甯冨眬
-        /// </summary>
-        VerticalScrolViewLayout vv;
-        /// <summary>
-        /// 褰撳墠璁惧鍚嶇О
-        /// </summary>
-        private Button btnOpenCurrDeviceName;
-        /// <summary>
-        /// 鍖哄煙
-        /// </summary>
-        private Button btnOpenCurrDeviceRoom;
-        /// <summary>
-        ///鏀惰棌鍥炬爣
-        /// </summary>
-        private Button btnOpenCollectIcon;
-        CustomFrameLayout shouyeFL;
-        CustomFrameLayout kaijiFL;
-        CustomFrameLayout guanFL;
-        Button btn_jia;
-        Button btn_jian;
-        CustomButton caidanBtn;
-        CustomButton bofangBtn;
-        CustomButton zantingBtn;
-        CustomButton kuaijinBtn;
-        CustomButton kauituiBtn;
-        CustomButton jingyinBtn;
-        CustomButton shezhiBtn;
-        CustomButton jiechujingyinBtn;
-        CustomButton fanhuiBtn;
-        MenuFramLayout muenFrameLayout;
-        SourceFrameLayout sourceFrameLayout;
-
-        /// <summary>
-        /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
-        /// </summary>
-        private CommonMethod.Comerom comerom;
-        /// <summary>
-        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
-        /// </summary>
-        public Action action;
-        #endregion
-
-        /// <summary>
-        /// 鏋勯�犲嚱鏁�
-        /// </summary>
-        /// <param name="function">璁惧</param>
-        /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
-        /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
-        /// <param name="btnCollectionIcon">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param> 
-        public HisenseTvPage(Function function, Button btnDeviceName, Button btnRoomName, Button btnCollectionIcon, CommonMethod.Comerom comerom, Action action)
-        {
-            this.device = function;
-            this.btnDeviceName = btnDeviceName;
-            this.btnRoomName = btnRoomName;
-            this.btnCollectionIcon = btnCollectionIcon;
-            this.comerom = comerom;
-            this.action = action;
-
-        }
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitTopUI();
-            this.InitOpenUI();
-            //鍒濆鍖栦簨浠�
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-        /// <summary>
-        /// 娉ㄥ唽浜嬩欢
-        /// </summary>
-        private void EventListener()
-        {
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                this.RemoveFromParent();
-            };
-            //璁剧疆
-            this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                CommonMethod.Current.MainThread(() =>
-                {
-                    //璋冪敤绉�缁曠殑鐣岄潰
-                    var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
-                    {
-                        if (this.btnDeviceName == null || this.btnRoomName == null || this.device == null)
-                        {
-                            return;
-                        }
-                        ////鍒锋柊鏄剧ず
-                        this.btnDeviceName.Text = this.device.name;
-                        this.btnRoomName.Text = this.device.GetRoomListName();
-                        //
-                        this.btnOpenCurrDeviceName.Text = this.device.name;
-                        this.btnOpenCurrDeviceRoom.Text = this.device.GetRoomListName();
-                        this.CalculatedPosition();//閲嶆柊璁$畻瀹藉害
-
-                    });
-                    infoView.actionDel += () =>
-                    {
-                        //瑙g粦璁惧鍚�
-                        this.RemoveFromParent();
-                        this.action?.Invoke();
-
-                    };
-                    MainPage.BasePageView.AddChidren(infoView);
-                    infoView.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                });
-            };
-            //鏀惰棌
-            this.btnOpenCollectIcon.MouseUpEventHandler += (sender, e) =>
-            {
-                btnOpenCollectIcon.IsSelected = this.device.collect = !btnOpenCollectIcon.IsSelected;
-                this.device.CollectFunction();
-                this.btnCollectionIcon.IsSelected = btnOpenCollectIcon.IsSelected;
-            };
-
-            //棣栭〉
-            shouyeFL.SetClickListener((fl, btnImage, btnText) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.home_page, "");
-            });
-            //寮�鏈�
-            kaijiFL.SetClickListener((fl, btnImage, btnText) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.wol, "on");
-
-            });
-            //鍏虫満
-            guanFL.SetClickListener((fl, btnImage, btnText) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "off");
-
-            });
-            //闊抽噺+
-            btn_jia.MouseUpEventHandler += (sender, e) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.volume_add, "");
-                this.SetButtonIsSelected(btn_jia);
-
-            };
-            //闊抽噺-
-            btn_jian.MouseUpEventHandler += (sender, e) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.volume_subtract, "");
-                this.SetButtonIsSelected(btn_jian);
-            };
-            //鑿滃崟
-            caidanBtn.SetClickListener((btn) =>
-             {
-                 ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "11");
-
-             });
-            //鎾斁
-            bofangBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.media_play, "");
-
-            });
-            //鏆傚仠
-            zantingBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.media_pause, "");
-            });
-            //蹇繘
-            kuaijinBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.fast_forward, "");
-            });
-            //蹇��
-            kauituiBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.fast_back, "");
-            });
-            //闈欓煶
-            jingyinBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.mute, "1");
-            });
-            //璁剧疆
-            shezhiBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.system_setting, "");
-            });
-            //瑙i櫎闈欓煶
-            jiechujingyinBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.mute, "0");
-            });
-            //杩斿洖
-            fanhuiBtn.SetClickListener((btn) =>
-            {
-                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "5");
-            });
-            //涓�
-            muenFrameLayout.SetTopClickListener((muen) =>
-            {
-
-                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "0");
-
-            });
-            //涓�
-            muenFrameLayout.SetBottomClickListener((muen) =>
-            {
-
-                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "1");
-
-            });
-            //宸�
-            muenFrameLayout.SetLeftClickListener((muen) =>
-            {
-
-                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "2");
-
-            });
-            //鍙�
-            muenFrameLayout.SetRightClickListener((muen) =>
-            {
-
-                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "3");
-
-            });
-            //OK
-            muenFrameLayout.SetOkClickListener((muen) =>
-            {
-
-                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "4");
-
-            });
-            //淇″彿婧�
-            sourceFrameLayout.selectAction += (key) =>
-            {
-                var p = new UI2.Intelligence.Automation.PublicInterface();
-                var dic = p.GetHisenseSignalSourceDic();
-                string value = p.GetValue(dic, key);
-                ControlCommand(HisenseTVFunctionalAttributeConstant.signal, value);
-            };
-
-        }
-        /// <summary>
-        /// 鍙戦�佹帶鍒跺睘鎬ф寚浠�
-        /// </summary>
-        /// <param name="key">鍔熻兘灞炴��(璇泙涓婂畾涔夌殑)</param>
-        /// <param name="value">鍊�</param>
-        /// <param name="action">缁撴灉鍥炶皟(榛樿涓嶅洖璋�)</param>
-        private void ControlCommand(string key, string value, Action<bool> action = null)
-        {
-            try
-            {
-                if (this.device == null)
-                {
-                    //璁惧涓嶅湪绾挎帶鍒跺け璐�
-                    Application.RunOnMainThread(() =>
-                    {
-                        CommonMethod.Current.ShowTip(Language.StringByID(StringId.shebeibuzaixian), 3);
-                    });
-                    return;
-                }
-
-                if (!this.device.online && key != HisenseTVFunctionalAttributeConstant.wol)
-                {
-                    //璁惧涓嶅湪绾挎帶鍒跺け璐�
-                    Application.RunOnMainThread(() =>
-                    {
-                        CommonMethod.Current.ShowTip(Language.StringByID(StringId.shebeibuzaixian), 3);
-                    });
-                    return;
-                }
-
-                Dictionary<string, string> dic = new Dictionary<string, string>();
-                dic.Add(key, value);
-                Send.Current.SendControlCommand(this.device, dic, action);
-            }
-            catch { }
-        }
-        /// <summary>
-        /// 鍒濆鍖栨暟鎹�
-        /// </summary>
-        private void ReadData()
-        {
-            if (this.device == null)
-            {
-                return;
-            }
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-
-                    var isRefreshDeviceStatus = Send.Current.RefreshDeviceStatus(new List<string> { this.device.deviceId });
-                    if (isRefreshDeviceStatus)
-                    {
-                        var fun = Send.Current.GetDeviceInfo(this.device.deviceId);
-                        if (fun != null)
-                        {
-                            //鏇存柊鐪熷疄鍦ㄧ嚎鐘舵��
-                            this.device.online = fun.online;
-                        }
-
-                    }
-                }
-                catch { }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-        }
-
-        #region   -------鐣岄潰甯冨眬---------
-        /// <summary>
-        /// 鍒濆鍖栥�愬紑鏈恒�戠晫闈�
-        /// </summary>
-        private void InitOpenUI()
-        {
-            #region   ---鐣岄潰甯冨眬---
-            vv = new VerticalScrolViewLayout
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-            };
-            this.AddChidren(vv);
-            var baseOpenFL = new BaseFramLayout();
-            vv.AddChidren(baseOpenFL);
-            var backgroundOpenFl = new FrameLayout
-            {
-                Y = Application.GetRealHeight(24),
-                X = Application.GetRealWidth(24),
-                Height = Application.GetRealHeight(648-60),
-                Width = Application.GetRealWidth(327),
-                BackgroundImagePath = "HisenseTv/onbj.png",
-            };
-            baseOpenFL.AddChidren(backgroundOpenFl);
-
-            baseOpenFL.AdjustRealHeight(16);
-
-            btnOpenCollectIcon = new Button
-            {
-                X = Application.GetRealWidth(273),
-                Y = Application.GetRealHeight(14),
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealWidth(40),
-                UnSelectedImagePath = "MusicIcon/collect.png",
-                SelectedImagePath = "MusicIcon/collectSelected.png",
-                IsSelected = this.device.collect,
-            };
-            backgroundOpenFl.AddChidren(btnOpenCollectIcon);
-
-            btnOpenCurrDeviceName = new Button
-            {
-                TextSize = TextSize.Text24,
-                TextColor = MusicColor.Text18Color,
-                Width = Application.GetRealWidth(160),
-                Height = Application.GetRealHeight(33),
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Text = this.device.name,
-                TextAlignment = TextAlignment.CenterLeft,
-                IsBold = true
-            };
-            backgroundOpenFl.AddChidren(btnOpenCurrDeviceName);
-
-
-            btnOpenCurrDeviceRoom = new Button
-            {
-                TextSize = TextSize.Text12,
-                TextColor = MusicColor.MusicNoTxetColor,
-                Width = Application.GetRealWidth(160),
-                Height = Application.GetRealHeight(17),
-                Y = btnOpenCurrDeviceName.Bottom + Application.GetRealHeight(4),
-                X = Application.GetRealWidth(16),
-                Text = this.device.GetRoomListName(),
-                TextAlignment = TextAlignment.CenterLeft,
-            };
-            backgroundOpenFl.AddChidren(btnOpenCurrDeviceRoom);
-     
-            int yHeight = btnOpenCurrDeviceRoom.Bottom + Application.GetRealHeight(16);
-            shouyeFL = new CustomFrameLayout();
-            backgroundOpenFl.AddChidren(shouyeFL);
-            shouyeFL.X = Application.GetRealWidth(24);
-            shouyeFL.Y = yHeight;
-            shouyeFL.AddImageView();
-            shouyeFL.AddTextButtonView();
-            shouyeFL.GetImageButton().UnSelectedImagePath = "HisenseTv/shouye.png";
-            shouyeFL.GetImageButton().SelectedImagePath = "HisenseTv/shouyeSelected.png";
-            shouyeFL.GetTextButton().TextID = StringId.shouye;
-
-
-            kaijiFL = new CustomFrameLayout();
-            backgroundOpenFl.AddChidren(kaijiFL);
-            kaijiFL.X = shouyeFL.Right + Application.GetRealWidth(37);
-            kaijiFL.Y = yHeight;
-            kaijiFL.AddImageView();
-            kaijiFL.AddTextButtonView();
-            kaijiFL.GetImageButton().UnSelectedImagePath = "HisenseTv/kai.png";
-            kaijiFL.GetImageButton().SelectedImagePath = "HisenseTv/kaiguanSelected.png";
-            kaijiFL.GetTextButton().TextID = StringId.kaiji;
-
-            guanFL = new CustomFrameLayout();
-            backgroundOpenFl.AddChidren(guanFL);
-            guanFL.X = kaijiFL.Right + Application.GetRealWidth(37);
-            guanFL.Y = yHeight;
-            guanFL.AddImageView();
-            guanFL.AddTextButtonView();
-            guanFL.GetImageButton().UnSelectedImagePath = "HisenseTv/guan.png";
-            guanFL.GetImageButton().SelectedImagePath = "HisenseTv/kaiguanSelected.png";
-            //guanFL.GetImageButton().UnSelectedImagePath = "HisenseTv/caidan.png";
-            guanFL.GetTextButton().TextID = StringId.guanji;
-
-            var yinliangFL = new FrameLayout();
-            backgroundOpenFl.AddChidren(yinliangFL);
-            yinliangFL.Height = Application.GetRealHeight(146-16);
-            yinliangFL.Width = Application.GetRealWidth(68);
-            yinliangFL.Y = Application.GetRealHeight(260-8-20);
-            yinliangFL.X = shouyeFL.X;
-            yinliangFL.BackgroundColor = 0xFFF2F3F7;
-            yinliangFL.Radius = (uint)Application.GetRealWidth(34);
-
-            btn_jia = new Button
-            {
-                Width = Application.GetRealWidth(32),
-                Height = Application.GetRealWidth(32),
-                UnSelectedImagePath = "HisenseTv/yingliangjia.png",
-                SelectedImagePath = "HisenseTv/yingliangjiaSelected.png",
-                Y = Application.GetRealHeight(16),
-                Gravity = Gravity.CenterHorizontal,
-
-            };
-            yinliangFL.AddChidren(btn_jia);
-            Button btnText = new Button
-            {
-                Y = Application.GetRealHeight(63-8),
-                Height = Application.GetRealHeight(20),
-                //Text = "闊抽噺",
-                TextID = StringId.yinliang,
-                TextColor = MusicColor.TextColor,
-                TextSize = TextSize.Text14,
-                Gravity = Gravity.CenterHorizontal,
-
-            };
-            yinliangFL.AddChidren(btnText);
-            btn_jian = new Button
-            {
-                Y = Application.GetRealHeight(98-8),
-                Width = Application.GetRealWidth(32),
-                Height = Application.GetRealWidth(32),
-                UnSelectedImagePath = "HisenseTv/yingliangjian.png",
-                SelectedImagePath = "HisenseTv/yingliangjianSelected.png",
-                Gravity = Gravity.CenterHorizontal,
-
-            };
-            yinliangFL.AddChidren(btn_jian);
-
-            int bottomValue= 4;
-            caidanBtn = new CustomButton();
-            caidanBtn.TextID = StringId.caidan;
-            caidanBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
-            caidanBtn.X = shouyeFL.X;
-            backgroundOpenFl.AddChidren(caidanBtn);
-
-            bofangBtn = new CustomButton();
-            bofangBtn.TextID = StringId.bofang;
-            bofangBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
-            bofangBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(bofangBtn);
-
-      
-            zantingBtn = new CustomButton();
-            zantingBtn.TextID = StringId.zanting;
-            zantingBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
-            zantingBtn.X = bofangBtn.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(zantingBtn);
-
-            int bottomValue1 = 8;
-            kuaijinBtn = new CustomButton();
-            kuaijinBtn.TextID = StringId.kuaijin;
-            kuaijinBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(bottomValue1);
-            kuaijinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(kuaijinBtn);
-
-
-            kauituiBtn = new CustomButton();
-            kauituiBtn.TextID = StringId.kuaitui;
-            kauituiBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(bottomValue1);
-            kauituiBtn.X = kuaijinBtn.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(kauituiBtn);
-
-
-
-
-            jingyinBtn = new CustomButton();
-            jingyinBtn.TextID = StringId.jingyin;
-            jingyinBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(bottomValue1);
-            jingyinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(jingyinBtn);
-
-
-            shezhiBtn = new CustomButton();
-            shezhiBtn.TextID = StringId.shezhi;
-            shezhiBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(bottomValue1);
-            shezhiBtn.X = jingyinBtn.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(shezhiBtn);
-
-
-
-            jiechujingyinBtn = new CustomButton();
-            jiechujingyinBtn.TextID = StringId.jiechujingyin;
-            jiechujingyinBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(bottomValue1);
-            jiechujingyinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(jiechujingyinBtn);
-
-
-            fanhuiBtn = new CustomButton();
-            fanhuiBtn.TextID = StringId.fanhui;
-            fanhuiBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(bottomValue1);
-            fanhuiBtn.X = jiechujingyinBtn.Right + Application.GetRealWidth(37);
-            backgroundOpenFl.AddChidren(fanhuiBtn);
-
-
-            TypeFrameLayout typeFrameLayout = new TypeFrameLayout();
-            typeFrameLayout.middLayout.Y = yinliangFL.Bottom + Application.GetRealHeight(16);
-            typeFrameLayout.AddView(backgroundOpenFl);
-
-            muenFrameLayout = new MenuFramLayout();
-            muenFrameLayout.Y = Application.GetRealHeight(482-60);
-            muenFrameLayout.AddView(backgroundOpenFl);
-
-            sourceFrameLayout = new SourceFrameLayout();
-            sourceFrameLayout.Y = Application.GetRealHeight(482-60);
-            backgroundOpenFl.AddChidren(sourceFrameLayout);
-            sourceFrameLayout.LoadSourcePage();
-
-
-
-            muenFrameLayout.Visible = true;
-            sourceFrameLayout.Visible = false;
-            typeFrameLayout.SetLfteClickListener(() =>
-            {
-
-                muenFrameLayout.Visible = true;
-                sourceFrameLayout.Visible = false;
-            });
-            typeFrameLayout.SetRightClickListener(() =>
-            {
-                muenFrameLayout.Visible = false;
-                sourceFrameLayout.Visible = true;
-
-            });
-
-
-
-
-
-            #endregion
-
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栧ご閮�
-        /// </summary>
-        private void InitTopUI()
-        {
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = true;
-            this.topView.topNameBtn.TextID = StringId.dianshi;
-            this.AddChidren(topView.TopFLayoutView());
-        }
-
-
-        /// <summary>
-        /// 閲嶆柊璁$畻瀹藉害(璁惧鍚嶇О,鎴块棿鎺т欢)
-        /// </summary>
-        private void CalculatedPosition()
-        {
-            //寮�鏈虹姸鎬�
-            this.btnOpenCurrDeviceName.Width = this.btnOpenCurrDeviceName.GetTextWidth();
-            this.btnOpenCurrDeviceName.Width += 10;
-            if (this.btnOpenCurrDeviceName.GetTextWidth() > this.btnOpenCollectIcon.X)
-            {
-                //閲嶆柊璁$畻瀹藉害
-                this.btnOpenCurrDeviceName.Width = this.btnOpenCollectIcon.X + Application.GetRealWidth(-10);
-            }
-            this.btnOpenCurrDeviceRoom.Width = this.btnOpenCurrDeviceRoom.GetTextWidth();
-            this.btnOpenCurrDeviceRoom.Width += 10;
-            if (this.btnOpenCurrDeviceRoom.GetTextWidth() > this.btnOpenCollectIcon.X)
-            {
-                //閲嶆柊璁$畻瀹藉害
-                this.btnOpenCurrDeviceRoom.Width = this.btnOpenCollectIcon.X + Application.GetRealWidth(-20 - 10);
-            }
-            //this.cellFrame.X = this.btnCurrDeviceRoom.Right + Application.GetRealWidth(20);
-        }
-
-        #endregion
-
-    }
-    #region   -------鑷畾涔夊綋鍓嶇晫闈㈢殑瀹瑰櫒---------
-    /// <summary>
-    /// 鑷畾涔夛紙棣栭〉锛屽叧鏈猴紝鑿滃崟锛夊鍣�
-    /// </summary>
-    class CustomFrameLayout : BaseFramLayout
-    {
-        public const int widthFrameLayout = 68;
-        public const int heightFrameLayout = 68 + 8 + 20;
-        public const int interval = 37;//琛屼腑鐨勫垪闂撮殧鍊�
-
-        public CustomFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-        }
-        Button btnImage = new Button
-        {
-            Width = Application.GetRealWidth(68),
-            Height = Application.GetRealWidth(68),
-            Gravity = Gravity.TopCenter,
-            Name = "btnImage",
-
-        };
-        Button btnText = new Button
-        {
-            Width = Application.GetRealWidth(68),
-            Height = Application.GetRealWidth(20),
-            TextID = StringId.dangqianmenweiguan,
-            TextSize = TextSize.Text14,
-            TextColor = MusicColor.TextColor,
-            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-            TextAlignment = TextAlignment.Center,
-            Gravity = Gravity.CenterHorizontal,
-            Name = "btnText",
-            IsMoreLines = true,
-        };
-        public void AddImageView()
-        {
-            this.AddChidren(btnImage);
-        }
-        public void AddTextButtonView()
-        {
-            btnText.Y = Application.GetRealHeight(8) + btnImage.Bottom;
-            this.AddChidren(btnText);
-        }
-        public Button GetImageButton()
-        {
-            return this.btnImage;
-        }
-        public Button GetTextButton()
-        {
-            return this.btnText;
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;绗簩涓槸鍥炬爣瀵硅薄;绗笁涓槸鐘舵�佸璞�</param>
-        /// <param name="button1">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
-        /// <param name="button2">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
-        public void SetClickListener(Action<FrameLayout, Button, Button> action)
-        {
-
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-             {
-                 action?.Invoke(this, btnImage, btnText);
-                 SetButtonIsSelected(btnImage);
-             };
-            this.MouseUpEventHandler += UpClick;
-            btnImage.MouseUpEventHandler += UpClick;
-            btnText.MouseUpEventHandler += UpClick;
-
-        }
-
-    }
-    /// <summary>
-    /// 鎸夐敭瀹瑰櫒
-    /// </summary>
-    class CustomButton : Button
-    {
-
-        public CustomButton()
-        {
-
-            this.Width = Application.GetRealWidth(68);
-            this.Height = Application.GetRealHeight(38);
-            this.TextSize = 14;
-            this.TextColor = MusicColor.TextColor;
-            this.SelectedTextColor = MusicColor.MusicTxet14SelectedColor;
-            this.TextAlignment = TextAlignment.Center;
-            this.IsMoreLines = true;
-            this.BackgroundColor = 0xFFF2F3F7;
-            this.SelectedBackgroundColor = 0xffECEDEE;
-            this.Radius = (uint)Application.GetRealHeight(19);
-            this.Padding = new Padding(0, 0, 0, 0);
-        }
-
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄</param>
-        public void SetClickListener(Action<Button> action)
-        {
-            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
-            {
-                
-                action?.Invoke(this);
-                new BaseFramLayout().SetButtonIsSelected(this);
-
-            };
-            this.MouseUpEventHandler += UpClick;
-
-        }
-
-    }
-    /// <summary>
-    /// 绫诲瀷锛堟帶鍒� 淇″彿婧愶級瀹瑰櫒
-    /// </summary>
-    class TypeFrameLayout
-    {
-        #region  ----鎺у埗 淇″彿婧�----
-        public FrameLayout middLayout = new FrameLayout
-        {
-            Height = Application.GetRealHeight(29),
-            Y = Application.GetRealHeight(32),
-        };
-
-
-        FrameLayout leftLayout = new FrameLayout
-        {
-            X = Application.GetRealWidth(42),
-            Height = Application.GetRealHeight(29),
-            Width = Application.GetRealWidth(32),
-
-        };
-
-
-        Button leftBtnTitle = new Button
-        {  
-            Height = Application.GetRealHeight(23),
-            TextAlignment = TextAlignment.CenterLeft,
-            TextColor = MusicColor.TextColor,
-            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-            TextSize = TextSize.Text16,
-            TextID = StringId.kongzhi,
-            Padding = new Padding(0, 0, 0, 0),
-            IsBold = true,
-        };
-
-
-
-        Button leftBtnLine = new Button
-        {
-
-            Height = Application.GetRealHeight(2),
-            BackgroundColor = MusicColor.TextColor,
-            SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-            Gravity = Gravity.CenterHorizontal,
-        };
-
-        //棰戦亾鐐瑰嚮鎺т欢
-        FrameLayout clickLeftLayout = new FrameLayout
-        {
-
-        };
-
-
-        FrameLayout rightLayout = new FrameLayout
-        {
-            Width = Application.GetRealWidth(48),
-        };
-        Button rightBtnTitle = new Button
-        {
-            Height = Application.GetRealHeight(23),
-            Width = Application.GetRealWidth(48),
-            TextAlignment = TextAlignment.CenterLeft,
-            TextColor = MusicColor.TextColor,
-            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
-            TextSize = TextSize.Text16,
-            TextID = StringId.xinhaoyuan,
-            Padding = new Padding(0, 0, 0, 0),
-            IsBold = true,
-        };
-
-        Button rightBtnLine = new Button
-        {
-            Height = Application.GetRealHeight(2),
-            BackgroundColor = MusicColor.TextColor,
-            SelectedBackgroundColor = MusicColor.MusicTxet14SelectedColor,
-            Gravity = Gravity.CenterHorizontal,
-        };
-
-
-        //淇″彿婧愮偣鍑绘帶浠�
-        FrameLayout clickRightLayout = new FrameLayout
-        {
-
-        };
-
-        #endregion
-
-
-
-
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="layout"></param>
-        public void AddView(FrameLayout layout)
-        {
-            layout.AddChidren(middLayout);
-            middLayout.AddChidren(leftLayout);
-
-            leftLayout.AddChidren(leftBtnTitle);
-            leftLayout.AddChidren(leftBtnLine);
-            leftLayout.AddChidren(clickLeftLayout);
-            middLayout.AddChidren(rightLayout);
-            rightLayout.AddChidren(rightBtnTitle);
-            rightLayout.AddChidren(rightBtnLine);
-            rightLayout.AddChidren(clickRightLayout);
-
-            leftBtnTitle.Width = leftLayout.Width;
-            leftBtnLine.Y = leftBtnTitle.Bottom + Application.GetRealHeight(0);
-            if (leftBtnTitle.GetTextWidth() < leftBtnTitle.Width)
-            {
-                leftBtnTitle.Width = leftBtnTitle.GetTextWidth();
-            }
-            leftBtnLine.Width = leftBtnTitle.Width;
-
-            clickLeftLayout.Height = leftLayout.Height;
-            clickLeftLayout.Width = leftLayout.Width;
-
-
-            rightLayout.X = leftLayout.Right + Application.GetRealWidth(171);
-            rightLayout.Y = leftLayout.Y;
-            rightLayout.Height = leftLayout.Height;
-
-
-
-            rightBtnLine.Y = rightBtnTitle.Bottom + Application.GetRealHeight(0);
-
-            if (rightBtnTitle.GetTextWidth() < rightBtnTitle.Width)
-            {
-                rightBtnTitle.Width = rightBtnTitle.GetTextWidth();
-            }
-            rightBtnLine.Width = rightBtnTitle.Width;
-
-            clickRightLayout.Height = leftLayout.Height;
-            clickRightLayout.Width = leftLayout.Width;
-
-
-
-            //鍒濆鍊�
-            leftBtnTitle.IsSelected = true;
-            leftBtnLine.IsSelected = true;
-            leftBtnLine.Visible = true;
-            rightBtnTitle.IsSelected = false;
-            rightBtnLine.IsSelected = false;
-            rightBtnLine.Visible = false;
-
-        }
-        /// <summary>
-        /// 鎺у埗鐩戝惉鏂规硶
-        /// </summary>
-        public void SetLfteClickListener(Action action)
-        {
-            //鐐瑰嚮浜嬩欢
-            clickLeftLayout.MouseDownEventHandler += (sen, e) =>
-            {
-                leftBtnTitle.IsSelected = true;
-                leftBtnLine.IsSelected = true;
-                leftBtnLine.Visible = true;
-                rightBtnTitle.IsSelected = false;
-                rightBtnLine.IsSelected = false;
-                rightBtnLine.Visible = false;
-                action?.Invoke();
-            };
-        }
-        /// <summary>
-        /// 淇″彿婧愮洃鍚柟娉�
-        /// </summary>
-        public void SetRightClickListener(Action action)
-        {
-
-            //鐐瑰嚮浜嬩欢
-            clickRightLayout.MouseDownEventHandler += (sen, e) =>
-            {
-                leftBtnTitle.IsSelected = false;
-                leftBtnLine.IsSelected = false;
-                leftBtnLine.Visible = false;
-                rightBtnTitle.IsSelected = true;
-                rightBtnLine.IsSelected = true;
-                rightBtnLine.Visible = true;
-                action?.Invoke();
-
-
-            };
-
-        }
-
-    }
-    /// <summary>
-    /// 淇″彿婧愬鍣�
-    /// </summary>
-    class SourceFrameLayout : FrameLayout
-    {
-        public const int widthFrameLayout = 375;
-        public const int heightFrameLayout = 146;
-        public const int interval = 37;//琛屼腑鐨勫垪闂撮殧鍊�
-
-        public Action<string> selectAction;
-
-        public SourceFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-        }
-
-        /// <summary>
-        /// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
-        /// </summary>
-        public void LoadSourcePage()
-        {
-            var mList = GetList();
-            int currnetheightValue = 0;
-            int currnetWidthValue = 0;
-            int heightMaxValue = 38;
-            int widthMaxValue = 68;
-            //鑾峰彇鐩稿涓�涓含搴﹀��
-            int widthDimensionValue = this.Width - Application.GetRealWidth(24) - Application.GetRealWidth(24) - Application.GetRealHeight(widthMaxValue / 2);
-            for (int i = 0; i < mList.Count; i++)
-            {
-                var source = mList[i];
-                CustomButton button = new CustomButton();
-                this.AddChidren(button);
-                button.Tag = source;
-                button.Y = Application.GetRealHeight(currnetheightValue);
-                button.X = Application.GetRealWidth(24) + Application.GetRealWidth(currnetWidthValue);
-                button.Text = source;
-                currnetWidthValue += (widthMaxValue + 37);//37鏄殧闂村��
-                if (widthDimensionValue < Application.GetRealWidth(currnetWidthValue))
-                {
-                    currnetheightValue += (heightMaxValue + 16);//16鏄殧闂村��
-                    currnetWidthValue = 0;
-                }
-
-                button.SetClickListener((btn) =>
-                {
-                    // MovieLibrary movieLibrary = new MovieLibrary();
-
-                    selectAction?.Invoke(button.Text);
-                });
-                //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
-                //{
-                //    selectImageAction?.Invoke((int)imageFram.Tag);
-                //}
-            }
-
-        }
-        private List<string> GetList()
-        {
-            return new List<string>
-            {
-                "HDML 1",//" "
-                "HDML 2",
-                "HDML 3",
-                "HDML 4",
-                "Live TV",
-                "PS",
-                "AV",
-            };
-        }
-
-
-    }
-
-    #endregion
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs
deleted file mode 100644
index f4873e7..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.HisenseTV
-{
-    public class Send
-    {
-        private static Send sendMethod = null;
-        /// <summary>
-        /// 鑾峰彇瀵硅薄
-        /// </summary>
-        public static Send Current
-        {
-            get
-            {
-                if (sendMethod == null)
-                {
-                    sendMethod = new Send();
-                }
-
-                return sendMethod;
-
-            }
-
-        }
-        /// <summary>
-        /// 鎵撳紑娴蜂俊鐢佃
-        /// </summary>
-        /// <param name="deviceMac">鐢佃mac</param>
-        public void Open(string deviceMac)
-        {
-            CommonMethod.Current.SunThread(() =>
-            {
-                // 鍒涘缓UdpClient瀹炰緥
-                UdpClient udpClient = new UdpClient();
-                try
-                {
-                    // 璁剧疆鍙戦�佸拰鎺ユ敹鏁版嵁鐨処P鍜岀鍙�
-                    IPEndPoint iPEndPoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 9);
-                    // 鍙戦�佹暟鎹�
-                    //byte[] data = System.Text.Encoding.ASCII.GetBytes("Hello, UDP Server!");
-                    byte[] data = StrToToHexByte(deviceMac);
-                    for (int i = 0; i < 16; i++)
-                    {
-                        udpClient.Send(data, data.Length, iPEndPoint);
-                        //Console.WriteLine("鏁版嵁宸插彂閫�");
-                    }
-                    //// 鎺ユ敹鏁版嵁
-                    //IPEndPoint remoteEP = new IPEndPoint(IPAddress.Any, 0);
-                    //byte[] receivedData = udpClient.Receive(ref remoteEP);
-                    //string receivedMessage = System.Text.Encoding.ASCII.GetString(receivedData);
-                    //Console.WriteLine("鎺ユ敹鍒扮殑鏁版嵁锛�" + receivedMessage);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("鍙戠敓閿欒锛�" + e.Message);
-                }
-                finally
-                {
-                    // 鍏抽棴UdpClient杩炴帴
-                    udpClient.Close();
-                }
-            }, TipType.none);
-
-        }
-
-        /// <summary>
-        /// 鍒锋柊璁惧鐘舵��
-        /// </summary>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns></returns>
-        public bool RefreshDeviceStatus(List<string> functionIds, TipType tipType = TipType.flicker)
-        {
-            try
-            {
-                Dictionary<string, object> d = new Dictionary<string, object>();
-                d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-                d.Add("deviceIds", functionIds);
-                var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus, "鍒锋柊璁惧鐘舵��");
-                if (!this.DataChecking(responsePackNew, tipType))
-                {
-                    return false;
-                }
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧璇︽儏
-        /// </summary>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns></returns>
-        public Function GetDeviceInfo(string functionId, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceIds", new List<string>() { functionId });
-
-            var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GetDevcieInfoList, "鑾峰彇璁惧璇︽儏");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return null;
-            }
-            var functionList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>(responsePackNew.Data.ToString());
-            if (functionList != null && functionList.Count > 0)
-            {
-                return functionList[0];
-            }
-            return null;
-
-        }
-
-        /// <summary>
-        ///鍒犻櫎璁惧
-        /// </summary>
-        /// <param name="deviceId">璁惧id</param>
-        /// <param name="action">鎴愬姛杩斿洖true</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public void DelDevice(string deviceId, Action<bool> action, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceIds", new List<string> { deviceId });//璁惧id
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_UnbindDeviceToHome, "鍒犻櫎娴蜂俊鐢佃");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                //action?.Invoke(false);
-                return;
-            }
-            action?.Invoke(true);
-        }
-
-        /// <summary>
-        /// 鍙戦�佹帶鍒跺懡浠�
-        /// </summary>
-        /// <param name="device">褰撳墠璁惧</param>
-        /// <param name="dic">鍙戦�佹帶鍒舵暟鎹�</param>
-        public void SendControlCommand(Function device, Dictionary<string, string> dic,Action<bool> action) 
-        {
-            new System.Threading.Thread(() =>
-            {
-                var result = DriverLayer.Control.Ins.SendWriteCommand(device, dic, false, 0);
-                action?.Invoke(result);
-
-            })
-            { IsBackground = true }.Start();
-        }
-
-        /// <summary>
-        /// 灏�16杩涘埗鐨勫瓧绗︿覆杞负byte[]
-        /// </summary>
-        /// <param name="hexDeviceMacString"></param>
-        /// <returns></returns>
-        private byte[] StrToToHexByte(string hexDeviceMacString)
-        {
-            if (string.IsNullOrEmpty(hexDeviceMacString))
-            {
-                return new byte[] { };
-            }
-            hexDeviceMacString = hexDeviceMacString.Replace(" ", "").Replace("_","");
-            if ((hexDeviceMacString.Length % 2) != 0) {
-                return new byte[] { };
-            }
-            byte[] returnBytes = new byte[hexDeviceMacString.Length / 2];
-            for (int i = 0; i < returnBytes.Length; i++)
-                returnBytes[i] = Convert.ToByte(hexDeviceMacString.Substring(i * 2, 2), 16);
-            return returnBytes;
-        } 
-
-        /// <summary>
-        /// 浜岃繘鍒舵暟缁勮浆鍗佸叚杩涘埗瀛楃涓�
-        /// </summary>
-        /// <param name="btyes"></param>
-        /// <returns></returns>
-        private string Byte2hex(byte[] btyes) 
-        {
-            StringBuilder sb = new StringBuilder(btyes.Length * 2);
-            for (int i = 0; i < btyes.Length; i++)
-            {
-                int hight = ((btyes[i] >> 4) & 0x0f);
-                int low = btyes[i] & 0x0f;
-                sb.Append(hight > 9 ? (char)((hight - 10) + 'a') : (char)(hight + '0'));
-                sb.Append(low > 9 ? (char)((low - 10) + 'a') : (char)(low + '0'));
-            }
-            return sb.ToString();
-        }
-
-
-
-        /// <summary>
-        ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� 
-        /// </summary>
-        /// <param name="o">鍙戦�佹暟鎹�</param>
-        /// <param name="api_Url">璇锋眰鍦板潃(涓嶆槸缁濆鍦板潃)</param>
-        /// <param name="tag">鏍囪->鎻忚堪鎺ュ彛(鑷畾涔�)</param>
-        /// <returns></returns>
-        public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 3)
-        {
-            Log($"{DateTime.Now}->鍙戦��->{tag}", api_Url, o.ToString());
-            var requestJson = HttpUtil.GetSignRequestJson(o);
-            var r = HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
-            Log($"{DateTime.Now}->鍥炲->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r));
-            return r;
-
-        }
-
-
-        /// <summary>
-        /// <summary>
-        /// 妫�楠屾暟鎹洖澶嶆垚鍔熸垨鑰呭け璐�
-        /// </summary>
-        /// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�</param>
-        /// <returns></returns>
-        private bool DataChecking(ResponsePackNew responsePackNew, TipType tipType)
-        {
-            if (responsePackNew.Data == null || responsePackNew.Code != "0" || responsePackNew.Data.ToString() == "")
-            {
-                if (TipType.flicker == tipType)
-                {
-                    if (responsePackNew == null || responsePackNew.Code == "-1")
-                    {
-                        responsePackNew = new ResponsePackNew { message = "娌″洖澶�,璇风‘璁ょ綉缁滄槸鍚︽甯�.", Code = "-1", };
-                    }
-                    Application.RunOnMainThread(() =>
-                    {
-                        //new Tip()
-                        //{
-                        //    CloseTime = 1,
-                        //    Text = responsePackNew.message + "(" + responsePackNew.Code + ")",
-                        //    Direction = AMPopTipDirection.None,
-                        //}.Show(MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1));
-                        CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")", 3);
-                    });
-                }
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-        /// 鎵撳嵃鏃ュ織
-        /// </summary>
-        /// <param name="tag">鎵撳嵃鏍囪</param>
-        /// <param name="content">鎵撳嵃鍐呭</param>
-        public void Log(string tag, string url, string content)
-        {
-#if DEBUG
-            Console.WriteLine(tag + $"\r\n{url}\r\n{content}");
-#endif
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index 7ba3ab9..11bdd88 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -6,10 +6,8 @@
 using System.Text;
 using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 using Newtonsoft.Json.Linq;
 using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
 
 namespace HDL_ON.UI.Music
 {
@@ -309,7 +307,7 @@
                         //    Text = responsePackNew.message + "(" + responsePackNew.Code + ")",
                         //    Direction = AMPopTipDirection.None,
                         //}.Show(MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1));
-                        CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")", 3);
+                        //CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")", 3);
                     });
                 }
                 return false;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
deleted file mode 100644
index 8f2ec34..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ /dev/null
@@ -1,667 +0,0 @@
-锘縰sing System;
-using HDL_ON.Entity;
-using System.Collections.Generic;
-using Shared;
-using HDL_ON.DAL.Server;
-#if __IOS__
-using Foundation;
-#else
-using Com.Videogo.Hdl;
-#endif
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    /// <summary>
-    /// 钀ょ煶瑙嗛闂ㄩ攣鍏叡鏂规硶绫�
-    /// </summary>
-    public class CommonMethod
-    {
-        
-        private Loading loading;
-        /// <summary>
-        /// 璁板綍褰撳墠鐣岄潰绱㈠紩鍊�
-        /// </summary>
-        private int pageLayoutIndexValue;
-
-        private static CommonMethod commonMethod = null;
-        /// <summary>
-        /// 鑾峰彇瀵硅薄
-        /// </summary>
-        public static CommonMethod Current
-        {
-            get
-            {
-                if (commonMethod == null)
-                {
-                    commonMethod = new CommonMethod();
-                }
-
-                return commonMethod;
-
-            }
-
-        }
-
-        #region  --------- 璺宠浆鍒癆ndroid锛宨os閭h竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
-        /// <summary>
-        /// android,ios婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗鍥炶皟鏂规硶
-        /// 鍐嶈鍙栦簯绔殑涓婅悿鐭宠澶囧垪琛�
-        /// <paramref name="spk"/>spk</param>
-        public void SkipAddDeviceActivity(string spk)
-        {
-
-            this.InitializationAndroidData((isEzChildAccessToken) =>
-            {
-                this.SunThread(() =>
-                {
-                    var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
-
-                    this.MainThread(() =>
-                    {
-#if __IOS__
-                        //璺宠浆娣诲姞钀ょ煶璁惧
-                        ezsdkDelegate = new IosIHdlInterface();
-                        ezsdkDelegate.mAction += (serials) =>
-                        {
-                            this.GetYingshiDeviceList(serials);
-                        };
-                        EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate;
-                        NSObject[] nSObject = new NSObject[list.Count];
-                        for (int i = 0; i < list.Count; i++)
-                        {
-                            string strValue = list[i];
-                            nSObject[i] = new NSString(strValue);
-                        }
-                        EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject;
-                        EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
-
-#else
-                    HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
-                        HDLEzvizSdk.SetAddCallback(new
-                            AndroidIHdlInterface((isBool, serials) =>
-                    {
-                        if (isBool)
-                        {
-                            this.GetYingshiDeviceList(serials);
-                        }
-
-                    }));
-#endif
-
-                    });
-
-
-                });
-            });
-
-
-
-
-
-        }
-        /// <summary>
-        /// 璇诲彇浜戠鐨勪笂钀ょ煶璁惧鍒楄〃
-        /// <paramref name="serials"/>搴忓垪鍙�</param>
-        private void GetYingshiDeviceList(string serials)
-        {
-            this.SunThread(() =>
-            {
-                var list = VideDoorLockSend.Current.GetVideoDoorLockDeviceList(SPK.VideoDoorLock);
-                this.MainThread(() =>
-                {
-                    if (list.Count > 0)
-                    {
-                        var function = list.Find((o) => o.sid == serials);
-                        if (function != null)
-                        {
-                            this.SaveFunctionFile(function);
-                        }
-                    }
-                });
-            });
-
-        }
-        /// <summary>
-        /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
-        /// </summary>
-        /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
-        /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
-        /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
-        /// <param name="isDialog">鏄惁闇�瑕佸脊妗�</param>
-        public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog)
-        {
-            this.Loading.Start();
-            this.InitializationAndroidData((isEzChildAccessToken) =>
-            {
-                this.MainThread(() =>
-                {
-                    this.Loading.Hide();
-                    if (isDialog)
-                    {
-                        Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
-                        {
-                            dialog.Close();
-                            this.SkipRTVActivity(deviceSerial, deviceId, spk);
-                        }, (dialog) => { dialog.Close(); });
-                    }
-                    else
-                    {
-                        this.SkipRTVActivity(deviceSerial, deviceId, spk);
-                    }
-
-                });
-            });
-
-        }
-        /// <summary>
-        /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
-        /// </summary>
-        /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
-        /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
-        /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
-        private void SkipRTVActivity(string deviceSerial, string deviceId, string spk)
-        {
-
-#if __IOS__
-            //鎵撳紑钀ょ煶瑙嗛鐣岄潰
-            EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
-
-#else
-            HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,"");
-#endif
-
-
-        }
-        /// <summary>
-        /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
-        /// </summary>
-        /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
-        /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
-        /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
-        /// <param name="msgId">娑堟伅id</param>
-        private void SkipRTVActivity(string deviceSerial, string deviceId, string spk, string msgId)
-        {
-
-#if __IOS__
-            //鎵撳紑钀ょ煶瑙嗛鐣岄潰
-            EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
-
-#else
-            HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,msgId);
-#endif
-
-
-        }
-
-        /// <summary>
-        /// 娴忚鍘嗗彶璁板綍
-        /// </summary>
-        public void SkipRecordActivity(string deviceId)
-        {
-            this.InitializationAndroidData((s) =>
-            {
-                this.MainThread(() =>
-                {
-#if __IOS__
-                    //鎵撳紑钀ょ煶鍘嗗彶璁板綍鐣岄潰
-                    EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
-#else
-                HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
-#endif
-                });
-            });
-
-        }
-        /// <summary>
-        /// 涓存椂瀵嗙爜寮�闂�
-        /// <paramref name="deviceId"/>
-        /// </summary>
-        public void SkipPSWActivity(string deviceId)
-        {
-            this.InitializationAndroidData((isBools) =>
-            {
-                this.MainThread(() =>
-                {
-#if __IOS__
-                    //鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
-                    EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
-#else
-                HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId); 
-#endif
-                });
-            });
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栬悿鐭砈DK(瀹為檯灏辨槸浼犲弬鏁�,澶氭璋冪敤涔熸病鏈夊奖鍝�)
-        /// </summary>
-        public void InitializationAndroidData(Action<bool> action)
-        {
-            bool isBool = true;
-            //this.Loading.Start();
-            this.SunThread(() =>
-            {
-                try
-                {
-                    //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
-                    var ezChildAccessToken = VideDoorLockSend.Current.GetEZGetChildToken();
-                    this.MainThread(() =>
-                    {
-                        if (string.IsNullOrEmpty(ezChildAccessToken))
-                        {
-                            //Token
-                            isBool = false;
-                            //this.ShowTip("鑾峰彇钀ょ煶浜戝瓙璐﹀彿token澶辫触銆�");
-                            return;
-                        }
-
-                        string appKey = "1aa98a90489b4838b966b57018b4b04b";//姝e紡鏈嶅姟鍣�
-                        //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
-                        //{
-                        //    appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
-                        //}
-
-
-#if __IOS__
-                        //iOS
-                        //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
-                        EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey(appKey, appKey);
-                        //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
-                        EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
-                        EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
-                        //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
-                        EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
-                        //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
-                        //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
-                        //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
-                        //info.de
-                        //EZSDK.IOS.EZSDK.Play(info);
-#else
-
-                            HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id);
-
-#endif
-
-
-                    });
-
-                }
-                catch (Exception e)
-                {
-                }
-                finally
-                {
-                    this.MainThread(() =>
-                    {
-                        //this.Loading.Hide();
-                        action?.Invoke(isBool);
-                    });
-                }
-            });
-        }
-
-        /// <summary>
-        /// 鏇存崲浣忓畢
-        /// </summary>
-        /// <param name="home">瀵硅薄</param>
-        public void ChangeCurrHome(RegionInfoRes home)
-        {
-
-            if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
-#if __IOS__
-#else
-                HDLEzvizSdk.Instance.SetHomeId(home.id);
-            
-#endif
-
-        }
-        #endregion
-
-        /// <summary>
-        /// 鑾峰彇銆愰棬閿佸瀷鍙枫�戝垪琛�
-        /// </summary>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<string> GetVideoDoorLockLockModelsList(string mode = "lockModels")
-        {
-            var lockModels = VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
-            if (mode == "lockModels")
-            {
-                return lockModels.lockModels;
-            }
-            else
-            {
-                return lockModels.notAllowedConfigNetworkModels;
-            }
-        }
-        /// <summary>
-        /// 闂ㄩ攣鎺ㄩ��
-        /// </summary>
-        /// <param name="pushMessageType"></param>
-        /// <param name="jPushMessageInfo"></param>
-        public void DoorLockPush(JPushMessageInfo jpushMessageInfo)
-        {
-            this.MainThread(() =>
-            {
-                if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-                try
-                {
-                    //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
-                    var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
-                    if (expantContent == null)
-                    {
-                        return;
-                    }
-                    if (expantContent.spk == null)
-                    {
-                        return;
-                    }
-                    if ( expantContent.spk != SPK.VideoDoorLock)
-                    {
-                        return;
-                    }
-                    if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
-                    {
-                        ///鎵撳紑瑙嗛闂ㄩ攣
-                        string currentTimeStr = Utlis.GetTimestamp();   // 褰撳墠鏃堕棿
-
-                        if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
-                        {    // 瓒呮椂30s
-                            this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
-                        }
-                        else
-                        {
-                            this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
-                        }
-                    }
-                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
-                    {
-                        //浣庣數閲忔帹閫�
-                        this.UpdateDoorLockState(PushMessageType.Alarm);
-                    }
-                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
-                    {
-                        //寮�闂ㄦ帹閫�
-                        this.UpdateDoorLockState(PushMessageType.Prompt);
-                    }
-                }catch(Exception ex)
-                {
-                    
-                }
-            });
-
-        }
-        /// <summary>
-        /// 鏇存柊寮�閿佸浘鏍囧拰鐢垫睜鐘舵��
-        /// </summary>
-        private void UpdateDoorLockState(PushMessageType pushMessageType)
-        {
-            int childrenCount = MainPage.BasePageView.ChildrenCount - 1;
-            for (int i = childrenCount; childrenCount > i; i--)
-            {
-                View view = MainPage.BasePageView.GetChildren(i);
-                if (view is VideoDoorLockPage)
-                {
-                    VideoDoorLockPage videoDoorLockPage = (VideoDoorLockPage)view;
-                    if (videoDoorLockPage != null)
-                    {
-                        videoDoorLockPage.UpdateState(pushMessageType);
-                    }
-
-                }
-            }
-
-        }
-        /// <summary>
-        /// 鑾峰彇钀ょ煶瑙嗛銆愰棬閿併�戝垪琛�
-        /// </summary>
-        /// <returns></returns>
-        public List<Function> GetVideoDoorLockList()
-        {
-            var list = FunctionList.List.GetVideoDoorLockList();
-#if DEBUG
-            //list.Add(new Function { name = "瑙嗛闂ㄩ攣涓�", sid = "23456789", spk = SPK.VideoDoorLock });
-            //list.Add(new Function { name = "瑙嗛闂ㄩ攣浜�", sid = "2345678922", spk = SPK.VideoDoorLock });
-#endif
-            return list;
-        }
-        #region  --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
-        /// <summary>
-        /// 淇濆瓨鏈湴鏂囦欢
-        /// </summary>
-        /// <param name="function">褰撳墠璁惧</param>
-        public void SaveFunctionFile(Function function)
-        {
-            if (function == null) return;
-            function.AssembleStatus();
-            function.SaveFunctionFile();
-            FunctionList.List.IniFunctionList(function.savePath, true);
-            MainPage.Log($"鏂囦欢淇濆瓨->{function.name}-->{function.spk}");
-        }
-
-        /// <summary>
-        /// 鍒犻櫎鏈湴鏂囦欢
-        /// </summary>
-        /// <param name="function">褰撳墠璁惧</param>
-        public void DeleteFunction(Function function)
-        {
-            if (function == null) return;
-            FunctionList.List.DeleteFunction(function);
-            MainPage.Log($"鏂囦欢鍒犻櫎->{function.name}-->{function.spk}");
-        }
-        #endregion
-        /// <summary>
-        /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
-        /// <param name="comerom">鏉ヨ嚜閭i噷</param>
-        /// </summary>
-        public string GetVideoDoorLockIcon(Comerom comerom)
-        {
-
-            if (comerom == Comerom.collect)
-            {
-                return "FunctionIcon/DoorLock/VideoDoorLockOpen1.png";
-            }
-            else
-            {
-                return "FunctionIcon/DoorLock/VideoDoorlockClose1.png";
-            }
-
-        }
-
-        /// <summary>
-        /// 鑾峰彇Loading瀵硅薄
-        /// </summary>
-        /// <returns></returns>
-        public Loading Loading
-        {
-            get
-            {
-                this.MainThread(() =>
-                {
-                    //if (loading != null && this.pageLayoutIndexValue == MainPage.BasePageView.ChildrenCount - 1)
-                    //{
-                    //    //闃叉浜岄噸娣诲姞瀵硅薄
-                    //    return;
-                    //}
-                    if (loading == null)//|| MainPage.BasePageView.ChildrenCount < 1)
-                    {
-                        loading = new Loading();
-                    }
-                    //loading.BringToFront();
-                    Application.MainPage.AddChidren(loading);
-                    //View view = MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1);
-                    //if (view is ViewGroup)
-                    //{
-                    //    pageLayoutIndexValue = MainPage.BasePageView.ChildrenCount - 1;
-                    //    ((ViewGroup)view).AddChidren(loading);
-                    //}
-                });
-                return loading;
-            }
-
-        }
-
-       
-        #region  ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
-        /// <summary>
-        /// 瀛愮嚎绋�
-        /// </summary>
-        /// <paramref name="tipType"/>鏄惁瑕佹彁绀洪敊璇俊鎭�(榛樿鏄剧ず)<paramref>
-        /// <param name="action"></param>
-        public void SunThread(Action action, TipType tipType = TipType.confirmation)
-        {
-            new System.Threading.Thread(() =>
-            {
-                try
-                {
-                    action?.Invoke();
-                }
-                catch (Exception e)
-                {
-                    this.ShowAlert(e, tipType);
-                }
-            })
-            { IsBackground = true }.Start();
-
-        }
-        /// <summary>
-        /// 涓荤嚎绋�(UI鏇存柊)
-        /// </summary>
-        /// <paramref name="tipType"/>鏄惁瑕佹彁绀洪敊璇俊鎭�(榛樿鏄剧ず)<paramref>
-        /// <param name="action"></param>
-        public void MainThread(Action action, TipType tipType = TipType.confirmation)
-        {
-            Application.RunOnMainThread(() =>
-            {
-                try
-                {
-                    action?.Invoke();
-                }
-                catch (Exception e)
-                {
-                    this.ShowAlert(e, tipType);
-                }
-            });
-
-        }
-        #endregion
-        #region  --------- 鎻愮ず妗嗭紝纭妗� --------
-        /// <summary>
-        /// 瀵硅瘽妗�(鍙绋嬪簭鎶ラ敊鐨勬椂鍊欐墠鐢ㄥ埌)
-        /// </summary>
-        /// <paramref name="e"/>寮傚父瀵硅薄<paramref>
-        /// <paramref name="tipType"/>鏄惁瑕佹彁绀洪敊璇俊鎭�(榛樿鏄剧ず)<paramref>
-        private void ShowAlert(Exception e, TipType tipType)
-        {
-
-            if (tipType != TipType.confirmation)
-            {
-                return;
-            }
-            Application.RunOnMainThread(() =>
-            {
-                string msg = e.Message + "\r\n" + e.StackTrace;
-                Alert alert = new Alert("鎶辨瓑绋嬪簭鍑洪敊浜�.", "鎸塡"纭畾\"鑳借幏鍙栨洿璇︾粏鐨勯敊璇俊鎭�.", "鍙栨秷", "纭畾");
-                alert.Show();
-                alert.ResultEventHandler += (alerts, isBool) =>
-                {
-                    alert.Dismiss();
-                    if (isBool)
-                    {
-                        StackTraceLog stackTraceLog = new StackTraceLog(msg);
-                        stackTraceLog.Show();
-                    }
-                };
-            });
-        }
-        /// <summary>
-        /// 淇℃伅鎻愮ず绐楀彛锛岃嚜鍔ㄥ叧闂�
-        /// </summary>
-        /// <param name="msg">鎻愮ず閿欒鏂囨湰</param>
-        public void ShowTip(string msg, int time = 2)
-        {
-            Application.RunOnMainThread(() =>
-            {
-                new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
-            });
-        }
-
-     
-        #endregion
-        /// <summary>
-        /// 寮规绫诲瀷
-        /// </summary>
-        public enum TipType
-        {
-            none,//鏃犳彁绀�
-            flicker,//闂儊妗�
-            confirmation//纭妗�
-        }
-        /// <summary>
-        /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
-        /// </summary>
-        public enum Comerom
-        {
-            function,//鍔熻兘
-            collect,//鏀惰棌
-            room,//鎴块棿
-            push,//鎺ㄩ��
-            sanfan,//娣诲姞绗笁鏂硅澶�
-        }
-
-#if __IOS__
-        IosIHdlInterface ezsdkDelegate;
-        /// <summary>
-        /// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢�,娌℃湁鐗规畩鍚箟
-        /// </summary>
-        public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
-        {
-            public Action<string> mAction;
-            public IosIHdlInterface()
-            {
-
-            }
-            /// <summary>
-            /// 
-            /// </summary>
-            /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
-            /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
-            public override void AddDeviceSuccessed(string deviceSerial)
-            {
-                mAction?.Invoke(deviceSerial);
-            }
-        }
-#else
-        /// <summary>
-        /// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤,娌℃湁鐗规畩鍚箟
-        /// </summary>
-        public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
-        {
-
-            Action<bool,string> mAction;
-            Action<string> mDoorlockAnswer;
-            public AndroidIHdlInterface(Action<bool,string> action)
-            {
-                mAction = action;
-            }
-            /// <summary>
-            /// 
-            /// </summary>
-            /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
-            /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
-            public void AddCallback(bool p0, string p1)
-            {
-                mAction?.Invoke(p0,p1);
-            }
-
-            public void DoorlockAnswer(string p0)
-            {
-                mDoorlockAnswer?.Invoke(p0);
-            }
-        }
-#endif
-
-
-    }
-
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
deleted file mode 100644
index 5f4bf85..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Entity;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class ObjectClass
-    {
-
-
-    }
-    /// <summary>
-    /// 鐢ㄦ埛淇℃伅(钀ょ煶瑙嗛闂ㄩ攣) 
-    /// </summary>
-    public class UserVideoDoorLockInfo
-    {
-        /// <summary>
-        /// 鐢ㄦ埛id
-        /// </summary>
-        public string extUserId = string.Empty;
-        /// <summary>
-        /// 鐢ㄦ埛鍚嶇О
-        /// </summary>
-        public string extUserName = string.Empty;
-
-    }
-    /// <summary>
-    /// 闂ㄩ攣鐘舵��(钀ょ煶瑙嗛闂ㄩ攣)
-    /// </summary>
-    public class VideoDoorLockInfo
-    {
-        /// <summary>
-        /// 閿佺姸鎬侊紙lock:閿侊紱unlock:瑙i攣锛�
-        /// </summary>
-        public string lockStatus = string.Empty;
-        /// <summary>
-        /// 闂ㄧ姸鎬侊紙open锛氬紑锛沜lose锛氬叧锛�
-        /// </summary>
-        public string doorStatus = string.Empty;
-
-    }
-
-    /// <summary>
-    /// 鐢垫睜璇︽儏(钀ょ煶瑙嗛闂ㄩ攣)
-    /// </summary>
-    public class CellInfo
-    {
-        /// <summary>
-        /// 鐢甸噺
-        /// </summary>
-        public string remain = string.Empty;
-        /// <summary>
-        /// 鐢垫睜鍚嶇О
-        /// </summary>
-        public string name = string.Empty;
-
-    }
-    /// <summary>
-    /// 鑾峰彇闂ㄩ攣鍒楄〃
-    /// </summary>
-    public class DoorLockList
-    {
-        /// <summary>
-        /// 闂ㄩ攣璁惧鍒楄〃
-        /// </summary>
-        public List<Function> list = new List<Function>();
-    }
-    /// <summary>
-    /// 闂ㄩ攣鍨嬪彿鍒楄〃
-    /// </summary>
-    public class LockModels {
-        /// <summary>
-        /// 鍨嬪彿鍒楄〃
-        /// </summary>
-        public List<string> lockModels = new List<string>();
-        /// <summary>
-        /// 鍨嬪彿鍒楄〃
-        /// </summary>
-        public List<string> notAllowedConfigNetworkModels = new List<string>();
-    }
-    /// <summary>
-    /// 鎺ㄩ�佸唴瀹瑰璞�
-    /// </summary>
-    public class ExpantContent
-    {
-        /// <summary>
-        /// 璁惧搴忓垪鍙�
-        /// </summary>
-        public string devSerial = string.Empty;
-        /// <summary>
-        /// 璁惧id
-        /// </summary>
-        public string deviceId = string.Empty;
-        /// <summary>
-        /// 涓嶇煡閬撴槸鍟�
-        /// </summary>
-        public string interphoneTypeEnum = string.Empty;
-        /// <summary>
-        /// 涓嶇煡閬撴槸鍟�
-        /// </summary>
-        public string subToken = string.Empty;
-        /// <summary>
-        /// 浜戦泙涓婂畾涔夌殑璁惧spk
-        /// </summary>
-        public string spk = string.Empty;
-        /// <summary>
-        /// 娑堟伅id
-        /// </summary>
-        public string msgId = string.Empty;
-        /// <summary>
-        /// 鎺ㄩ�佹椂闂�
-        /// </summary>
-        public string currentTime = string.Empty;
-    }
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs
deleted file mode 100644
index 05ad631..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using HDL_ON.UI.Music;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class StackTraceLog
-    {
-        /// <summary>
-        /// 鍫嗗彔璺熻釜鏃ュ織
-        /// </summary>
-        public string msg;
-
-        public StackTraceLog(string msg)
-        {
-            this.msg = msg;
-        }
-        public void Show()
-        {
-
-            Dialog dialog = new Dialog()
-            {
-                BackgroundColor = CSS_Color.textWhiteColor,
-            };
-            dialog.Show();
-            TopView topView = new TopView();
-            topView.topNameBtn.Text="閿欒鏃ュ織淇℃伅";
-            dialog.AddChidren(topView.TopFLayoutView());
-            topView.clickBackBtn.MouseUpEventHandler += (sen, e) =>
-            {
-                dialog.Close();
-            };
-           
-            var middleFl = new FrameLayout
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-            };
-            dialog.AddChidren(middleFl);
-          
-            Button btnLogText = new Button 
-            {
-                //TextSize = TextSize.Text14,
-                TextColor = MusicColor.Text18Color,
-                Width = Application.GetRealWidth(H_W.W - 16 - 16),
-                Height = middleFl.Height,
-                X = Application.GetRealWidth(16),
-                Text = this.msg,
-                TextAlignment = TextAlignment.TopLeft,
-                IsMoreLines = true,
-            };
-            middleFl.AddChidren(btnLogText);
-
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
deleted file mode 100644
index 5099251..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-锘縰sing System;
-using HDL_ON.Common;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    /// <summary>
-    /// 钀ょ煶瑙嗛闂ㄩ攣-浜鸿劯寮�閿佽缃〉闈�
-    /// </summary>
-    public class UnlockSettingFacePage : FrameLayout
-    {
-        FrameLayout bodyView;
-        bool faceUnlockSwitch;
-
-        Function device;
-
-        public UnlockSettingFacePage(Function function)
-        {
-            bodyView = this;
-            device = function;
-        }
-
-        public void LoadPage()
-        {
-            var faceUnlockSetup = new FaceUnlockSetupObj();
-
-            new TopViewDiv(bodyView, Language.StringByID(StringId.FaceUnlockSetting)).LoadTopView();
-
-            var contentView = new VerticalScrolViewLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(600),
-                ScrollEnabled = false,
-                BackgroundColor = CSS_Color.BackgroundColor,
-            };
-            bodyView.AddChidren(contentView);
-
-         
-            #region 浜鸿劯寮�閿�
-            var faceUnlockView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(74),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(faceUnlockView);
-
-            var btnFaceUnlockText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(7),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.FaceUnlock,
-            };
-            faceUnlockView.AddChidren(btnFaceUnlockText);
-
-            var btnFaceUnlockTipText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnFaceUnlockText.Bottom,
-                Width = Application.GetRealWidth(339),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                IsMoreLines = true,
-                TextID = StringId.FaceUnlockOpenTip
-            };
-            faceUnlockView.AddChidren(btnFaceUnlockTipText);
-
-            //var btnFaceUnlockSwitchIcon = new Button()
-            //{
-            //    X = Application.GetRealWidth(322),
-            //    Y = Application.GetRealHeight(8),
-            //    Width = Application.GetMinRealAverage(36),
-            //    Height = Application.GetMinRealAverage(36),
-            //    UnSelectedImagePath = "Public/Switch_2.png",
-            //    SelectedImagePath = "Public/SwitchOn_2.png",
-            //    IsSelected = faceUnlockSwitch,
-            //};
-            //faceUnlockView.AddChidren(btnFaceUnlockSwitchIcon);
-
-
-
-            var waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Start("");
-
-            #endregion
-
-            contentView.AddChidren(new Button()
-            {
-                Height = Application.GetRealHeight(8),
-                BackgroundColor = CSS_Color.BackgroundColor,
-            });
-
-            var view = new VerticalScrolViewLayout()
-            {
-                Height = Application.GetRealHeight(300),
-            };
-            contentView.AddChidren(view);
-
-
-            //btnFaceUnlockSwitchIcon.MouseUpEventHandler = (sender, e) =>
-            //{
-            //    waitPage.Start("");
-            //    bool changeState = false;
-            //    if (!btnFaceUnlockSwitchIcon.IsSelected)
-            //    {
-            //        btnFaceUnlockSwitchIcon.IsSelected = true;
-            //        changeState = true;
-            //    }
-            //    new System.Threading.Thread(() =>
-            //    {
-            //        try
-            //        {
-            //            var pack = ApiUtlis.Ins.HttpRequest.SetFaceUnlockCfg(device.deviceId, changeState, faceUnlockSetup.mode);
-            //            if (pack != null && pack.Code == StateCode.SUCCESS)
-            //            {
-            //                Application.RunOnMainThread(() =>
-            //                {
-            //                    //鏇存柊鐣岄潰
-            //                    faceUnlockSetup.enabled = btnFaceUnlockSwitchIcon.IsSelected = changeState;
-            //                    loadSubView(view, faceUnlockSetup);
-            //                });
-            //            }
-            //            else
-            //            {
-            //                //澶辫触鎻愮ず
-            //                Application.RunOnMainThread(() =>
-            //                {
-            //                    if (!string.IsNullOrEmpty(pack.message))
-            //                    {
-            //                        if (string.IsNullOrEmpty(pack.message))
-            //                        {
-            //                            pack.message = Language.StringByID(StringId.OperationFailed);
-            //                        }
-            //                        var tip = new Tip()
-            //                        {
-            //                            MaxWidth = Application.GetRealWidth(300),
-            //                            Text = $"{pack.message}({pack.Code})",
-            //                            CloseTime = 3,
-            //                            Direction = AMPopTipDirection.None
-            //                        };
-            //                        tip.Show(MainPage.BaseView);
-            //                    }
-            //                });
-            //            }
-            //        }
-            //        catch (Exception ex)
-            //        {
-            //            MainPage.Log($"btnFaceUnlockSwitchIcon error : {ex.Message}");
-            //        }
-            //        finally
-            //        {
-            //            Application.RunOnMainThread(() =>
-            //            {
-            //                waitPage.Hide();
-            //            });
-            //        }
-            //    })
-            //    { IsBackground = true }.Start();
-            //};
-
-
-            //new System.Threading.Thread(() => {
-            //    try
-            //    {
-            //        var pack = ApiUtlis.Ins.HttpRequest.GetFaceUnlockCfg(device.deviceId);
-            //        if (pack != null && pack.Code == StateCode.SUCCESS)
-            //        {
-            //            Application.RunOnMainThread(() =>
-            //            {
-            //                //鏇存柊鐣岄潰
-            //                faceUnlockSetup = Newtonsoft.Json.JsonConvert.DeserializeObject<FaceUnlockSetupObj>(pack.Data.ToString());
-            //                btnFaceUnlockSwitchIcon.IsSelected = faceUnlockSetup.enabled;
-            //                loadSubView(view, faceUnlockSetup);
-            //            });
-            //        }
-            //        else
-            //        {
-            //            //澶辫触鎻愮ず
-            //            Application.RunOnMainThread(() =>
-            //            {
-            //                if (!string.IsNullOrEmpty(pack.message))
-            //                {
-            //                    if (string.IsNullOrEmpty(pack.message))
-            //                    {
-            //                        pack.message = Language.StringByID(StringId.OperationFailed);
-            //                    }
-            //                    var tip = new Tip()
-            //                    {
-            //                        MaxWidth = Application.GetRealWidth(300),
-            //                        Text = $"{pack.message}({pack.Code})",
-            //                        CloseTime = 3,
-            //                        Direction = AMPopTipDirection.None
-            //                    };
-            //                    tip.Show(MainPage.BaseView);
-            //                }
-            //            });
-            //        }
-            //    }
-            //    catch (Exception ex)
-            //    {
-            //        MainPage.Log($"UnlockSettingPage error : {ex.Message}");
-            //    }
-            //    finally
-            //    {
-            //        Application.RunOnMainThread(() =>
-            //        {
-            //            waitPage.Hide();
-            //        });
-            //    }
-
-            //})
-            //{ IsBackground = true }.Start();
-
-        }
-
-        void loadSubView(VerticalScrolViewLayout view, FaceUnlockSetupObj faceUnlockSetup)
-        {
-            view.RemoveAll();
-            if (faceUnlockSetup.enabled)
-            {
-                #region 瑙﹀彂鏂瑰紡 TriggerMode
-                var triggerModeView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(50),
-                    BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-                };
-                view.AddChidren(triggerModeView);
-
-                var btnTriggerModeRight = new Button()
-                {
-                    X = Application.GetRealWidth(339),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetMinRealAverage(16),
-                    Height = Application.GetMinRealAverage(16),
-                    UnSelectedImagePath = "Public/Right.png",
-                };
-                triggerModeView.AddChidren(btnTriggerModeRight);
-
-                var btnTriggerModeStateText = new Button()
-                {
-                    X = Application.GetRealWidth(100),
-                    Width = Application.GetRealWidth(223),
-                    TextAlignment = TextAlignment.CenterRight,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    TextColor = CSS_Color.PromptingColor1,
-                };
-                triggerModeView.AddChidren(btnTriggerModeStateText);
-                btnTriggerModeStateText.TextID = faceUnlockSetup.mode == 0 ? StringId.AutomaticTriggering : StringId.ManualTriggering;
-
-                var btnTriggerModeText = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextID = StringId.TriggerMode,
-                };
-                triggerModeView.AddChidren(btnTriggerModeText);
-
-                btnTriggerModeText.MouseUpEventHandler = (sender, e) =>
-                {
-                    Action<int> updataAction = (faceUnlockSetupMode) => {
-                        btnTriggerModeStateText.TextID = faceUnlockSetupMode == 0 ? StringId.AutomaticTriggering : StringId.ManualTriggering;
-                    };
-                    var page = new VideoDoorlockFaceUnlockTriggerSettingPage(device, faceUnlockSetup,updataAction);
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
-                };
-                #endregion
-
-                view.AddChidren(new Button { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
-            }
-            #region 浜鸿劯褰曞叆甯姪 
-            var faceEntryHelpView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(50),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-            };
-            view.AddChidren(faceEntryHelpView);
-
-            var btnFaceEntryHelpRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/Right.png",
-            };
-            faceEntryHelpView.AddChidren(btnFaceEntryHelpRight);
-
-
-            var btnFaceEntryHelpText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextID = StringId.FaceEntryHelp,
-            };
-            faceEntryHelpView.AddChidren(btnFaceEntryHelpText);
-
-            btnFaceEntryHelpText.MouseUpEventHandler = (sender, e) =>
-            {
-                var page = new VideoDoorlockFaceUnlockHelpPage();
-                MainPage.BasePageView.AddChidren(page);
-                page.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-            };
-            #endregion
-
-        }
-
-    }
-
-    /// <summary>
-    /// 浜鸿劯寮�閿侀厤缃�
-    /// </summary>
-    public class FaceUnlockSetupObj
-    {
-        /// <summary>
-        /// 寮�鍏�
-        /// </summary>
-        public bool enabled = true;
-        /// <summary>
-        /// 瑙i攣鏂瑰紡 0-鑷姩 1-鎵嬪姩
-        /// </summary>
-        public int mode;
-        /// <summary>
-        /// 鐏垫晱搴� 0-楂� 1-浣�
-        /// </summary>
-        public int sensitivity;
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs
deleted file mode 100644
index b7ef627..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs
+++ /dev/null
@@ -1,736 +0,0 @@
-锘縰sing System;
-using HDL_ON.Common;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class UnlockSettingPage : FrameLayout
-    {
-        FrameLayout bodyView;
-        /// <summary>
-        /// 浜屾寮�閿佸紑鍏�
-        /// </summary>
-        Button btnSecondaryUnlockingUnlockkSwtichIcon;
-        /// <summary>
-        /// 绔ラ攣寮�鍏�
-        /// </summary>
-        Button btnChildLockSwitchIcon;
-        /// <summary>
-        /// 鍙嶉攣寮�鍏�
-        /// </summary>
-        Button btnAntiLockSwitchIcon;
-        /// <summary>
-        /// 甯冮槻寮�鍏�
-        /// </summary>
-        Button btnDefenceStatusSwitchIcon;
-        /// <summary>
-        /// 鎸夐敭涓ゆ寮�闂�
-        /// </summary>
-        bool ezvizDoubleClickOpenDoorSwitchVO = false;
-        /// <summary>
-        /// 绔ラ攣鐘舵��
-        /// </summary>
-        bool ezvizChildLockSwitchVO = false;
-        /// <summary>
-        /// 鍙嶉攣鐘舵��
-        /// </summary>
-        bool ezvizAntiLock = false;
-        /// <summary>
-        /// 甯冮槻鐘舵��
-        /// </summary>
-        bool ezvizDefenceStatus = false;
-
-        Function device;
-        public UnlockSettingPage(Function function)
-        {
-            bodyView = this;
-            device = function;
-        }
-
-        public void LoadPage()
-        {
-            new TopViewDiv(bodyView, Language.StringByID(StringId.UnlockSetting)).LoadTopView();
-            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
-            var contentView = new VerticalScrolViewLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(600),
-                ScrollEnabled = false,
-            };
-            bodyView.AddChidren(contentView);
-
-            #region 浜鸿劯寮�閿佽缃�
-            var faceUnlockSettingView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(50),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(faceUnlockSettingView);
-
-            var btnFaceSettingRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/Right.png",
-            };
-            faceUnlockSettingView.AddChidren(btnFaceSettingRight);
-
-            var btnFaceText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextID = StringId.FaceUnlockSetting,
-            };
-            faceUnlockSettingView.AddChidren(btnFaceText);
-
-            btnFaceText.MouseUpEventHandler = (sender, e) => {
-                var page = new UnlockSettingFacePage(device);
-                MainPage.BasePageView.AddChidren(page);
-                page.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-            };
-            #endregion
-
-            contentView.AddChidren(new Button() {
-                Height = Application.GetRealHeight(8),
-                BackgroundColor = CSS_Color.BackgroundColor,
-            });
-
-            #region 鎸夐敭涓ゆ寮�閿�
-            var secondaryUnlockingView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(74),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(secondaryUnlockingView);
-
-            var btnSecondaryUnlockingText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(7),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.PressTheButtonToUnlockTwice
-            };
-            secondaryUnlockingView.AddChidren(btnSecondaryUnlockingText);
-
-            var btnSecondaryUnlockingTipText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnSecondaryUnlockingText.Bottom,
-                Width = Application.GetRealWidth(339),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                IsMoreLines = true,
-                TextID = StringId.PressTheButtonToUnlockTwiceTip
-            };
-            secondaryUnlockingView.AddChidren(btnSecondaryUnlockingTipText);
-
-            btnSecondaryUnlockingUnlockkSwtichIcon = new Button()
-            {
-                X = Application.GetRealWidth(322),
-                Y = Application.GetRealHeight(8),
-                Width = Application.GetMinRealAverage(36),
-                Height = Application.GetMinRealAverage(36),
-                UnSelectedImagePath = "Public/Switch_2.png",
-                SelectedImagePath = "Public/SwitchOn_2.png",
-                IsSelected = ezvizDoubleClickOpenDoorSwitchVO,
-            };
-            secondaryUnlockingView.AddChidren(btnSecondaryUnlockingUnlockkSwtichIcon);
-            #endregion
-
-            #region 绔ラ攣妯″紡
-            var childLockView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(74),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(childLockView);
-
-            childLockView.AddChidren(new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Height = 1,
-                BackgroundColor = CSS_Color.DividingLineColor,
-            });
-
-            var btnEzvizChildLockText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(7),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.ChildLockMode
-            };
-            childLockView.AddChidren(btnEzvizChildLockText);
-
-            var btnChildLockTipText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnEzvizChildLockText.Bottom,
-                Width = Application.GetRealWidth(339),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                IsMoreLines = true,
-                TextID = StringId.ChildLockModeTip,
-            };
-            childLockView.AddChidren(btnChildLockTipText);
-
-            btnChildLockSwitchIcon = new Button()
-            {
-                X = Application.GetRealWidth(322),
-                Y = Application.GetRealHeight(8),
-                Width = Application.GetMinRealAverage(36),
-                Height = Application.GetMinRealAverage(36),
-                UnSelectedImagePath = "Public/Switch_2.png",
-                SelectedImagePath = "Public/SwitchOn_2.png",
-                IsSelected = ezvizChildLockSwitchVO,
-            };
-            childLockView.AddChidren(btnChildLockSwitchIcon);
-            #endregion
-
-            #region 鍙嶉攣妯″紡
-            var antiLockView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(94),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(antiLockView);
-
-            antiLockView.AddChidren(new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Height = 1,
-                BackgroundColor = CSS_Color.DividingLineColor,
-            });
-
-            var btnAntiLockText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(7),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.AntiLockMode
-            };
-            antiLockView.AddChidren(btnAntiLockText);
-
-            var btnAntilockTipText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnAntiLockText.Bottom,
-                Width = Application.GetRealWidth(339),
-                Height = Application.GetRealHeight(37 + 15),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                IsMoreLines = true,
-                TextID = StringId.AntiLockModeTip,
-            };
-            antiLockView.AddChidren(btnAntilockTipText);
-
-            btnAntiLockSwitchIcon = new Button()
-            {
-                X = Application.GetRealWidth(322),
-                Y = Application.GetRealHeight(8),
-                Width = Application.GetMinRealAverage(36),
-                Height = Application.GetMinRealAverage(36),
-                UnSelectedImagePath = "Public/Switch_2.png",
-                SelectedImagePath = "Public/SwitchOn_2.png",
-                IsSelected = ezvizAntiLock,
-            };
-            antiLockView.AddChidren(btnAntiLockSwitchIcon);
-            #endregion
-
-            #region 甯冮槻妯″紡
-            var defenceView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(94),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(defenceView);
-
-            defenceView.AddChidren(new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Height = 1,
-                BackgroundColor = CSS_Color.DividingLineColor,
-            });
-
-            var btnDefenceText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(7),
-                Height = Application.GetRealHeight(37),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.DefenceMode
-            };
-            defenceView.AddChidren(btnDefenceText);
-
-            var btnDefenceTipText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnDefenceText.Bottom,
-                Width = Application.GetRealWidth(339),
-                Height = Application.GetRealHeight(37 + 15),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                IsMoreLines = true,
-                TextID = StringId.DoorlockDefenceModeTip,
-            };
-            defenceView.AddChidren(btnDefenceTipText);
-
-            btnDefenceStatusSwitchIcon = new Button()
-            {
-                X = Application.GetRealWidth(322),
-                Y = Application.GetRealHeight(8),
-                Width = Application.GetMinRealAverage(36),
-                Height = Application.GetMinRealAverage(36),
-                UnSelectedImagePath = "Public/Switch_2.png",
-                SelectedImagePath = "Public/SwitchOn_2.png",
-                IsSelected = ezvizAntiLock,
-            };
-            defenceView.AddChidren(btnDefenceStatusSwitchIcon);
-            #endregion
-
-
-            var waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Start("");
-
-            new System.Threading.Thread(() => {
-                try
-                {
-                    var pack = ApiUtlis.Ins.HttpRequest.GetDoubleClickOpenDoorSwitch(device.deviceId);
-                    if (pack != null && pack.Code == StateCode.SUCCESS)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            //鏇存柊鐣岄潰
-                            var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<StateObj>(pack.Data.ToString());
-                            btnSecondaryUnlockingUnlockkSwtichIcon.IsSelected = obj.enabled.ToString() == "0" ? false : true;
-                        });
-                    }
-                    else
-                    {
-                        //澶辫触鎻愮ず
-                        Application.RunOnMainThread(() =>
-                        {
-                            if (!string.IsNullOrEmpty(pack.message))
-                            {
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                var tip = new Tip()
-                                {
-                                    MaxWidth = Application.GetRealWidth(300),
-                                    Text = $"{pack.message}({pack.Code})",
-                                    CloseTime = 3,
-                                    Direction = AMPopTipDirection.None
-                                };
-                                tip.Show(MainPage.BaseView);
-                            }
-                        });
-                    }
-
-                    #region 鏌ヨ绔ラ攣寮�鍏崇姸鎬�
-                    pack = ApiUtlis.Ins.HttpRequest.GetChildLockSwitch(device.deviceId);
-                    if (pack != null && pack.Code == StateCode.SUCCESS)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            //鏇存柊鐣岄潰
-                            var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<StateObj>(pack.Data.ToString());
-                            btnChildLockSwitchIcon.IsSelected = obj.enabled.ToString() == "0" ? false : true;
-                        });
-                    }
-                    else
-                    {
-                        //澶辫触鎻愮ず
-                        Application.RunOnMainThread(() =>
-                        {
-                            if (string.IsNullOrEmpty(pack.message))
-                            {
-                                pack.message = Language.StringByID(StringId.OperationFailed);
-                            }
-                            var tip = new Tip()
-                            {
-                                MaxWidth = Application.GetRealWidth(300),
-                                Text = $"{pack.message}({pack.Code})",
-                                CloseTime = 3,
-                                Direction = AMPopTipDirection.None
-                            };
-                            tip.Show(MainPage.BaseView);
-                        });
-                    }
-                    #endregion
-
-                    #region 鏌ヨ鍙嶉攣寮�鍏崇姸鎬�
-                    pack = ApiUtlis.Ins.HttpRequest.GetAntiLockCfg(device.deviceId);
-                    if (pack != null && pack.Code == StateCode.SUCCESS)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            try
-                            {
-                                //鏇存柊鐣岄潰
-                                var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<StateObj>(pack.Data.ToString());
-                                btnAntiLockSwitchIcon.IsSelected = (bool)obj.enabled;
-                            }catch(Exception ex)
-                            {
-                                MainPage.Log($"update btnAntiLockSwitchIcon.IsSelected error :{ex.Message}");
-                            }
-                        });
-                    }
-                    else
-                    {
-                        //澶辫触鎻愮ず
-                        Application.RunOnMainThread(() =>
-                        {
-                            if (string.IsNullOrEmpty(pack.message))
-                            {
-                                pack.message = Language.StringByID(StringId.OperationFailed);
-                            }
-                            var tip = new Tip()
-                            {
-                                MaxWidth = Application.GetRealWidth(300),
-                                Text = $"{pack.message}({pack.Code})",
-                                CloseTime = 3,
-                                Direction = AMPopTipDirection.None
-                            };
-                            tip.Show(MainPage.BaseView);
-                        });
-                    }
-                    #endregion
-
-
-
-                    #region 鏌ヨ甯冮槻鐘舵��
-                    pack = ApiUtlis.Ins.HttpRequest.GetDefenceStatus(device.deviceId);
-                    if (pack != null && pack.Code == StateCode.SUCCESS)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            //鏇存柊鐣岄潰
-                            var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorlockDefenceState>(pack.Data.ToString());
-                            btnDefenceStatusSwitchIcon.IsSelected = obj.armStatus == "disarmed" ? false : true;
-                        });
-                    }
-                    else
-                    {
-                        //澶辫触鎻愮ず
-                        Application.RunOnMainThread(() =>
-                        {
-
-                            if (string.IsNullOrEmpty(pack.message))
-                            {
-                                pack.message = Language.StringByID(StringId.OperationFailed);
-                            }
-                            {
-                                var tip = new Tip()
-                                {
-                                    MaxWidth = Application.GetRealWidth(300),
-                                    Text = $"{pack.message}({pack.Code})",
-                                    CloseTime = 3,
-                                    Direction = AMPopTipDirection.None
-                                };
-                                tip.Show(MainPage.BaseView);
-                            }
-                        });
-                    }
-                    #endregion
-
-
-                }
-                catch (Exception ex)
-                {
-                    MainPage.Log($"UnlockSettingPage error : {ex.Message}");
-                }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        waitPage.Hide();
-                    });
-                }
-
-            }) { IsBackground = true }.Start();
-
-            #region 閰嶇疆浜嬩欢
-            btnSecondaryUnlockingUnlockkSwtichIcon.MouseUpEventHandler = (sender, e) => {
-                waitPage.Start("");
-                int changeState = 0;
-                if (!btnSecondaryUnlockingUnlockkSwtichIcon.IsSelected)
-                {
-                    btnSecondaryUnlockingUnlockkSwtichIcon.IsSelected = true;
-                    changeState = 1;
-                }
-                new System.Threading.Thread(() => {
-                    try
-                    {
-                        var pack = ApiUtlis.Ins.HttpRequest.SetDoubleClickOpenDoorSwitch(device.deviceId,changeState);
-                        if (pack != null && pack.Code == StateCode.SUCCESS)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                //鏇存柊鐣岄潰
-                                btnSecondaryUnlockingUnlockkSwtichIcon.IsSelected = changeState == 1;
-                            });
-                        }
-                        else
-                        {
-                            //澶辫触鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                {
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = $"{pack.message}({pack.Code})",
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                }
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MainPage.Log($"SetDoubleClickOpenDoorSwitch error : {ex.Message}");
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            waitPage.Hide();
-                        });
-                    }
-                }) { IsBackground = true }.Start();
-            };
-            btnChildLockSwitchIcon.MouseUpEventHandler = (sender, e) => {
-                waitPage.Start("");
-                int changeState = 0;
-                if (!btnChildLockSwitchIcon.IsSelected)
-                {
-                    btnChildLockSwitchIcon.IsSelected = true;
-                    changeState = 1;
-                }
-                new System.Threading.Thread(() => {
-                    try
-                    {
-                        var pack = ApiUtlis.Ins.HttpRequest.SetChildLockSwitch(device.deviceId, changeState);
-                        if (pack != null && pack.Code == StateCode.SUCCESS)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                //鏇存柊鐣岄潰
-                                btnChildLockSwitchIcon.IsSelected = changeState == 1;
-                            });
-                        }
-                        else
-                        {
-                            //澶辫触鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                {
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = $"{pack.message}({pack.Code})",
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                }
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MainPage.Log($"SetChildLockSwitch error : {ex.Message}");
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            waitPage.Hide();
-                        });
-                    }
-                })
-                { IsBackground = true }.Start();
-
-            };
-            btnAntiLockSwitchIcon.MouseUpEventHandler = (sender, e) => {
-                waitPage.Start("");
-                bool changeState = false;
-                if (!btnAntiLockSwitchIcon.IsSelected)
-                {
-                    btnAntiLockSwitchIcon.IsSelected = true;
-                    changeState = true;
-                }
-                new System.Threading.Thread(() => {
-                    try
-                    {
-                        var pack = ApiUtlis.Ins.HttpRequest.SetAntiLockCfg(device.deviceId, changeState);
-                        if (pack != null && pack.Code == StateCode.SUCCESS)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                //鏇存柊鐣岄潰
-                                btnAntiLockSwitchIcon.IsSelected = changeState;
-                            });
-                        }
-                        else
-                        {
-                            //澶辫触鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                {
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = $"{pack.message}({pack.Code})",
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                }
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MainPage.Log($"SetAntiLockCfg error : {ex.Message}");
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            waitPage.Hide();
-                        });
-                    }
-                })
-                { IsBackground = true }.Start();
-            };
-            btnDefenceStatusSwitchIcon.MouseUpEventHandler = (sender, e) => {
-                waitPage.Start("");
-                bool changeState = false;
-                if (!btnDefenceStatusSwitchIcon.IsSelected)
-                {
-                    btnDefenceStatusSwitchIcon.IsSelected = true;
-                    changeState = true;
-                }
-                new System.Threading.Thread(() => {
-                    try
-                    {
-                        var pack = ApiUtlis.Ins.HttpRequest.SetDefenceStatus(device.deviceId, changeState);
-                        if (pack != null && pack.Code == StateCode.SUCCESS)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                //鏇存柊鐣岄潰
-                                btnDefenceStatusSwitchIcon.IsSelected = changeState;
-                            });
-                        }
-                        else
-                        {
-                            //澶辫触鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                {
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = $"{pack.message}({pack.Code})",
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                }
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MainPage.Log($"SetDefenceStatus error : {ex.Message}");
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            waitPage.Hide();
-                        });
-                    }
-                })
-                { IsBackground = true }.Start();
-            };
-
-            #endregion
-
-
-        }
-
-    }
-
-    /// <summary>
-    /// 闂ㄩ攣閰嶇疆
-    /// </summary>
-    public class StateObj
-    {
-        public object enabled;
-    }
-
-    public class DoorlockDefenceState
-    {
-        /// <summary>
-        /// 甯冮槻鐘舵�� disarmed-鎾ら槻 armed-宸插竷闃�
-        /// </summary>
-        public string armStatus;
-        /// <summary>
-        /// 甯冮槻妯″紡 global-鍏ㄥ眬 atHome-鍦ㄥ outDoor-澶栧嚭 sleep-鐫$湢
-        /// </summary>
-        public string defenceMode;
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
deleted file mode 100644
index c43b939..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Threading;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
-
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    /// <summary>
-    /// 钀ょ煶瑙嗛闂ㄩ攣鏁版嵁鍙戦��
-    /// </summary>
-    public class VideDoorLockSend
-    {
-
-        private static VideDoorLockSend send = null;
-        /// <summary>
-        /// 鑾峰彇褰撳墠鐨勫璞� 
-        /// </summary>
-        public static VideDoorLockSend Current
-        {
-            get
-            {
-                if (send == null)
-                {
-                    send = new VideDoorLockSend();
-                }
-
-                return send;
-            }
-        }
-        /// <summary>
-        /// 瑙g粦璁惧(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="function">褰撳墠鐨勮澶�</param>
-        /// <param name="action">鍥炶皟缁撴灉</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public void DelDevice(Function function, Action<bool> action, TipType tipType = TipType.flicker)
-        {
-            new Thread(() =>
-            {
-                try
-                {
-                    Dictionary<string, object> d = new Dictionary<string, object>();
-                    d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-                    d.Add("deviceSerial", function.sid);//绛夊悓闂ㄩ攣搴忓垪鍙�
-                    d.Add("platform", 1);//骞冲彴
-                    var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_DeleteDevice, "鍒犻櫎钀ょ煶闂ㄩ攣璁惧");
-                    if (!this.DataChecking(responsePackNew, tipType))
-                    {
-                        return;
-                    }
-
-                    if (function != null)
-                    {
-                        action?.Invoke(true);
-                    }
-                }
-                catch (Exception s)
-                {
-                }
-            })
-            { IsBackground = true }.Start();
-
-        }
-        /// <summary>
-        /// 鑾峰彇闂ㄩ攣鐘舵��(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="function">褰撳墠鐨勮澶�</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <param name="return">杩斿洖缁撴灉涓嶄細涓簄ull</param>
-        public VideoDoorLockInfo GetVideoDoorLockState(Function function, TipType tipType = TipType.flicker)
-        {
-
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", function.deviceId);
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Lockstatus, "鑾峰彇钀ょ煶瑙嗛闂ㄩ攣鐘舵��");
-            if (!this.DataChecking(responsePackNew,tipType))
-            {
-                return new VideoDoorLockInfo();
-            }
-
-            var videoDoorLockInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoDoorLockInfo>(responsePackNew.Data.ToString());
-            if (videoDoorLockInfo == null)
-            {
-                return new VideoDoorLockInfo();
-            }
-            return videoDoorLockInfo;
-
-
-
-        }
-        /// <summary>
-        /// 鑾峰彇鐢垫睜鐢甸噺(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="function">褰撳墠鐨勮澶�</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <param name="return">杩斿洖缁撴灉涓嶄細涓簄ull</param>
-        public CellInfo GetCellValue(Function function, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", function.deviceId);
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Details, "鑾峰彇钀ょ煶闂ㄩ攣璁惧鐢甸噺");
-            if (!this.DataChecking(responsePackNew,tipType))
-            {
-                return new CellInfo();
-            }
-            var cellInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<CellInfo>(responsePackNew.Data.ToString());
-            if (cellInfo == null)
-            {
-                return new CellInfo();
-            }
-
-            return cellInfo;
-
-        }
-        /// <summary>
-        /// 鑾峰彇闂ㄩ攣鐢ㄦ埛鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="function">褰撳墠鐨勮澶�</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <param name="return">杩斿洖缁撴灉涓嶄細涓簄ull</param>
-        public List<UserVideoDoorLockInfo> GetVideoDoorLockUserListInfo(Function function, TipType tipType = TipType.flicker)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("deviceId", function.deviceId);
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_UserList, "鑾峰彇钀ょ煶闂ㄩ攣鐢ㄦ埛鍒楄〃");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<UserVideoDoorLockInfo>();
-            }
-            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserVideoDoorLockInfo>>(responsePackNew.Data.ToString());
-            if (list == null)
-            {
-                return new List<UserVideoDoorLockInfo>();
-            }
-            return list;
-        }
-        /// <summary>
-        /// 鑾峰彇闂ㄩ攣璁惧鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="spk">鎸囧畾spk鑾峰彇</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public List<Function> GetVideoDoorLockDeviceList(string spk, TipType tipType = TipType.flicker)
-        {
-
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
-            d.Add("spk", spk);
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_GetDevcieList, "鑾峰彇钀ょ煶闂ㄩ攣璁惧鍒楄〃");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new List<Function>();
-            }
-            var doorLockList = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockList>(responsePackNew.Data.ToString());
-            if (doorLockList == null)
-            {
-                return new DoorLockList().list;
-            }
-            return doorLockList.list;
-        }
-
-        /// <summary>
-        /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
-        /// </summary>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
-        public LockModels GetVideoDoorLockLockModelsList(TipType tipType = TipType.flicker)
-        {
-            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(new object { }, NewAPI.Api_Post_Lock_Models, "鑾峰彇钀ょ煶闂ㄩ攣鍨嬪彿鍒楄〃");
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return new LockModels();
-            }
-            var lockModels = Newtonsoft.Json.JsonConvert.DeserializeObject<LockModels>(responsePackNew.Data.ToString());
-            if (lockModels == null)
-            {
-                return new LockModels();
-            }
-            return lockModels;
-        }
-
-        /// <summary>
-        /// 鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
-        /// </summary>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
-        public string GetEZGetChildToken(TipType tipType = TipType.flicker)
-        {
-            //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
-            var responsePackNew = new HttpServerRequest().EZGetChildToken();
-            if (!this.DataChecking(responsePackNew, tipType))
-            {
-                return "";
-            }
-            return responsePackNew.Data.ToString();
-        }
-        /// <summary>
-        /// 妫�楠屾暟鎹洖澶嶆垚鍔熸垨鑰呭け璐�
-        /// </summary>
-        /// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
-        /// <param name="tipType">鏄惁闇�瑕佹彁绀�</param>
-        /// <returns></returns>
-        private bool DataChecking(ResponsePackNew responsePackNew, TipType tipType)
-        {
-            if (responsePackNew.Data == null || responsePackNew.Code != "0" || responsePackNew.Data.ToString() == "")
-            {
-                if (TipType.flicker == tipType)
-                {
-                    if (responsePackNew == null)
-                    {
-                        responsePackNew = new ResponsePackNew { message = "娌″洖澶�,璇风‘璁ょ綉缁滄槸鍚︽甯�.", Code = "-1", };
-                    }
-                    Application.RunOnMainThread(() =>
-                    {
-                        //new Tip()
-                        //{
-                        //    CloseTime = 1,
-                        //    Text = responsePackNew.message + "(" + responsePackNew.Code + ")",
-                        //    Direction = AMPopTipDirection.None,
-                        //}.Show(MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1));
-                        CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")");
-                    });
-                }
-                return false;
-            }
-            return true;
-        }
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs
deleted file mode 100644
index 11c271d..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-锘縰sing Shared;
-using HDL_ON.Stan;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using HDL_ON.UI.CSS;
-using HDL_ON.Entity;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    /// <summary>
-    /// 瑙嗛闂ㄩ攣鍒楄〃鐣岄潰
-    /// </summary>
-    public class VideoDoorLockListPage : EditorCommonForm
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-
-        /// <summary>
-        /// 闂ㄩ攣璁惧鍒楄〃
-        /// </summary>
-        private List<Function> listDevice = new List<Function>();
-        /// <summary>
-        /// 鐢垫睜鎺т欢鍒楄〃(key:璁惧鐨剆id)
-        /// </summary>
-        private Dictionary<string, BatteryPersentControl> dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
-        /// <summary>
-        /// 鍒楄〃鎺т欢
-        /// </summary>
-        private VerticalListControl listView = null;
-        /// <summary>
-        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
-        /// </summary>
-        public Action action;
-
-
-        #endregion
-
-        #region 鈻� 鍒濆鍖朹____________________________
-
-        public VideoDoorLockListPage(Action action) {
-            this.action = action;
-        }
-        
-
-        /// <summary>
-        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
-        /// </summary>
-        /// <param name="i_listDevice">闂ㄩ攣璁惧鍒楄〃</param>
-        public void ShowForm(List<Function> i_listDevice)
-        {
-            this.listDevice.AddRange(i_listDevice);
-            //鏅鸿兘闂ㄩ攣
-            base.SetTitleText(Language.StringByID(StringId.shipinmensuo));
-
-            //鍒濆鍖栦腑閮ㄤ俊鎭�
-            this.InitMiddleFrame();
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
-        /// </summary>
-        private void InitMiddleFrame()
-        {
-            //娓呯┖bodyFrame
-            this.ClearBodyFrame();
-
-            string nowSelectId = string.Empty;
-            //妤煎眰涓嬫媺鍥炬爣
-            var btnFloor = new NormalViewControl(500, Application.GetRealHeight(16), false);
-            var btnFloorIcon = new IconViewControl(16);
-            btnFloorIcon.X = HdlControlResourse.XXLeft;
-            btnFloorIcon.Y = Application.GetRealHeight(18);
-            btnFloorIcon.UnSelectedImagePath = "Public/DownIcon.png";
-            bodyFrameLayout.AddChidren(btnFloorIcon);
-            btnFloorIcon.ButtonClickEvent += (sender, e) =>
-            {
-                //鏄剧ず涓嬫媺鍒楄〃
-                var form = new FloorRoomSelectPopupView();
-                form.ShowDeviceFunctionView(btnFloor, this.listDevice, (selectId, listFunc) =>
-                {
-                    btnFloor.Width = btnFloor.GetRealWidthByText();//閲嶇疆鏂囨湰瀹藉害
-                    nowSelectId = selectId;
-                    //閲嶆柊鍒濆鍖栭棬閿佸垪琛ㄦ帶浠�
-                    this.InitDoorListControl(listFunc);
-
-                }, nowSelectId);
-            };
-            //妤煎眰
-            btnFloor.X = btnFloorIcon.Right + Application.GetRealWidth(2);
-            btnFloor.TextColor = CSS_Color.FirstLevelTitleColor;
-            btnFloor.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
-            btnFloor.Text = DB_ResidenceData.Instance.CurFloor.roomName;
-            //btnFloor.Width = btnFloor.GetRealWidthByText();
-            bodyFrameLayout.AddChidren(btnFloor);
-            //璁╁畠鐩稿鍥炬爣灞呬腑
-            btnFloor.Y = btnFloorIcon.Y + (btnFloorIcon.Height - btnFloor.Height) / 2;
-            btnFloor.ButtonClickEvent += (sender, e) =>
-            {
-                btnFloorIcon.ButtonClickEvent(null, null);
-            };
-
-            //鍒楄〃鎺т欢
-            this.listView = new VerticalListControl();
-            listView.Y = Application.GetRealHeight(53);
-            listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(53);
-            bodyFrameLayout.AddChidren(listView);
-
-            //鍒濆鍖栭棬閿佸垪琛ㄦ帶浠�
-            this.InitDoorListControl(this.listDevice);
-        }
-
-        #endregion
-
-        #region 鈻� 娣诲姞闂ㄩ攣鎺т欢_______________________
-
-        /// <summary>
-        /// 鍒濆鍖栭棬閿佸垪琛ㄦ帶浠�
-        /// </summary>
-        private void InitDoorListControl(List<Function> i_listDevice)
-        {
-            this.listView.RemoveAll();
-            this.dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
-
-            //鐢熸垚闂ㄩ攣鎺т欢
-            foreach (var device in i_listDevice)
-            {
-                this.AddDoorControl(device);
-            }
-        }
-
-        /// <summary>
-        /// 娣诲姞闂ㄩ攣鎺т欢
-        /// </summary>
-        /// <param name="i_device">闂ㄩ攣瀵硅薄</param>
-        private void AddDoorControl(Function i_device)
-        {
-            //鐧借壊鑳屾櫙瀹瑰櫒
-            var frameBack = new FrameLayoutStatuControl();
-            frameBack.Width = Application.GetRealWidth(343);
-            frameBack.Height = Application.GetRealHeight(96);
-            frameBack.Radius = (uint)Application.GetRealWidth(12);
-            frameBack.Gravity = Gravity.CenterHorizontal;
-            frameBack.BackgroundColor = CSS_Color.MainBackgroundColor;
-            this.listView.AddChidren(frameBack);
-            //闂ㄩ攣鍥炬爣
-            var btnIcon = new IconViewControl(32);
-            btnIcon.X = Application.GetRealWidth(10);
-            btnIcon.Y = Application.GetRealHeight(15);
-            btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
-            frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
-            //璁惧鍚嶅瓧
-            var btnName = new Button();
-            btnName.X = btnIcon.Right + Application.GetRealWidth(12);
-            btnName.Y = Application.GetRealHeight(12);
-            btnName.Width = Application.GetRealWidth(150);
-            btnName.Height = Application.GetRealHeight(20);
-            btnName.TextColor = CSS_Color.FirstLevelTitleColor;
-            btnName.TextAlignment = TextAlignment.CenterLeft;
-            btnName.Text = i_device.name;
-            frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
-            //鎴块棿
-            var btnRoom = new Button();
-            btnRoom.X = btnName.X;
-            btnRoom.Y = btnName.Bottom + Application.GetRealHeight(4);
-            btnRoom.Width = Application.GetRealWidth(150);
-            btnRoom.Height = Application.GetRealHeight(15);
-            btnRoom.TextColor = CSS_Color.PromptingColor1;
-            btnRoom.TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel;
-            btnRoom.TextAlignment = TextAlignment.CenterLeft;
-            btnRoom.Text = i_device.GetRoomListName();
-            frameBack.AddChidren(btnRoom, ChidrenBindMode.BindEvent);
-            //鐢垫睜鍥炬爣
-            var btnBattery = new BatteryPersentControl();
-            btnBattery.Y = Application.GetRealHeight(62);
-            //frameBack.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
-            btnBattery.InitControl();
-            btnBattery.SetValue(80);
-            btnBattery.X = frameBack.Width - btnBattery.Width - Application.GetRealWidth(12);
-            this.dicBatteryContr[i_device.sid] = btnBattery;
-            frameBack.ButtonClickEvent += (sender, e) =>
-            {
-                
-                var form = new VideoDoorLockPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function,()=> {
-                    this.CloseForm();
-                    this.action?.Invoke();
-                });
-                MainPage.BasePageView.AddChidren(form);
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                form.Show();
-              
-            };
-
-            //搴曢儴鍐嶅姞涓棿璺�
-            var frameSpace = new FrameLayout();
-            frameSpace.Height = Application.GetRealHeight(12);
-            this.listView.AddChidren(frameSpace);
-        }
-
-        #endregion
-
-
-        #region 鈻� 璁惧鐘舵�佹帹閫乢______________________
-
-        /// <summary>
-        /// 璁惧鐘舵�佹帹閫�
-        /// </summary>
-        /// <param name="i_LocalDevice"></param>
-        public override void DeviceStatuPush(Function i_LocalDevice)
-        {
-            //涓嶆槸鐩爣璁惧
-            if (this.dicBatteryContr.ContainsKey(i_LocalDevice.sid) == false)
-            {
-                return;
-            }
-
-        }
-
-        #endregion
-
-      
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
deleted file mode 100644
index c21f027..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ /dev/null
@@ -1,658 +0,0 @@
-锘縰sing Shared;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using HDL_ON.UI.CSS;
-using HDL_ON.Entity;
-using HDL_ON.DriverLayer;
-using HDL_ON.UI.Music;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
-
-namespace HDL_ON.UI
-{
-    /// <summary>
-    /// 瑙嗛闂ㄩ攣鐨勬帶鍒剁晫闈�
-    /// </summary>
-    public class VideoDoorLockPage : FrameLayout
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-        /// <summary>
-        /// 璁惧
-        /// </summary>
-        private Function device;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢
-        /// </summary>
-        private Button btnDeviceName;
-        /// <summary>
-        /// 涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢
-        /// </summary>
-        private Button btnRoomName;
-        /// <summary>
-        /// 澶撮儴甯冨眬
-        /// </summary>
-        private TopView topView;
-        /// <summary>
-        /// 褰撳墠璁惧鍚嶇О
-        /// </summary>
-        private Button btnCurrDeviceName;
-        /// <summary>
-        /// 鍖哄煙
-        /// </summary>
-        private Button btnCurrDeviceRoom;
-        /// <summary>
-        /// 鐢甸噺鐖舵帶浠�
-        /// </summary>
-        private FrameLayout cellFrame;
-        /// <summary>
-        /// 鐢甸噺
-        /// </summary>
-        private Button btnCell;
-        /// <summary>
-        /// 鐢甸噺杩涘害鏉�
-        /// </summary>
-        private DiyArcSeekBar cellDiyArcSeekBar;
-        /// <summary>
-        ///鏀惰棌鍥炬爣
-        /// </summary>
-        private Button btnCollectIcon;
-        /// <summary>
-        /// 闂ㄩ攣鐘舵��
-        /// </summary>
-        private Button btnDoorLockIcon;
-            Button btnDoorlockStatus;
-        /// <summary>
-        /// 瀹炴椂瑙嗛
-        /// </summary>
-        private CustomFrameLayout rtvFL;
-        /// <summary>
-        /// 涓存椂瀵嗙爜
-        /// </summary>
-        private CustomFrameLayout pswFL;
-        /// <summary>
-        /// 鍘嗗彶璁板綍
-        /// </summary>
-        private CustomFrameLayout recordFL;
-
-        /// <summary>
-        /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
-        /// </summary>
-        private CommonMethod.Comerom comerom;
-        /// <summary>
-        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
-        /// </summary>
-        public Action action;
-        #endregion
-
-
-        /// <summary>
-        /// 鏋勯�犲嚱鏁�
-        /// </summary>
-        /// <param name="function">璁惧</param>
-        /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
-        /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param> 
-        public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, CommonMethod.Comerom comerom, Action action)
-        {
-            this.device = function;
-            this.btnDeviceName = btnDeviceName;
-            this.btnRoomName = btnRoomName;
-            this.comerom = comerom;
-            this.action = action;
-
-        }
-
-        public void Show()
-        {
-            //鍒濆鍖朥I
-            this.InitUI();
-            //鍒濆鍖栦簨浠�
-            this.EventListener();
-            //璇诲彇鏁版嵁
-            this.ReadData();
-
-        }
-
-
-        /// <summary>
-        /// 鍒濆鍖栫晫闈�
-        /// </summary>
-        private void InitUI()
-        {
-            #region   ---鐣岄潰甯冨眬---
-            this.BackgroundColor = MusicColor.ViewColor;
-            this.topView = new TopView();
-            this.topView.setBtn.Visible = true;
-            this.topView.topNameBtn.TextID = StringId.shipinmensuo;
-            this.AddChidren(topView.TopFLayoutView());
-            var middleFl = new FrameLayout
-            {
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-            };
-            this.AddChidren(middleFl);
-
-            var whiteFl = new FrameLayout
-            {
-                Y = Application.GetRealHeight(24),
-                X = Application.GetRealWidth(24),
-                Height = Application.GetRealHeight(526),
-                Width = Application.GetRealWidth(327),
-                BackgroundImagePath = "MusicIcon/playBj.png",
-                Name = "fl",
-            };
-            middleFl.AddChidren(whiteFl);
-
-            btnCollectIcon = new Button
-            {
-                X = Application.GetRealWidth(264),
-                Y = Application.GetRealHeight(14),
-                Width = Application.GetRealWidth(40),
-                Height = Application.GetRealWidth(40),
-                UnSelectedImagePath = "MusicIcon/collect.png",
-                SelectedImagePath = "MusicIcon/collectSelected.png",
-                IsSelected = this.device.collect,
-                Name = "collect"
-            };
-            whiteFl.AddChidren(btnCollectIcon);
-
-            btnCurrDeviceName = new Button
-            {
-                TextSize = TextSize.Text24,
-                TextColor = MusicColor.Text18Color,
-                Width = Application.GetRealWidth(160),
-                Height = Application.GetRealHeight(33),
-                Y = Application.GetRealHeight(16),
-                X = Application.GetRealWidth(16),
-                Text = this.device.name,
-                TextAlignment = TextAlignment.CenterLeft,
-            };
-            whiteFl.AddChidren(btnCurrDeviceName);
-
-
-            btnCurrDeviceRoom = new Button
-            {
-                TextSize = TextSize.Text12,
-                TextColor = MusicColor.MusicNoTxetColor,
-                Width = Application.GetRealWidth(160),
-                Height = Application.GetRealHeight(17),
-                Y = btnCurrDeviceName.Bottom + Application.GetRealHeight(4),
-                X = Application.GetRealWidth(16),
-                Text = this.device.GetRoomListName(),
-                TextAlignment = TextAlignment.CenterLeft,
-            };
-            whiteFl.AddChidren(btnCurrDeviceRoom);
-
-            cellFrame = new FrameLayout
-            {
-                X = btnCurrDeviceRoom.Right + Application.GetRealWidth(20),
-                Y = btnCurrDeviceName.Bottom + Application.GetRealHeight(5),
-                Width = Application.GetRealWidth(30),
-                Height = Application.GetRealHeight(16),
-            };
-            whiteFl.AddChidren(cellFrame);
-
-            cellDiyArcSeekBar = new DiyArcSeekBar
-            {
-                X = Application.GetRealWidth(3),
-                Y = Application.GetRealHeight(3),
-                Width = cellFrame.Width + Application.GetRealWidth(-6),
-                Height = cellFrame.Height + Application.GetRealHeight(-6),
-                Progress = 60,
-                ProgressBarColor = MusicColor.MusicNoTxetColor,
-                MaxValue = 100,
-                MinValue = 0,
-
-                //IsCanMove = false,
-                //IsCanScrolled=false,
-            };
-            //cellFrame.AddChidren(cellDiyArcSeekBar);
-
-            btnCell = new Button
-            {
-                TextSize = TextSize.Text10,
-                TextColor = MusicColor.TextColor,
-                Text = "60" + "%",
-                TextAlignment = TextAlignment.Center,
-                UnSelectedImagePath = "FunctionIcon/DoorLock/Cell.png",
-            };
-            cellFrame.AddChidren(btnCell);
-
-
-#if __IOS__
-//btnCell.Padding = new Padding(0,0,0,0);
-            btnCell.Width += 5;
-            cellFrame.Width += 5;
-#else
-#endif
-
-
-            //闂ㄩ攣鐘舵��
-            btnDoorLockIcon = new Button
-            {
-                X = Application.GetRealWidth(65),
-                Y = Application.GetRealHeight(108),
-                Width = Application.GetRealWidth(198),
-                Height = Application.GetRealWidth(200),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/UnLocked.png",
-                SelectedImagePath = "FunctionIcon/DoorLock/UnLocking.png",
-            };
-            whiteFl.AddChidren(btnDoorLockIcon);
-
-            this.CalculatedPosition();//閲嶆柊璁$畻瀹藉害
-
-            btnDoorlockStatus = new Button()
-            {
-                Width = Application.GetRealWidth(200),
-                Height = Application.GetRealHeight(62),
-                Y = btnDoorLockIcon.Bottom,
-                TextAlignment = TextAlignment.Center,
-                Gravity = Gravity.CenterHorizontal,
-                TextID = StringId.DoorlockOpen,
-                TextColor = CSS_Color.WarningColor,
-                TextSize = 16,
-            };
-            whiteFl.AddChidren(btnDoorlockStatus);
-            
-            int heightY = btnDoorLockIcon.Bottom + Application.GetRealHeight(133);
-            //瀹炴椂瑙嗛
-            rtvFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
-            whiteFl.AddChidren(rtvFL);
-            rtvFL.Y = heightY;
-            rtvFL.X = Application.GetRealWidth(26);
-            rtvFL.AddImageView();
-            rtvFL.AddTextButtonView();
-            rtvFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/RTV.png";
-            rtvFL.GetTextButton().TextID = StringId.shishishipin;
-            
-            
-            //涓存椂瀵嗙爜
-            pswFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
-            whiteFl.AddChidren(pswFL);
-            pswFL.Y = heightY;
-            pswFL.X = rtvFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
-            pswFL.AddImageView();
-            pswFL.AddTextButtonView();
-            pswFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/OneOpenLock.png";
-            pswFL.GetTextButton().TextID = StringId.linshimima1;
-            if (device.omodel.Contains("CS-DL30F-V100"))
-            {
-                rtvFL.Visible = rtvFL.Enable = false;
-                pswFL.X = Application.GetRealWidth(26);
-            }
-
-            //鍘嗗彶璁板綍
-            recordFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
-            whiteFl.AddChidren(recordFL);
-            recordFL.Y = heightY;
-            recordFL.X = pswFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
-            recordFL.AddImageView();
-            recordFL.AddTextButtonView();
-            recordFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/HistoryList.png";
-            recordFL.GetTextButton().TextID = StringId.lishijilu;
-
-            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
-            {
-                //鐢ㄦ埛绠$悊
-                CustomFrameLayout userManagerView = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
-                whiteFl.AddChidren(userManagerView);
-                userManagerView.Y = heightY;
-                userManagerView.X = recordFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
-                userManagerView.AddImageView();
-                userManagerView.AddTextButtonView();
-                userManagerView.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockUserManager.png";
-                userManagerView.GetTextButton().TextID = StringId.UserManagement;
-
-                userManagerView.SetClickListener((fl, btnImage, btnText) =>
-                {
-                    var page = new VideoDoorlockUserListPage(device);
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
-                });
-            }
-            #endregion
-
-
-        }
-        /// <summary>
-        /// 娉ㄥ唽浜嬩欢
-        /// </summary>
-        private void EventListener()
-        {
-            //杩斿洖
-            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                this.RemoveFromParent();
-            };
-            //璁剧疆
-            this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                CommonMethod.Current.MainThread(() =>
-                {
-                    //璋冪敤绉�缁曠殑鐣岄潰
-                    var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
-                     {
-                         if (this.btnDeviceName == null || this.btnRoomName == null || this.device == null)
-                         {
-                             return;
-                         }
-                         ////鍒锋柊鏄剧ず
-                         this.btnDeviceName.Text = this.device.name;
-                         this.btnRoomName.Text = this.device.GetRoomListName();
-                         this.btnCurrDeviceName.Text = this.device.name;
-                         this.btnCurrDeviceRoom.Text = this.device.GetRoomListName();
-                         this.CalculatedPosition();//閲嶆柊璁$畻瀹藉害
-
-                     });
-                    infoView.actionDel += () =>
-                      {
-                          //瑙g粦璁惧鍚�
-                          this.RemoveFromParent();
-                          this.action?.Invoke();
-
-                      };
-                    MainPage.BasePageView.AddChidren(infoView);
-                    infoView.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                });
-            };
-            //鏀惰棌
-            this.btnCollectIcon.MouseUpEventHandler += (sender, e) =>
-            {
-                btnCollectIcon.IsSelected = this.device.collect = !btnCollectIcon.IsSelected;
-                this.device.CollectFunction();
-            };
-
-            int delayTimeMaxValue = 0;//
-            var startTime = DateTime.Now;
-            //瀹炴椂瑙嗛
-            this.rtvFL.SetClickListener((fl, btnStateImage, btnStateText) =>
-            {
-                bool isDeyayClick = false;
-                var clickTime = DateTime.Now;
-                if ((clickTime - startTime).TotalMilliseconds > delayTimeMaxValue)
-                {
-                    delayTimeMaxValue = 2*1000;
-                    startTime = clickTime;
-                    isDeyayClick = true;
-                }
-                if (!isDeyayClick)
-                {
-                    return;
-                }
-                CommonMethod.Current.SkipRTVActivity(this.device.sid, this.device.deviceId, this.device.spk, false);
-
-            });
-            var lastClickTime = DateTime.MinValue;
-            //涓存椂瀵嗙爜
-            this.pswFL.SetClickListener((fl, btnStateImage, btnStateText) =>
-            {
-                if (lastClickTime.AddSeconds(3) > DateTime.Now)
-                {
-                    return;
-                }
-                lastClickTime = DateTime.Now;
-                CommonMethod.Current.SkipPSWActivity(this.device.deviceId);
-            });
-
-            //鍘嗗彶璁板綍
-            this.recordFL.SetClickListener((fl, btnStateImage, btnStateText) =>
-            {
-                if (lastClickTime.AddSeconds(3) > DateTime.Now)
-                {
-                    return;
-                }
-                lastClickTime = DateTime.Now;
-
-                //VideoDoorlockHistoryPage historyPage = new VideoDoorlockHistoryPage(device);
-                //MainPage.BasePageView.AddChidren(historyPage);
-                //historyPage.LoadPage();
-                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                var waitPage = new Loading();
-                this.AddChidren(waitPage);
-                waitPage.Start("");
-                new System.Threading.Thread(() =>
-                {
-                    try
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
-                        });
-                    }catch(Exception ex)
-                    {
-
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() => {
-                            waitPage.Hide();
-                        });
-                    }
-                })
-                { IsBackground = true }.Start();
-            });
-
-
-        }
-        /// <summary>
-        /// 鍒濆鏁版嵁
-        /// </summary>
-        private void ReadData()
-        {
-            CommonMethod.Current.Loading.Start();
-            CommonMethod.Current.SunThread(() =>
-            {
-                try
-                {
-                    var videoDoorLockInfo = VideDoorLockSend.Current.GetVideoDoorLockState(this.device);
-                    var cellInfo = VideDoorLockSend.Current.GetCellValue(this.device);
-                    CommonMethod.Current.MainThread(() =>
-                    {
-                        //this.cellDiyArcSeekBar.Progress = i;
-                        //鏇存柊鐢甸噺鍊�
-                        this.btnCell.Text = cellInfo.remain + "%";
-                        if(videoDoorLockInfo.doorStatus == "open")
-                        {
-                            this.btnDoorLockIcon.IsSelected = true;
-                            this.btnDoorlockStatus.TextID = StringId.DoorlockOpen;
-                            this.btnDoorlockStatus.TextColor = CSS_Color.WarningColor;
-                        }
-                        else
-                        {
-                            this.btnDoorLockIcon.IsSelected = false;
-                            this.btnDoorlockStatus.TextID = StringId.DoorlockClose;
-                            this.btnDoorlockStatus.TextColor = 0xFF000000;
-                        }
-                    });
-                }
-                catch { }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        CommonMethod.Current.Loading.Hide();
-                    });
-                }
-            });
-        }
-
-
-
-        /// <summary>
-        /// 閲嶆柊璁$畻瀹藉害(璁惧鍚嶇О,鎴块棿鎺т欢)
-        /// </summary>
-        private void CalculatedPosition()
-        {
-            this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth();
-            this.btnCurrDeviceName.Width += 10; 
-            if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X)
-            {
-                //閲嶆柊璁$畻瀹藉害
-                this.btnCurrDeviceName.Width = this.btnCollectIcon.X + Application.GetRealWidth(-10);
-            }
-            this.btnCurrDeviceRoom.Width = this.btnCurrDeviceRoom.GetTextWidth();
-            this.btnCurrDeviceRoom.Width += 10;
-            if (this.btnCurrDeviceRoom.GetTextWidth() > this.btnCollectIcon.X)
-            {
-                //閲嶆柊璁$畻瀹藉害
-                this.btnCurrDeviceRoom.Width = this.btnCollectIcon.X + Application.GetRealWidth(-20 - 10);
-            }
-            this.cellFrame.X = this.btnCurrDeviceRoom.Right + Application.GetRealWidth(20);
-        }
-
-        /// <summary>
-        /// 鏇存柊鐘舵��
-        /// </summary>
-        public void UpdateState(PushMessageType pushMessageType)
-        {
-            CommonMethod.Current.MainThread(() =>
-            {
-                if (pushMessageType == PushMessageType.Alarm)
-                {
-                    //闂ㄩ攣鐢垫睜鍊�
-                    if (this.btnCell != null)
-                    {
-                        //videoDoorLockPage.btnCell.Text = "";
-                    }
-                }
-                else
-                {
-                    if (this.btnDoorLockIcon != null && !this.btnDoorLockIcon.IsSelected)
-                    {
-                        this.btnDoorLockIcon.IsSelected = false;
-                    }
-                }
-
-            });
-
-        }
-
-    }
-    /// <summary>
-    /// 鑷繁寮勪竴涓狥rameLayout
-    /// </summary>
-    class CustomFrameLayout : FrameLayout
-    {
-        public const int widthFrameLayout = 48;
-        public const int heightFrameLayout = 53;
-        public const int yFrameLayout = 442;
-        public const int xFrameLayout = 41;
-        public const int interval = 30;//琛屼腑鐨勫垪闂撮殧鍊�
-
-        public CustomFrameLayout(int width, int height, int x = 0, int y = 0)
-        {
-            this.Width = Application.GetRealWidth(width);
-            this.Height = Application.GetRealHeight(height);
-            this.X = Application.GetRealWidth(x);
-            this.Y = Application.GetRealHeight(y);
-
-        }
-        Button btnStateImage = new Button
-        {
-            Width = Application.GetRealWidth(32),
-            Height = Application.GetRealWidth(32),
-            Gravity = Gravity.TopCenter,
-            Name = "btnStateImage",
-
-        };
-        Button btnStateText = new Button
-        {
-            Y = Application.GetRealHeight(4),
-            Width = Application.GetRealWidth(100),
-            Height = Application.GetRealWidth(20),
-            TextID = StringId.dangqianmenweiguan,
-            TextSize = TextSize.Text12,
-            TextColor = MusicColor.TextCancelColor,
-            TextAlignment = TextAlignment.Center,
-            Gravity = Gravity.CenterHorizontal,
-            Name = "btnStateText",
-            IsMoreLines = true,
-        };
-        public void AddImageView()
-        {
-            this.AddChidren(btnStateImage);
-
-        }
-        public void AddTextButtonView()
-        {
-            btnStateText.Y += btnStateImage.Bottom;
-            this.AddChidren(btnStateText);
-        }
-        public Button GetImageButton()
-        {
-            //if (!this.AddWithout(this.btnStateImage))
-            //{
-            //    this.AddImageView();
-            //}
-            return this.btnStateImage;
-        }
-        public Button GetTextButton()
-        {
-            //if (!this.AddWithout(this.btnStateText))
-            //{
-            //    this.AddTextButtonView();
-            //}
-            return this.btnStateText;
-        }
-
-        /// <summary>
-        /// 浜嬩欢鐩戝惉鏂规硶
-        /// </summary>
-        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;绗簩涓槸鍥炬爣瀵硅薄;绗笁涓槸鐘舵�佸璞�</param>
-        /// <param name="button1">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
-        /// <param name="button2">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
-        public void SetClickListener(Action<FrameLayout, Button, Button> action)
-        {
-            EventHandler<MouseEventArgs> click = (sender, e) =>
-                    {
-                        action?.Invoke(this, btnStateImage, btnStateText);
-                    };
-            this.MouseUpEventHandler += click;
-            btnStateImage.MouseUpEventHandler += click;
-            btnStateText.MouseUpEventHandler += click;
-
-        }
-
-
-
-        /// <summary>
-        /// 鍦ㄧ埗甯冨眬鏌ユ壘瀛愭帶浠舵槸鍚﹀瓨鍦�
-        /// </summary>
-        /// <param name="btn">鏌ユ壘瀵硅薄</param>
-        /// <returns>瀛樺湪涓簍rue,鍚﹀垯涓篺alse</returns>
-        private bool AddWithout(View btn)
-        {
-
-            if (this.ChildrenCount <= 0 || btn == null)
-            {
-                return false;
-            }
-            for (int i = 0; i < this.ChildrenCount; i++)
-            {
-                View view = this.GetChildren(i);
-                if (view == null)
-                {
-                    continue;
-                }
-                if (view is Button)
-                {
-                    if (view.Name == btn.Name)
-                    {
-                        return true;
-                    }
-                }
-
-            }
-            return false;
-
-        }
-
-
-
-
-    }
-
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs
deleted file mode 100644
index 6c0595b..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs
+++ /dev/null
@@ -1,723 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Common;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class VideoDoorlockAudioSetupPage : FrameLayout
-    {
-        FrameLayout bodyView;
-
-        Function device;
-        /// <summary>
-        /// 闂ㄩ攣绯荤粺闊抽噺
-        /// </summary>
-        DoorLockSystemSound doorLockSystemSound;
-        /// <summary>
-        /// 闂ㄩ搩闊抽噺
-        /// </summary>
-        int doorbellVol = 0;
-        public VideoDoorlockAudioSetupPage(Function function)
-        {
-            doorLockSystemSound = new DoorLockSystemSound();
-            device = function;
-            bodyView = this;
-        }
-
-        public void LoadPage()
-        {
-            new TopViewDiv(bodyView, Language.StringByID(StringId.AudioSetup)).LoadTopView();
-            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
-
-            #region 闂ㄩ攣绯荤粺闊抽噺
-            var doorlockSystemVolumeView = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(50),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-            };
-            bodyView.AddChidren(doorlockSystemVolumeView);
-
-            var btnDoorlockSystemVolumeRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/Right.png",
-            };
-            doorlockSystemVolumeView.AddChidren(btnDoorlockSystemVolumeRight);
-
-            var btnDoorlockSystemVolumeStateText = new Button()
-            {
-                X = Application.GetRealWidth(100),
-                Width = Application.GetRealWidth(223),
-                TextAlignment = TextAlignment.CenterRight,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-            };
-            doorlockSystemVolumeView.AddChidren(btnDoorlockSystemVolumeStateText);
-
-            var btnDoorlockSystemVolumeText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextID = StringId.DoorlockSystemVolume,
-            };
-            doorlockSystemVolumeView.AddChidren(btnDoorlockSystemVolumeText);
-
-            btnDoorlockSystemVolumeText.MouseUpEventHandler = (sender, e) =>
-            {
-                LoadEditDialog(StringId.DoorlockSystemVolume, btnDoorlockSystemVolumeStateText,true);
-            };
-            #endregion
-
-            #region 闂ㄩ搩闊抽噺
-            var viewDoorbellVolume = new FrameLayout()
-            {
-                Y = doorlockSystemVolumeView.Bottom,
-                Height = Application.GetRealHeight(50),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-            };
-            bodyView.AddChidren(viewDoorbellVolume);
-            viewDoorbellVolume.AddChidren(new Button
-            {
-                Height = 1,
-                BackgroundColor = CSS_Color.DividingLineColor,
-            });
-
-            var btnDoorbellVolumeRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/Right.png",
-            };
-            viewDoorbellVolume.AddChidren(btnDoorbellVolumeRight);
-
-            var btnDoorbellVolumeStateText = new Button()
-            {
-                X = Application.GetRealWidth(100),
-                Width = Application.GetRealWidth(223),
-                TextAlignment = TextAlignment.CenterRight,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-            };
-            viewDoorbellVolume.AddChidren(btnDoorbellVolumeStateText);
-
-            var btnDoorbellVolumeText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextID = StringId.DoorbellVolume,
-            };
-            viewDoorbellVolume.AddChidren(btnDoorbellVolumeText);
-
-            btnDoorbellVolumeText.MouseUpEventHandler = (sender, e) =>
-            {
-                LoadEditDialog(StringId.DoorbellVolume, btnDoorbellVolumeStateText,false);
-
-            };
-            #endregion
-
-
-
-
-
-
-
-
-            var waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Start("");
-
-            new System.Threading.Thread(() => {
-                try
-                {
-                    var pack = ApiUtlis.Ins.HttpRequest.GetDoorLockSystemSound(device.deviceId);
-                    if (pack != null && pack.Code == StateCode.SUCCESS)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            //鏇存柊鐣岄潰
-                            doorLockSystemSound = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockSystemSound>(pack.Data.ToString());
-                            if(doorLockSystemSound != null)
-                            {
-                                switch (doorLockSystemSound.sound)
-                                {
-                                    case 0:
-                                        btnDoorlockSystemVolumeStateText.TextID = StringId.Mute;
-                                        break;
-                                    case 1:
-                                        btnDoorlockSystemVolumeStateText.TextID = StringId.Low;
-                                        break;
-                                    case 2:
-                                        btnDoorlockSystemVolumeStateText.TextID = StringId.Moderate;
-                                        break;
-                                    case 3:
-                                        btnDoorlockSystemVolumeStateText.TextID = StringId.High;
-                                        break;
-                                }
-                            }
-                        });
-                    }
-                    else
-                    {
-                        //澶辫触鎻愮ず
-                        Application.RunOnMainThread(() =>
-                        {
-
-                            if (string.IsNullOrEmpty(pack.message))
-                            {
-                                pack.message = Language.StringByID(StringId.OperationFailed);
-                            }
-                            {
-                                var tip = new Tip()
-                                {
-                                    MaxWidth = Application.GetRealWidth(300),
-                                    Text = $"{pack.message}({pack.Code})",
-                                    CloseTime = 3,
-                                    Direction = AMPopTipDirection.None
-                                };
-                                tip.Show(MainPage.BaseView);
-                            }
-                        });
-                    }
-
-
-                    pack = ApiUtlis.Ins.HttpRequest.GetDoorBellTone(device.deviceId);
-                    if (pack != null && pack.Code == StateCode.SUCCESS)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            //鏇存柊鐣岄潰
-                            var doorbellTone = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorBellTone>(pack.Data.ToString());
-                            if (doorbellTone != null)
-                            {
-                                if (doorbellTone.volume == 0)
-                                {
-                                    doorbellVol = 0;
-                                    btnDoorbellVolumeStateText.TextID = StringId.Mute;
-                                }
-                                else if (doorbellTone.volume > 0 && doorbellTone.volume < 35)
-                                {
-                                    doorbellVol = 1;
-                                    btnDoorbellVolumeStateText.TextID = StringId.Low;
-                                }
-                                else if (doorbellTone.volume > 35 && doorbellTone.volume < 70)
-                                {
-                                    doorbellVol = 2;
-                                    btnDoorbellVolumeStateText.TextID = StringId.Moderate;
-                                }
-                                else if (doorbellTone.volume > 70)
-                                {
-                                    doorbellVol = 3;
-                                    btnDoorbellVolumeStateText.TextID = StringId.High;
-                                }
-                            }
-                        });
-                    }
-                    else
-                    {
-                        //澶辫触鎻愮ず
-                        Application.RunOnMainThread(() =>
-                        {
-                            if (string.IsNullOrEmpty(pack.message))
-                            {
-                                pack.message = Language.StringByID(StringId.OperationFailed);
-                            }
-                            {
-                                var tip = new Tip()
-                                {
-                                    MaxWidth = Application.GetRealWidth(300),
-                                    Text = $"{pack.message}({pack.Code})",
-                                    CloseTime = 3,
-                                    Direction = AMPopTipDirection.None
-                                };
-                                tip.Show(MainPage.BaseView);
-                            }
-                        });
-                    }
-
-
-                }
-                catch (Exception ex)
-                {
-                    MainPage.Log($"UnlockSettingPage error : {ex.Message}");
-                }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        waitPage.Hide();
-                    });
-                }
-
-            })
-            { IsBackground = true }.Start();
-
-
-
-        }
-
-
-
-        /// <summary>
-        /// 鍔犺浇鍔熻兘灞炴�ф暟鎹�夋嫨寮圭獥
-        /// </summary>
-        void LoadEditDialog(int titleId, Button btn,bool isDoorlockSystemVolume)
-        {
-            Button lastButton = new Button();
-            
-            var lastText = "";
-            Dialog dialog = new Dialog();
-
-            var pView = new FrameLayout()
-            {
-                BackgroundColor = CSS_Color.DialogTransparentColor1,
-            };
-            dialog.AddChidren(pView);
-
-            var optionBaseView = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(579 - 50 * 4),
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(50 * 4 + 50),
-                AnimateSpeed = 0.3f,
-                Animate = Animate.DownToUp,
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-                Radius = (uint)Application.GetRealWidth(12),
-            };
-            pView.AddChidren(optionBaseView);
-
-            var topView = new FrameLayout()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(50),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-                Radius = (uint)Application.GetRealWidth(12),
-            };
-            optionBaseView.AddChidren(topView);
-
-            var btnTitle = new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                TextAlignment = TextAlignment.Center,
-                Width = Application.GetRealWidth(150),
-                TextID = titleId,
-                IsBold = true,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-            };
-            topView.AddChidren(btnTitle);
-
-            var btnCancel = new Button()
-            {
-                X = Application.GetRealWidth(21),
-                Width = Application.GetRealWidth(100),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.Cancel,
-            };
-            topView.AddChidren(btnCancel);
-
-            var btnConfrim = new Button()
-            {
-                X = Application.GetRealWidth(200),
-                Width = Application.GetRealWidth(120),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.Complete,
-            };
-            topView.AddChidren(btnConfrim);
-            int index = 1;
-            var statusList = new List<string>
-            {
-                Language.StringByID(StringId.High),
-                Language.StringByID(StringId.Moderate),
-                Language.StringByID(StringId.Low),
-                Language.StringByID(StringId.Mute),
-            };
-
-            foreach (var m in statusList)
-            {
-                var row = new FrameLayout()
-                {
-                    Y = Application.GetRealHeight(50 * index),
-                    Height = Application.GetRealHeight(50),
-                };
-                optionBaseView.AddChidren(row);
-                if (statusList.Count > index)
-                {
-                    optionBaseView.AddChidren(new Button()
-                    {
-                        Gravity = Gravity.CenterHorizontal,
-                        Y = row.Bottom,
-                        Width = Application.GetRealWidth(343),
-                        BackgroundColor = CSS_Color.DividingLineColor,
-                        Height = 1,
-                    });
-                }
-
-                var btnChoose = new Button()
-                {
-                    X = Application.GetRealWidth(303),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetMinRealAverage(28),
-                    Height = Application.GetMinRealAverage(28),
-                    UnSelectedImagePath = "Public/ChooseIcon.png",
-                    SelectedImagePath = "Public/ChooseOnIcon.png",
-                    Tag = index - 1,
-                };
-                row.AddChidren(btnChoose);
-                if (isDoorlockSystemVolume) {//璁剧疆闂ㄩ攣绯荤粺闊抽噺
-                    switch (doorLockSystemSound.sound)
-                    {
-                        case 0:
-                            if (index == 3 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                        case 1:
-                            if (index == 2 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                        case 2:
-                            if (index == 1 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                        case 3:
-                            if (index == 0 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                    }
-                }
-                else//璁剧疆闂ㄩ搩闊抽噺
-                {
-                    switch (doorbellVol)
-                    {
-                        case 0:
-                            if (index == 3 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                        case 1:
-                            if (index == 2 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                        case 2:
-                            if (index == 1 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                        case 3:
-                            if (index == 0 + 1)
-                            {
-                                lastButton = btnChoose;
-                                btnChoose.IsSelected = true;
-                            }
-                            break;
-                    }
-
-                }
-                var btnPropertyTitle = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    Text = m
-                };
-                row.AddChidren(btnPropertyTitle);
-
-                btnPropertyTitle.MouseUpEventHandler = (sender, e) => {
-                    if (btnChoose.IsSelected)
-                    {
-                        return;
-                    }
-                    btnChoose.IsSelected = true;
-                    if (lastButton != null)
-                    {
-                        lastButton.IsSelected = false;
-                    }
-                    lastButton = btnChoose;
-                    lastText = btnPropertyTitle.Text;
-                };
-                index++;
-            }
-
-
-
-
-            dialog.Show();
-
-            pView.MouseUpEventHandler = (sender, e) => {
-                dialog.Close();
-            };
-
-            btnCancel.MouseUpEventHandler = (sender, e) => {
-                dialog.Close();
-            };
-            btnConfrim.MouseUpEventHandler = (sender, e) => {
-                dialog.Close();
-                var lastData = lastButton.Tag.ToString();
-
-                if (isDoorlockSystemVolume)
-                {
-
-                    var waitPage = new Loading();
-                    bodyView.AddChidren(waitPage);
-                    waitPage.Start("");
-                    new System.Threading.Thread(() => {
-                        try
-                        {
-                            int sound = 0;
-                            /// 0-闈欓煶 1-浣庨煶 2-涓煶 3-楂橀煶 4-鑷姩
-
-                            switch (lastData)
-                            {
-                                case "0":
-                                    sound = 3;
-                                    break;
-                                case "1":
-                                    sound = 2;
-                                    break;
-                                case "2":
-                                    sound = 1;
-                                    break;
-                                case "3":
-                                    sound = 0;
-                                    break;
-                            }
-
-
-                            var pack = ApiUtlis.Ins.HttpRequest.SetDoorLockSystemSound(device.deviceId,sound);
-                            if (pack != null && pack.Code == StateCode.SUCCESS)
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    //鏇存柊鐣岄潰
-                                    switch (sound)
-                                    {
-                                        case 0:
-                                            doorLockSystemSound.sound = 0;
-                                            btn.TextID = StringId.Mute;
-                                            break;
-                                        case 1:
-                                            doorLockSystemSound.sound = 1;
-                                            btn.TextID = StringId.Low;
-                                            break;
-                                        case 2:
-                                            doorLockSystemSound.sound = 2;
-                                            btn.TextID = StringId.Moderate;
-                                            break;
-                                        case 3:
-                                            doorLockSystemSound.sound = 3;
-                                            btn.TextID = StringId.High;
-                                            break;
-                                    }
-                                });
-                            }
-                            else
-                            {
-                                //澶辫触鎻愮ず
-                                Application.RunOnMainThread(() =>
-                                {
-                                    if (string.IsNullOrEmpty(pack.message))
-                                    {
-                                        pack.message = Language.StringByID(StringId.OperationFailed);
-                                    }
-                                    {
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = $"{pack.message}({pack.Code})",
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    }
-                                });
-                            }
-
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"{this.GetType()} error 4: {ex.Message}");
-                        }
-                        finally
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                waitPage.Hide();
-                            });
-                        }
-
-                    })
-                    { IsBackground = true }.Start();
-
-
-
-                }
-                else
-                {
-
-                    var waitPage = new Loading();
-                    bodyView.AddChidren(waitPage);
-                    waitPage.Start("");
-
-                    new System.Threading.Thread(() => {
-                        try
-                        {
-                            int Vol = 0;
-                            switch (lastData)
-                            {
-                                case "0":
-                                    Vol = 100;
-                                    break;
-                                case "1":
-                                    Vol = 70;
-                                    break;
-                                case "2":
-                                    Vol = 30;
-                                    break;
-                                case "3":
-                                    Vol = 0;
-                                    break;
-                            }
-
-                            var pack = ApiUtlis.Ins.HttpRequest.SetDoorBellTone(device.deviceId,Vol);
-                            if (pack != null && pack.Code == StateCode.SUCCESS)
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    //鏇存柊鐣岄潰
-                                    switch (lastData)
-                                    {
-                                        case "0":
-                                            doorbellVol = 3;
-                                            btn.TextID = StringId.High;
-                                            break;
-                                        case "1":
-                                            doorbellVol = 2;
-                                            btn.TextID = StringId.Moderate;
-                                            break;
-                                        case "2":
-                                            doorbellVol = 1;
-                                            btn.TextID = StringId.Low;
-                                            break;
-                                        case "3":
-                                            doorbellVol = 0;
-                                            btn.TextID = StringId.Mute;
-                                            break;
-                                    }
-                                });
-                            }
-                            else
-                            {
-                                //澶辫触鎻愮ず
-                                Application.RunOnMainThread(() =>
-                                {
-                                    if (string.IsNullOrEmpty(pack.message))
-                                    {
-                                        pack.message = Language.StringByID(StringId.OperationFailed);
-                                    }
-                                    {
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = $"{pack.message}({pack.Code})",
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    }
-                                });
-                            }
-
-
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"{this.GetType()} error 5 : {ex.Message}");
-                        }
-                        finally
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                waitPage.Hide();
-                            });
-                        }
-
-                    })
-                    { IsBackground = true }.Start();
-
-
-
-                }
-            };
-
-        }
-
-
-
-
-
-    }
-
-    /// <summary>
-    /// 闂ㄩ攣绯荤粺澹伴煶
-    /// </summary>
-    public class DoorLockSystemSound
-    {
-        /// <summary>
-        /// 澹伴煶
-        /// 0-闈欓煶 1-浣庨煶 2-涓煶 3-楂橀煶 4-鑷姩
-        /// </summary>
-        public int sound = 0;
-    }
-    /// <summary>
-    /// 闂ㄩ搩鎻愮ず闊抽噺
-    /// </summary>
-    public class DoorBellTone
-    {
-        /// <summary>
-        /// 闊抽噺 鑼冨洿0-100
-        /// </summary>
-        public int volume = 0;
-    }
-
-
-
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockBatteryManagementPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockBatteryManagementPage.cs
deleted file mode 100644
index 7ce49b4..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockBatteryManagementPage.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class VideoDoorlockBatteryManagementPage : FrameLayout
-    {
-        FrameLayout bodyView;
-
-
-        public VideoDoorlockBatteryManagementPage()
-        {
-            bodyView = this;
-
-        }
-
-        public void LoadPage()
-        {
-            new TopViewDiv(bodyView, Language.StringByID(StringId.BatteryManagement)).LoadTopView();
-            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
-
-            var view1 = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(276),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-                BackgroundImagePath = "FunctionIcon/DoorLock/VideoDoorlockBatteryManagementBg.png"//VideoDoorlockBatteryManagementBg
-            };
-            bodyView.AddChidren(view1);
-
-
-            var btnTitle1 = new Button()
-            {
-                Width = Application.GetRealWidth(200),
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(16),
-                IsMoreLines = true,
-                TextAlignment = TextAlignment.TopLeft,
-                TextSize = CSS_FontSize.HeadlineFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "闂ㄩ攣鐢垫簮",
-            };
-            view1.AddChidren(btnTitle1);
-
-            var btnMsg1 = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(57),
-                Width = Application.GetRealWidth(213),
-                Height = Application.GetRealHeight(200),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                IsMoreLines = true,
-                Text = "鎵撳紑瀹ゅ唴闈㈡澘鐢垫睜鐩栵紝鍙栧嚭閿傜數姹犺繘琛屽厖鐢点�俓r\n璇蜂娇鐢� 5V2A 閫傞厤鍣ㄥ閿傜數姹犺繘琛屽厖鐢点��"
-            };
-            view1.AddChidren(btnMsg1);
-
-            var view2 = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(8) + view1.Bottom,
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-                Height = Application.GetRealHeight(170)
-            };
-            bodyView.AddChidren(view2);
-
-            var btnTitle2 = new Button()
-            {
-                Width = Application.GetRealWidth(200),
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(16),
-                IsMoreLines = true,
-                TextAlignment = TextAlignment.TopLeft,
-                TextSize = CSS_FontSize.HeadlineFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "浣庣數閲忚鏄�",
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            view2.AddChidren(btnTitle2);
-
-            var btnMsg2 = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(57),
-                Width = Application.GetRealWidth(213),
-                Height = Application.GetRealHeight(110),
-                TextAlignment = TextAlignment.TopLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                IsMoreLines = true,
-                Text = "璁惧鐢甸噺浣庢椂灏嗚嚜鍔ㄥ叧闂娴嬪敜閱掑姛鑳斤紝浜鸿劯璇嗗埆寮�閿佷负鎵嬪姩瑙﹀彂銆俓r\n 褰撶數閲忎綆浜庢瀬闄愬�兼椂锛屼负淇濊瘉搴旀�ュ紑閿侊紝璁惧灏嗚嚜鍔ㄧ绾垮苟浠呮敮鎸佸紑閿佸姛鑳姐��"
-            };
-            view2.AddChidren(btnMsg2);
-
-            if (Language.CurrentLanguage != "Chinese")
-            {
-                btnTitle1.Text = "Door lock power supply";
-                btnMsg1.Text = "Open the indoor panel battery cover and remove the lithium battery for charging.\r\n" +
-                    "Please use a 5V2A adapter to charge the lithium battery.";
-                btnTitle2.Text = "Low battery description";
-                btnMsg2.Text = "When the device's battery is low, the detection and wake-up function will be automatically turned off, and the facial recognition unlock will be manually triggered.\r\n" +
-                    "When the battery level drops below the limit value, to ensure emergency unlocking, the device will automatically go offline and only support unlocking function.";
-            }
-
-        }
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockHelpPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockHelpPage.cs
deleted file mode 100644
index 03cb26b..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockHelpPage.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class VideoDoorlockFaceUnlockHelpPage : FrameLayout
-    {
-        FrameLayout bodyView;
-
-
-        public VideoDoorlockFaceUnlockHelpPage()
-        {
-            bodyView = this;
-        }
-
-
-        public void LoadPage()
-        {
-
-            new TopViewDiv(bodyView, Language.StringByID(StringId.TriggerMode)).LoadTopView();
-            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
-
-            var contentView = new VerticalScrolViewLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(667 - 64),
-            };
-            bodyView.AddChidren(contentView);
-
-            //DoorlockHelpImage
-
-            var btnImage1 = new Button()
-            {
-                Height = Application.GetRealWidth(180),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockHelpImage1.png"
-            };
-            contentView.AddChidren(btnImage1);
-
-            var msgView1 = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(253),
-            };
-            contentView.AddChidren(msgView1);
-
-            var btnMsg1Title = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(49),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "褰曞叆鍓�"
-            };
-            msgView1.AddChidren(btnMsg1Title);
-
-            var btnMsg1Tip = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnMsg1Title.Bottom,
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(184),
-                TextAlignment = TextAlignment.CenterLeft,
-                IsMoreLines = true,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "璇峰埌闂ㄩ攣鏃侊紝鎸夐棬閿乻et閿紝浣跨敤涓荤敤鎴风櫥褰曡彍鍗曪紝閫夋嫨鈥滄坊鍔犵敤鎴�-娣诲姞浜鸿劯鈥�/鈥滅敤鎴风鐞�-鐢ㄦ埛缂栧彿-娣诲姞浜鸿劯鈥濄�備互涓嬫槸鍑犱釜闇�瑕佹敞鎰忕殑鐐癸細\r\n" +
-                        "\r\n1銆佷负浜嗕繚璇佸綍鍏ユ晥鏋滐紝璇峰湪鍏抽棬鐨勬儏鍐典笅褰曞叆浜鸿劯锛堝叧闂ㄥ墠璇风‘淇濇湁鍏朵粬寮�闂ㄦ柟寮忓彲杩涢棬锛夈�俓r\n" +
-                        "\r\n2銆佸綍鍏ユ椂璇烽湶鍑烘竻鏅扮殑闈㈤儴鐗瑰緛锛屼笉瑕佷僵鎴村附瀛愩�佸彛缃┿�俓r\n"
-            };
-            msgView1.AddChidren(btnMsg1Tip);
-
-            var btnImage2 = new Button()
-            {
-                Height = Application.GetRealWidth(132),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockHelpImage2.png"
-            };
-            contentView.AddChidren(btnImage2);
-
-            var msgView2 = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(129),
-            };
-            contentView.AddChidren(msgView2);
-
-            var btnMsg2Title = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(49),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "褰曞叆涓�"
-            };
-            msgView2.AddChidren(btnMsg2Title);
-
-            var btnMsg2Tip = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnMsg1Title.Bottom,
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(60),
-                TextAlignment = TextAlignment.CenterLeft,
-                IsMoreLines = true,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "1銆佽绔欏湪閿佹鍓嶆柟锛屽苟涓庨攣鍏蜂繚鎸佷竴鑷傝窛绂伙紙50cm宸﹀彸锛夎繘琛岄噰闆嗐�俓r\n",
-            };
-            msgView2.AddChidren(btnMsg2Tip);
-
-            var btnImage3 = new Button()
-            {
-                Height = Application.GetRealWidth(180),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockHelpImage3.png"
-            };
-            contentView.AddChidren(btnImage3);
-
-            var btnMsg3 = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(104),
-                TextAlignment = TextAlignment.CenterLeft,
-                IsMoreLines = true,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "2銆佸綍鍏ユ椂璇疯窡闅忚闊虫寚瀵煎井寰浆鍔ㄥご閮紝浠ョ珫鐩存垨姘村钩绾夸负杞达紝杞姩骞呭害璇锋帶鍒跺湪30搴︿互鍐呫�俓r\n"
-            };
-            contentView.AddChidren(btnMsg3);
-
-            var btnImage4 = new Button()
-            {
-                Height = Application.GetRealWidth(204),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockHelpImage4.png"
-            };
-            contentView.AddChidren(btnImage4);
-
-            if(Language.CurrentLanguage != "Chinese")
-            {
-                btnMsg1Title.Text = "Before entry";
-
-                btnMsg1Tip.Text = "Please go to the door lock, press the door lock set key, use the main user login menu, select 'Add User -Add Face'/'User Management -User ID - Add Face'. Here are a few points to note: \r\n"
-                                    + "\r\n1.To ensure the recording effect, please input your face while closing the door(please ensure that there are other door opening methods available before closing the door). \r\n"
-                                    + "\r\n2.Please show clear facial features when entering, and do not wear hats or masks.\r\n";
-
-                btnMsg2Title.Text = "Entering";
-
-                btnMsg2Tip.Text = "1. Please stand in front of the lock and maintain an arm's distance (approximately 50cm) from the lock for collection.\r\n";
-
-                btnMsg3.Text = "2. When entering, please follow the voice guidance to slightly rotate the head, using a vertical or horizontal line as the axis, and the rotation amplitude should be controlled within 30 degrees.\r\n";
-
-            }
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs
deleted file mode 100644
index c56f096..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs
+++ /dev/null
@@ -1,402 +0,0 @@
-锘縰sing System;
-using HDL_ON.Common;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    /// <summary>
-    /// 钀ょ煶瑙嗛闂ㄩ攣-浜鸿劯寮�閿佽Е鍙戞ā寮忛厤缃晫闈�
-    /// </summary>
-    public class VideoDoorlockFaceUnlockTriggerSettingPage :FrameLayout
-    {
-        FrameLayout bodyView;
-
-        Function device;
-        FaceUnlockSetupObj faceUnlockSetup;
-        Action<int> updataAction;
-        public VideoDoorlockFaceUnlockTriggerSettingPage(Function function,FaceUnlockSetupObj setupObj,Action<int> action)
-        {
-            updataAction = action;
-            bodyView = this;
-            device = function;
-            faceUnlockSetup = setupObj;
-        }
-
-        public void LoadPage()
-        {
-            new TopViewDiv(bodyView, Language.StringByID(StringId.TriggerMode)).LoadTopView();
-            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
-
-            var contentView = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(600),
-            };
-            bodyView.AddChidren(contentView);
-
-            #region 鑷姩瑙﹀彂
-            var autoView = new FrameLayout()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(164),
-                Height = Application.GetRealWidth(60),
-                Radius = (uint)Application.GetRealWidth(12),
-                BackgroundColor = faceUnlockSetup.mode == 0 ? CSS_Color.MainColor : CSS_Color.MainBackgroundColor,
-                BorderColor = CSS_Color.MainColor,
-                BorderWidth = 1,
-            };
-            contentView.AddChidren(autoView);
-
-            var btnAutoIcon = new Button()
-            {
-                X = Application.GetRealWidth(28),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(32),
-                Height = Application.GetRealWidth(32),
-                UnSelectedImagePath = faceUnlockSetup.mode == 0 ? "FunctionIcon/DoorLock/AutomaitcTriggerIcon_white.png" : "FunctionIcon/DoorLock/AutomaitcTriggerIcon_blue.png",
-            };
-            autoView.AddChidren(btnAutoIcon);
-
-            var btnAutoText = new Button
-            {
-                X = btnAutoIcon.Right + Application.GetRealWidth(4),
-                Width = Application.GetRealWidth(90),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.HeadlineFontSize,
-                TextColor = faceUnlockSetup.mode == 1 ? CSS_Color.MainColor : CSS_Color.MainBackgroundColor,
-                TextID = StringId.AutomaticTriggering,
-            };
-            autoView.AddChidren(btnAutoText);
-            
-         
-            #endregion
-
-
-            #region 鎵嬪姩瑙﹀彂
-            var manualView = new FrameLayout()
-            {
-                X = Application.GetRealWidth(196),
-                Y = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(164),
-                Height = Application.GetRealWidth(60),
-                Radius = (uint)Application.GetRealWidth(12),
-                BackgroundColor = faceUnlockSetup.mode == 1 ? CSS_Color.MainColor : CSS_Color.MainBackgroundColor,
-                BorderColor = CSS_Color.MainColor,
-                BorderWidth = 1,
-            };
-            contentView.AddChidren(manualView);
-
-            var btnManualIcon = new Button()
-            {
-                X = Application.GetRealWidth(28),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(32),
-                Height = Application.GetRealWidth(32),
-                UnSelectedImagePath = faceUnlockSetup.mode == 1 ? "FunctionIcon/DoorLock/ManualTriggerIcon_white.png" : "FunctionIcon/DoorLock/ManualTriggerIcon_blue.png",
-            };
-            manualView.AddChidren(btnManualIcon);
-
-            var btnManualText = new Button
-            {
-                X = btnManualIcon.Right + Application.GetRealWidth(4),
-                Width = Application.GetRealWidth(90),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.HeadlineFontSize,
-                TextColor = faceUnlockSetup.mode == 0 ? CSS_Color.MainColor : CSS_Color.MainBackgroundColor,
-                TextID = StringId.ManualTriggering,
-            };
-            manualView.AddChidren(btnManualText);
-            #endregion
-
-
-            btnAutoText.MouseUpEventHandler = (sender, e) =>
-            {
-                if (faceUnlockSetup.mode == 0)
-                    return;
-
-                var waitPage = new Loading();
-                bodyView.AddChidren(waitPage);
-                waitPage.Start("");
-
-                new System.Threading.Thread(() =>
-                {
-                    try
-                    {
-                        var pack = ApiUtlis.Ins.HttpRequest.SetFaceUnlockCfg(device.deviceId, faceUnlockSetup.enabled, 0);
-                        if (pack != null && pack.Code == StateCode.SUCCESS)
-                        {
-                                faceUnlockSetup.mode = 0;
-                            Application.RunOnMainThread(() =>
-                            {
-                                //鏇存柊鐣岄潰
-                                autoView.BackgroundColor = CSS_Color.MainColor;
-                                btnAutoIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/AutomaitcTriggerIcon_white.png";
-                                btnAutoText.TextColor = CSS_Color.MainBackgroundColor;
-                                manualView.BackgroundColor = CSS_Color.MainBackgroundColor;
-                                btnManualIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/ManualTriggerIcon_blue.png";
-                                btnManualText.TextColor = CSS_Color.MainColor;
-                                automaitcTipView.Visible = true;
-                                manualTipView.Visible = false;
-                                updataAction?.Invoke(0);
-                            });
-                        }
-                        else
-                        {
-                            //澶辫触鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                {
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = $"{pack.message}({pack.Code})",
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                }
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MainPage.Log($"btnFaceUnlockSwitchIcon error : {ex.Message}");
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            waitPage.Hide();
-                        });
-                    }
-                })
-                { IsBackground = true }.Start();
-            };
-
-
-            btnManualText.MouseUpEventHandler = (sender, e) =>
-            {
-                if (faceUnlockSetup.mode == 1)
-                    return;
-
-                var waitPage = new Loading();
-                bodyView.AddChidren(waitPage);
-                waitPage.Start("");
-
-                new System.Threading.Thread(() =>
-                {
-                    try
-                    {
-                        var pack = ApiUtlis.Ins.HttpRequest.SetFaceUnlockCfg(device.deviceId, faceUnlockSetup.enabled, 1);
-                        if (pack != null && pack.Code == StateCode.SUCCESS)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                faceUnlockSetup.mode = 1;
-                                //鏇存柊鐣岄潰
-                                autoView.BackgroundColor = CSS_Color.MainBackgroundColor;
-                                btnAutoIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/AutomaitcTriggerIcon_blue.png";
-                                btnAutoText.TextColor = CSS_Color.MainColor;
-                                manualView.BackgroundColor = CSS_Color.MainColor;
-                                btnManualIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/ManualTriggerIcon_white.png";
-                                btnManualText.TextColor = CSS_Color.MainBackgroundColor;
-                                automaitcTipView.Visible = false;
-                                manualTipView.Visible = true;
-                                updataAction?.Invoke(1);
-
-                            });
-                        }
-                        else
-                        {
-                            //澶辫触鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-                                if (string.IsNullOrEmpty(pack.message))
-                                {
-                                    pack.message = Language.StringByID(StringId.OperationFailed);
-                                }
-                                {
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = $"{pack.message}({pack.Code})",
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                }
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MainPage.Log($"btnFaceUnlockSwitchIcon error : {ex.Message}");
-                    }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            waitPage.Hide();
-                        });
-                    }
-                })
-                { IsBackground = true }.Start();
-            };
-
-
-            loadAutomaitcTipView();
-            loadManualTipView();
-
-            if(faceUnlockSetup.mode == 0)
-            {
-                automaitcTipView.Visible = true;
-                manualTipView.Visible = false;
-            }
-            else
-            {
-                automaitcTipView.Visible = false;
-                manualTipView.Visible = true;
-            }
-
-        }
-        FrameLayout automaitcTipView;
-        FrameLayout manualTipView;
-
-        /// <summary>
-        /// 鍔犺浇鑷姩瑙﹀彂鏂瑰紡鎻愮ず
-        /// </summary>
-        void loadAutomaitcTipView()
-        {
-            automaitcTipView = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(128 + 64),
-                Height = Application.GetRealHeight(667 - 128 - 64),
-                BackgroundColor = CSS_Color.MainBackgroundColor
-            };
-            bodyView.AddChidren(automaitcTipView);
-
-            var btnAutomaitcImage = new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(200),
-                Height = Application.GetRealWidth(200),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/FaceUnlockImage.png",
-            };
-            automaitcTipView.AddChidren(btnAutomaitcImage);
-
-            var btnAutomaitcTip = new Button()
-            {
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(30),
-                Gravity = Gravity.CenterHorizontal,
-                Y = btnAutomaitcImage.Bottom,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextAlignment = TextAlignment.TopCenter,
-                IsMoreLines = true,
-                TextID = StringId.FaceUnlockTip
-            };
-            automaitcTipView.AddChidren(btnAutomaitcTip);
-
-            var btnAutomaitcNote = new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(400),
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(50),
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextColor = CSS_Color.PromptingColor1,
-                TextID = StringId.FaceUnlockNote,
-                IsMoreLines = true,
-            };
-            automaitcTipView.AddChidren(btnAutomaitcNote);
-
-        }
-        /// <summary>
-        /// 鍔犺浇鎵嬪姩瑙﹀彂鏂瑰紡鎻愮ず
-        /// </summary>
-        void loadManualTipView()
-        {
-            manualTipView = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(128 + 64),
-                Height = Application.GetRealHeight(667 - 128 - 64),
-                BackgroundColor = CSS_Color.MainBackgroundColor
-            };
-            bodyView.AddChidren(manualTipView);
-
-            var btnNumber1 = new Button()
-            {
-                X = Application.GetRealWidth(84),
-                //Y = Application.GetRealHeight()
-                Width = Application.GetRealWidth(24),
-                Height = Application.GetRealWidth(24),
-                Radius = (uint)Application.GetRealWidth(12),
-                BorderColor = CSS_Color.MainColor,
-                BorderWidth = 1,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.MainColor,
-                TextAlignment = TextAlignment.Center,
-                Text = "1",
-            };
-            manualTipView.AddChidren(btnNumber1);
-
-            var btnNumber2 = new Button()
-            {
-                X = Application.GetRealWidth(267),
-                //Y = Application.GetRealHeight()
-                Width = Application.GetRealWidth(24),
-                Height = Application.GetRealWidth(24),
-                Radius = (uint)Application.GetRealWidth(12),
-                BorderColor = CSS_Color.MainColor,
-                BorderWidth = 1,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.MainColor,
-                TextAlignment = TextAlignment.Center,
-                Text = "2",
-            };
-            manualTipView.AddChidren(btnNumber2);
-
-            var btnImage1 = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(31),
-                Width = Application.GetRealWidth(160),
-                Height = Application.GetRealWidth(160),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/TouchUnlcokImage.png",
-            };
-            manualTipView.AddChidren(btnImage1);
-
-            var btnAutomaitcImage = new Button()
-            {
-                X = btnImage1.Right + Application.GetRealWidth(24),
-                Y = Application.GetRealHeight(31),
-                Width = Application.GetRealWidth(160),
-                Height = Application.GetRealWidth(160),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/FaceUnlockImage.png",
-            };
-            manualTipView.AddChidren(btnAutomaitcImage);
-
-            var btnManualTip = new Button()
-            {
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(30),
-                Gravity = Gravity.CenterHorizontal,
-                Y = btnAutomaitcImage.Bottom,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextAlignment = TextAlignment.TopCenter,
-                IsMoreLines = true,
-                TextID = StringId.FaceManualUnlockTip
-            };
-            manualTipView.AddChidren(btnManualTip);
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockHistoryPage.cs
deleted file mode 100644
index 0b95ca5..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockHistoryPage.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-锘縰sing HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-using System;
-using System.Collections.Generic;
-
-namespace HDL_ON.UI
-{
-    public class VideoDoorlockHistoryPage : FrameLayout
-    {
-        private VideoDoorlockHistoryPage bodyView;
-        private VerticalScrolViewLayout histroyView;
-        private Function device;
-
-        public VideoDoorlockHistoryPage(Function function)
-        {
-            bodyView = this;
-            device = function;
-
-        }
-
-
-        public void LoadPage()
-        {
-            new TopViewDiv(bodyView, Language.StringByID(StringId.HistoryLog)).LoadTopView();
-
-            histroyView = new VerticalScrolViewLayout()
-            {
-                Height = Application.GetRealHeight(600),
-            };
-            bodyView.AddChidren(histroyView);
-
-            GetDoorlockHistory();
-        }
-
-
-        public void GetDoorlockHistory()
-        {
-
-            var waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Start(Language.StringByID(StringId.PleaseWait));
-            new System.Threading.Thread(() =>
-            {
-                try
-                {
-                    int pageCount = 1;
-                    var pm = new DAL.Server.HttpServerRequest();
-                    var pack = pm.GetArmSensorHistory(device.deviceId, "20", "1");
-                    if (pack == null)
-                    {
-                        return;
-                    }
-                    var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Cloud_ArmSensorHistory>(pack.Data.ToString());
-                    List<string> years = new List<string>();
-                    if (revData == null)
-                        return;
-                    Application.RunOnMainThread(() =>
-                    {
-                        var startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
-                        foreach (var data in revData.list)
-                        {
-                            var yearString = startTime.AddMilliseconds(Convert.ToDouble(data.createTime)).ToString("yyyy") + Language.StringByID(StringId.Years);
-                            var monthString = startTime.AddMilliseconds(Convert.ToDouble(data.createTime)).ToString("m");
-                            var timeString = startTime.AddMilliseconds(Convert.ToDouble(data.createTime)).ToString("HH:mm:ss");
-                            var dateString = monthString + " " + timeString;
-                            if (!years.Contains(yearString))
-                            {
-                                years.Add(yearString);
-                                Button btnYear = new Button()
-                                {
-                                    X = Application.GetRealWidth(16),
-                                    Height = Application.GetRealHeight(46),
-                                    Width = Application.GetRealWidth(220),
-                                    TextAlignment = TextAlignment.CenterLeft,
-                                    TextSize = CSS_FontSize.SubheadingFontSize,
-                                    TextColor = CSS_Color.FirstLevelTitleColor,
-                                    IsBold = true,
-                                    Text = yearString,
-                                };
-                                histroyView.AddChidren(btnYear);
-                            }
-                            var cell = new ArmSensorHistoryMsgCell()
-                            {
-                                Height = Application.GetRealHeight(50),
-                            };
-                            histroyView.AddChidren(cell);
-                            cell.InitControl(data.content, dateString);
-                        }
-                    });
-                }
-                catch
-                {
-
-                }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        waitPage.Hide();
-                    });
-                }
-            })
-            { IsBackground = true }.Start();
-        }
-
-
-
-    }
-
-    /// <summary>
-    /// 钀ょ煶瑙嗛闂ㄩ攣鍘嗗彶璁板綍鎺т欢琛�
-    /// </summary>
-    public class DoorlockHistoryRow : FrameLayout
-    {
-        public DoorlockHistoryRow bodyView;
-
-        public DoorlockHistoryRow()
-        {
-            bodyView = this;
-            bodyView.Height = Application.GetRealHeight(77);
-            bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
-        }
-
-        public void Init(string msg,string time,string imagePath)
-        {
-            FrameLayout contentView;
-            Button btnInfo;
-            Button btnTime;
-            Button btnImage;
-
-            contentView = new FrameLayout()
-            {
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(65),
-                Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(12),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-            };
-            bodyView.AddChidren(contentView);
-
-
-            btnInfo = new Button()
-            {
-                Y = Application.GetRealHeight(10),
-                Width = Application.GetRealWidth(250),
-                Height = Application.GetRealHeight(24),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = 14,
-                TextColor = CSS.CSS_Color.FirstLevelTitleColor,
-                Text = msg,
-            };
-            bodyView.AddChidren(btnInfo);
-
-            btnTime = new Button()
-            {
-                Y = btnInfo.Bottom,
-                Width = Application.GetRealWidth(250),
-                Height = Application.GetRealHeight(20),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = 12,
-                TextColor = CSS.CSS_Color.PromptingColor1,
-                Text = time,
-            };
-            bodyView.AddChidren(btnTime);
-
-            btnImage = new Button()
-            {
-                X = Application.GetRealWidth(287),
-                Gravity = Gravity.CenterRight,
-                Radius = (uint)Application.GetRealWidth(4),
-                Width = Application.GetRealWidth(72),
-                Height = Application.GetRealHeight(41),
-                UnSelectedImagePath = imagePath,
-            };
-            bodyView.AddChidren(btnImage);
-
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserListPage.cs
deleted file mode 100644
index 136a003..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserListPage.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Common;
-using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    public class VideoDoorlockUserListPage : FrameLayout
-    {
-        FrameLayout bodyView;
-        VerticalScrolViewLayout contentView;
-
-        Function device;
-
-        List<VideoDoorlockUser> userList;
-
-        public VideoDoorlockUserListPage(Function function)
-        {
-            bodyView = this;
-            device = function;
-            userList = new List<VideoDoorlockUser>();
-        }
-
-        public void LoadPage()
-        {
-            new TopViewDiv(bodyView, Language.StringByID(StringId.UserManagement)).LoadTopView();
-            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
-
-
-            contentView = new VerticalScrolViewLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(607 - 70),
-            };
-            bodyView.AddChidren(contentView);
-
-            var btnTip = new Button()
-            {
-                Y = Application.GetRealHeight(667 - 70),
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(60),
-                TextAlignment = TextAlignment.TopLeft,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextColor = CSS_Color.TextualColor,
-                TextID = StringId.VideoDoorlockManagerTip,
-                IsMoreLines = true,
-            };
-            bodyView.AddChidren(btnTip);
-
-            var waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Start("");
-
-            new System.Threading.Thread(() => {
-                try
-                {
-                    var pack = ApiUtlis.Ins.HttpRequest.GetDoorlockUserList(device.deviceId);
-                    if (pack != null)
-                    {
-                        if (pack.Code == StateCode.SUCCESS)
-                        {
-                            userList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<VideoDoorlockUser>>(pack.Data.ToString());
-                            if (userList != null)
-                            {
-                                Application.RunOnMainThread(() => {
-                                    initView();
-                                });
-                            }
-                        }
-                        else
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
-                            });
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MainPage.Log($"鑾峰彇闂ㄩ攣鐢ㄦ埛寮傚父:{ex.Message}");
-                }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        waitPage.Hide();
-                    });
-                }
-            })
-            { IsBackground = true }.Start();
-
-
-        }
-
-
-        void initView()
-        {
-            contentView.RemoveAll();
-
-            foreach (var user in userList)
-            {
-                contentView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
-
-                var row = new FrameLayout()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Height = Application.GetRealHeight(50),
-                    Radius = (uint)Application.GetRealWidth(12),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                    Width = Application.GetRealWidth(343),
-                };
-                contentView.AddChidren(row);
-
-                var btnRight = new Button()
-                {
-                    X = Application.GetRealWidth(307),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetMinRealAverage(16),
-                    Height = Application.GetMinRealAverage(16),
-                    UnSelectedImagePath = "Public/Right.png",
-                };
-                row.AddChidren(btnRight);
-
-                var btnName = new Button()
-                {
-                    X = Application.GetRealWidth(12),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    Text = user.lockUserName
-                };
-                row.AddChidren(btnName);
-
-                btnName.MouseUpEventHandler = (sender, e) => {
-                    var page = new VideoDoorlockUserManagerPage(device, user);
-                    page.delCallBackAction = () => {
-                        userList.Remove(user);
-                        initView();
-                    };
-                    page.updataUserNameAction = (name) => {
-                        btnName.Text = name;
-                        user.lockUserName = name;
-                    };
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                };
-            }
-
-
-        }
-
-
-    }
-
-    public class VideoDoorlockUser
-    {
-        /// <summary>
-        ///  寮�濮嬫椂闂�    integer(int32)
-        /// </summary>
-        public string beginTime;
-        /// <summary>
-        /// 鎰熷簲鍗″瘑鐮佹暟閲� integer(int32)
-        /// </summary>
-        public int cardCount;
-        /// <summary>
-        /// 缁撴潫鏃堕棿    integer(int32)
-        /// </summary>
-        public int endTime;
-        /// <summary>
-        ///  鏄惁杩囨湡    integer(int32)
-        /// </summary>
-        public string expiredEnable;
-        /// <summary>
-        ///  闂ㄩ攣鐢ㄦ埛id  string
-        /// </summary>
-        public string extUserId;
-        /// <summary>
-        ///        string
-        /// </summary>
-        public string extUserName;
-        /// <summary>
-        ///  浜鸿劯瀵嗙爜鏁伴噺 integer(int32)
-        /// </summary>
-        public int faceCount;
-        /// <summary>
-        ///  鎸囩汗瀵嗙爜鏁伴噺  integer(int32)
-        /// </summary>
-        public int fingerCount;
-        /// <summary>
-        /// 鐢ㄦ埛澶囨敞鍚�   string
-        /// </summary>
-        public string lockRemarkName;
-        /// <summary>
-        ///  閿佺敤鎴风被鍨�// 0-涓荤敤鎴凤紝1-鏅�氱敤鎴�	integer(int32)
-        /// </summary>
-        public int lockType;
-        /// <summary>
-        ///  闂ㄩ攣鐢ㄦ埛id string
-        /// </summary>
-        public string lockUserIndex;
-        /// <summary>
-        /// 鐢ㄦ埛鍚� string
-        /// </summary>
-        public string lockUserName;
-        /// <summary>
-        /// 鏁板瓧瀵嗙爜鏁伴噺 integer(int32)
-        /// </summary>
-        public int pwdCount;
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
deleted file mode 100644
index 5c17463..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
+++ /dev/null
@@ -1,837 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Common;
-using HDL_ON.DAL.Server;
-using HDL_ON.DriverLayer;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
-{
-    /// <summary>
-    /// 瑙嗛闂ㄩ攣鐢ㄦ埛绠$悊鐣岄潰
-    /// </summary>
-    public class VideoDoorlockUserManagerPage : FrameLayout
-    {
-        FrameLayout bodyView;
-        VerticalScrolViewLayout contentView;
-        FrameLayout userPermissionsView;
-
-        //Button btnUserName;
-
-        Function device;
-        VideoDoorlockUser doorlockUser;
-        public Action delCallBackAction;
-        public Action<string> updataUserNameAction;
-        Loading waitPage;
-
-
-        public VideoDoorlockUserManagerPage(Function function,VideoDoorlockUser user)
-        {
-            bodyView = this;
-            device = function;
-            doorlockUser = user;
-            BackgroundColor = CSS_Color.BackgroundColor;
-            waitPage = new Loading();
-
-        }
-
-        public override void RemoveFromParent()
-        {
-            base.RemoveFromParent();
-            bodyView = null;
-            if (waitPage != null)
-            {
-                waitPage.RemoveFromParent();
-                waitPage = null;
-            }
-        }
-
-        public void LoadPage()
-        {
-            bodyView.AddChidren(waitPage);
-            new TopViewDiv(bodyView, Language.StringByID(StringId.UserManagement)).LoadTopView();
-
-            contentView = new VerticalScrolViewLayout()
-            {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(667 - 70),
-            };
-            bodyView.AddChidren(contentView);
-
-          
-
-            #region 鐢ㄦ埛鍚嶇О
-            var userNameView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(50),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(userNameView);
-            var btnUserNameTitle = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Width = Application.GetRealWidth(120),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.User,
-            };
-            userNameView.AddChidren(btnUserNameTitle);
-            var btnEditUserNameIcon = new Button()
-            {
-                X = Application.GetRealWidth(333),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(28),
-                Height = Application.GetMinRealAverage(28),
-                UnSelectedImagePath = "Public/EditIcon.png",
-            };
-            userNameView.AddChidren(btnEditUserNameIcon);
-
-            var btnUserName = new Button()
-            {
-                X = Application.GetRealWidth(100),
-                Width = Application.GetRealWidth(230),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.TextFontSize,
-                Text = doorlockUser.lockUserName
-            };
-            userNameView.AddChidren(btnUserName);
-            btnUserName.MouseUpEventHandler = (sender, e) => {
-                LoadEvent_EditUserName();
-            };
-
-            #endregion
-
-            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-
-            initOptionView(false);
-
-            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-            {
-                Action<string> callBack = (str) =>
-                {
-                    if (string.IsNullOrEmpty(str))
-                    {
-                        new Tip()
-                        {
-                            CloseTime = 1,
-                            Text = Language.StringByID(StringId.UesrNameCannotBeEmpty),
-                            Direction = AMPopTipDirection.None,
-                        }.Show(bodyView);
-                        return;
-                    }
-                    if (str == UserInfo.Current.userName)
-                    {
-                        return;
-                    }
-                    if (System.Text.Encoding.Unicode.GetBytes(str).Length > 20)
-                    {
-                        new Tip()
-                        {
-                            CloseTime = 1,
-                            Text = Language.StringByID(StringId.LengthOutOfRange),
-                            Direction = AMPopTipDirection.None,
-                        }.Show(bodyView);
-                        return;
-                    }
-                    new System.Threading.Thread(() =>
-                    {
-                        try
-                        {
-                            Application.RunOnMainThread(() => {
-                                waitPage.Start(Language.StringByID(StringId.PleaseWait));
-                            });
-                            var pack = ApiUtlis.Ins.HttpRequest.EditDoorlockUserName(device.deviceId, doorlockUser.extUserId, str);
-                            if (pack.Code == StateCode.SUCCESS)
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    btnUserName.Text = str;
-                                    updataUserNameAction?.Invoke(str);
-                                });
-                            }
-                            else
-                            {
-                                //澶辫触鎻愮ず
-                                Application.RunOnMainThread(() =>
-                                {
-                                    if (string.IsNullOrEmpty(pack.message))
-                                    {
-                                        pack.message = Language.StringByID(StringId.OperationFailed);
-                                    }
-                                    {
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = $"{pack.message}({pack.Code})",
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    }
-                                });
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"update user name error : {ex.Message}");
-                        }
-                        finally
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                waitPage.Hide();
-                            });
-                        }
-                    })
-                    { IsBackground = true }.Start();
-                };
-                var pa = new PublicAssmebly();
-                pa.entryMaxLength = 20;
-                pa.LoadDialog_EditParater(StringId.ChangeName, "", callBack, StringId.UesrNameCannotBeEmpty, 0, new List<string>());
-            };
-            btnUserName.MouseUpEventHandler = eventHandler;
-            btnEditUserNameIcon.MouseUpEventHandler = eventHandler;
-            userNameView.MouseUpEventHandler = eventHandler;
-
-        }
-
-        void initOptionView(bool isEdit)
-        {
-            if(doorlockUser.faceCount == 0&&
-                doorlockUser.fingerCount == 0 &&
-                doorlockUser.pwdCount == 0 &&
-                doorlockUser.cardCount == 0)
-            {
-                new PublicAssmebly().TipMsg(StringId.Tip, StringId.VideoDoorlockDelDataTip, () =>
-                {
-                    delCallBackAction?.Invoke();
-                    this.RemoveFromParent();
-                });
-                return;
-            }
-
-
-            int childrenViewHeight = Application.GetRealWidth(116);
-            int permissionsViewHeight = Application.GetRealHeight(291 + 92 + 100);
-            if (userPermissionsView!= null)
-            {
-                userPermissionsView.RemoveAll();
-
-                if (isEdit)
-                {
-                    permissionsViewHeight = Application.GetRealHeight(391 + 50 + 100);
-                    childrenViewHeight = Application.GetRealWidth(156);
-                }
-                userPermissionsView.Height = permissionsViewHeight ;
-            }
-            else
-            {
-                userPermissionsView = new FrameLayout()
-                {
-                    Height = permissionsViewHeight,
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                };
-                contentView.AddChidren(userPermissionsView);
-            }
-
-            #region 闂ㄩ攣鐢ㄦ埛寮�閿佹柟寮忕鐞�
-
-            var userPermissionsTitleView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(63),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            userPermissionsView.AddChidren(userPermissionsTitleView);
-
-            var btnUserPermissionsTitle = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextID = StringId.UnlockMethod
-            };
-            userPermissionsTitleView.AddChidren(btnUserPermissionsTitle);
-
-            var btnEditUserPermissions = new Button()
-            {
-                X = Application.GetRealWidth(267),
-                Width = Application.GetRealWidth(80),
-                TextAlignment = TextAlignment.CenterRight,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.MainColor,
-                TextID = !isEdit? StringId.Edit: StringId.Complete,
-            };
-            userPermissionsTitleView.AddChidren(btnEditUserPermissions);
-            btnEditUserPermissions.MouseUpEventHandler = (sender, e) => {
-                if(!isEdit)
-                {
-                    initOptionView(true);
-                }
-                else
-                {
-                    initOptionView(false);
-                }
-
-            };
-
-
-            #region 寮�閿侀�夐」
-            var unlockOptionView = new FrameLayout()
-            {
-                Y = userPermissionsTitleView.Bottom,
-                Height =2 * childrenViewHeight +Application.GetRealHeight(20),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            userPermissionsView.AddChidren(unlockOptionView);
-
-            #region 鎸囩汗
-            var fingerprintView = new FrameLayout()
-            {
-                X = Application.GetRealWidth(16),
-                Width = Application.GetRealWidth(64 + 32),
-                Height = childrenViewHeight
-            };
-            unlockOptionView.AddChidren(fingerprintView);
-
-            var btnFingerprintIcon = new Button()
-            {
-                Width = Application.GetRealWidth(64),
-                Height = Application.GetRealWidth(64),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/FingerprintIcon.png",
-                X = Application.GetRealWidth(16),
-            };
-            fingerprintView.AddChidren(btnFingerprintIcon);
-
-            var btnFingerprintText = new Button()
-            {
-                Y = btnFingerprintIcon.Bottom,
-                Height = Application.GetRealHeight(44),
-                TextAlignment = TextAlignment.Center,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-                TextID = StringId.Fingerprints,
-            };
-            fingerprintView.AddChidren(btnFingerprintText);
-
-            if (doorlockUser.fingerCount > 0)
-            {
-                btnFingerprintIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/FingerprintOnIcon.png";
-                btnFingerprintText.TextColor = CSS_Color.FirstLevelTitleColor;
-                if (Language.CurrentLanguage == "Chinese")
-                {
-                    btnFingerprintText.Text = doorlockUser.fingerCount + "缁�" + Language.StringByID(StringId.Fingerprints);
-                }
-                else
-                {
-                    btnFingerprintText.Text = doorlockUser.fingerCount + " " + Language.StringByID(StringId.Fingerprints);
-                }
-
-                if (isEdit)
-                {
-                    var btnClearFingerprints = new Button()
-                    {
-                        X = Application.GetRealWidth(18),
-                        Y = btnFingerprintText.Bottom,
-                        Width = Application.GetRealWidth(60),
-                        Height = Application.GetRealHeight(28),
-                        BorderWidth = 1,
-                        BorderColor = CSS_Color.MainColor,
-                        Radius = (uint)Application.GetRealWidth(4),
-                        TextID = StringId.Clear,
-                        TextColor = CSS_Color.MainColor,
-                    };
-                    fingerprintView.AddChidren(btnClearFingerprints);
-                    btnClearFingerprints.MouseUpEventHandler = (sender, e) =>
-                    {
-                        new System.Threading.Thread(() =>
-                        {
-                            try
-                            {
-                                Application.RunOnMainThread(() => {
-                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
-                                });
-                                var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserFingerPassword(device.deviceId, doorlockUser.lockUserIndex);
-                                if (pack != null && pack.Code == StateCode.SUCCESS)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        doorlockUser.fingerCount = 0;
-                                        //鏇存柊鐣岄潰
-                                        initOptionView(true);
-                                    });
-                                }
-                                else
-                                {
-                                    //澶辫触鎻愮ず
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        //澶辫触鎻愮ず
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = pack.message,
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    });
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                MainPage.Log($"delete finger error : {ex.Message}");
-                            }
-                            finally
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    waitPage.Hide();
-                                });
-                            }
-                        })
-                        { IsBackground = true }.Start();
-                    };
-                }
-            }
-            #endregion
-
-
-            #region 鏁板瓧瀵嗙爜
-            var digitalPasswordView = new FrameLayout()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(64 + 32),
-                Height = childrenViewHeight
-            };
-            unlockOptionView.AddChidren(digitalPasswordView);
-
-            var btnDigitalPasswordIcon = new Button()
-            {
-                Width = Application.GetRealWidth(64),
-                Height = Application.GetRealWidth(64),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/DigitalPasswordIcon.png",
-                X = Application.GetRealWidth(16),
-            };
-            digitalPasswordView.AddChidren(btnDigitalPasswordIcon);
-
-            var btnDigitalPasswordText = new Button()
-            {
-                Y = btnDigitalPasswordIcon.Bottom,
-                Height = Application.GetRealHeight(44),
-                TextAlignment = TextAlignment.Center,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-                TextID = StringId.DigitalPassword,
-            };
-            digitalPasswordView.AddChidren(btnDigitalPasswordText);
-
-            if (doorlockUser.pwdCount > 0)
-            {
-                btnDigitalPasswordIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/DigitalPasswordOnIcon.png";
-                btnDigitalPasswordText.TextColor = CSS_Color.FirstLevelTitleColor;
-                if (Language.CurrentLanguage == "Chinese")
-                {
-                    btnDigitalPasswordText.Text = doorlockUser.pwdCount + "缁�" + Language.StringByID(StringId.DigitalPassword);
-                }
-                else
-                {
-                    btnDigitalPasswordText.Text = doorlockUser.pwdCount + " " + Language.StringByID(StringId.DigitalPassword);
-                }
-
-                if (isEdit)
-                {
-                    var btnClearDigitalPassword = new Button()
-                    {
-                        X = Application.GetRealWidth(18),
-                        Y = btnDigitalPasswordText.Bottom,
-                        Width = Application.GetRealWidth(60),
-                        Height = Application.GetRealHeight(28),
-                        BorderWidth = 1,
-                        BorderColor = CSS_Color.MainColor,
-                        Radius = (uint)Application.GetRealWidth(4),
-                        TextID = StringId.Clear,
-                        TextColor = CSS_Color.MainColor,
-                    };
-                    digitalPasswordView.AddChidren(btnClearDigitalPassword);
-                    btnClearDigitalPassword.MouseUpEventHandler = (sender, e) =>
-                    {
-                        new System.Threading.Thread(() =>
-                        {
-                            try
-                            {
-                                Application.RunOnMainThread(() => {
-                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
-                                });
-                                var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserNumberPassword(device.deviceId, doorlockUser.lockUserIndex);
-                                if (pack != null && pack.Code == StateCode.SUCCESS)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        doorlockUser.pwdCount = 0;
-                                        //鏇存柊鐣岄潰
-                                        initOptionView(true);
-                                    });
-                                }
-                                else
-                                {
-                                    //澶辫触鎻愮ず
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        //澶辫触鎻愮ず
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = pack.message,
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    });
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                MainPage.Log($"delete number password error : {ex.Message}");
-                            }
-                            finally
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    waitPage.Hide();
-                                });
-                            }
-                        })
-                        { IsBackground = true }.Start();
-                    };
-
-                }
-            }
-            #endregion
-
-            #region NFC
-            var nfcView = new FrameLayout()
-            {
-                X = Application.GetRealWidth(263),
-                Width = Application.GetRealWidth(64 + 32),
-                Height = childrenViewHeight
-            };
-            unlockOptionView.AddChidren(nfcView);
-
-            var btnNfcIcon = new Button()
-            {
-                Width = Application.GetRealWidth(64),
-                Height = Application.GetRealWidth(64),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/NfcIcon.png",
-                X = Application.GetRealWidth(16),
-            };
-            nfcView.AddChidren(btnNfcIcon);
-
-            var btnNfcText = new Button()
-            {
-                Y = btnNfcIcon.Bottom,
-                Height = Application.GetRealHeight(44),
-                TextAlignment = TextAlignment.Center,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-                TextID = StringId.NfcKey,
-            };
-            nfcView.AddChidren(btnNfcText);
-
-            if (doorlockUser.cardCount > 0)
-            {
-                btnNfcIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/NfcOnIcon.png";
-                btnNfcText.TextColor = CSS_Color.FirstLevelTitleColor;
-                if (Language.CurrentLanguage == "Chinese")
-                {
-                    btnNfcText.Text = doorlockUser.cardCount + "缁�" + Language.StringByID(StringId.NfcKey);
-                }
-                else
-                {
-                    btnNfcText.Text = doorlockUser.cardCount + " " + Language.StringByID(StringId.NfcKey);
-                }
-
-                if (isEdit)
-                {
-                    var btnClearNfc = new Button()
-                    {
-                        X = Application.GetRealWidth(18),
-                        Y = btnNfcText.Bottom,
-                        Width = Application.GetRealWidth(60),
-                        Height = Application.GetRealHeight(28),
-                        BorderWidth = 1,
-                        BorderColor = CSS_Color.MainColor,
-                        Radius = (uint)Application.GetRealWidth(4),
-                        TextID = StringId.Clear,
-                        TextColor = CSS_Color.MainColor,
-                    };
-                    nfcView.AddChidren(btnClearNfc);
-                    btnClearNfc.MouseUpEventHandler = (sender, e) => {
-                        new System.Threading.Thread(() =>
-                        {
-                            try
-                            {
-                                Application.RunOnMainThread(() => {
-                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
-                                });
-                                var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserCardPassword(device.deviceId, doorlockUser.lockUserIndex);
-                                if (pack != null && pack.Code == StateCode.SUCCESS)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        doorlockUser.cardCount = 0;
-                                        //鏇存柊鐣岄潰
-                                        initOptionView(true);
-                                    });
-                                }
-                                else
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        //澶辫触鎻愮ず
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = pack.message,
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    });
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                MainPage.Log($"delete face error : {ex.Message}");
-                            }
-                            finally
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    waitPage.Hide();
-                                });
-                            }
-                        })
-                        { IsBackground = true }.Start();
-                    };
-                }
-            }
-            #endregion
-
-            #region 浜鸿劯
-            var faceView = new FrameLayout()
-            {
-                X = Application.GetRealWidth(16),
-                Y = fingerprintView.Bottom+ Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(64 + 32),
-                Height = childrenViewHeight
-            };
-            unlockOptionView.AddChidren(faceView);
-
-            var btnFaceIcon = new Button()
-            {
-                Width = Application.GetRealWidth(64),
-                Height = Application.GetRealWidth(64),
-                UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/FaceIcon.png",
-                X = Application.GetRealWidth(16),
-            };
-            faceView.AddChidren(btnFaceIcon);
-
-            var btnFaceText = new Button()
-            {
-                Y = btnFaceIcon.Bottom,
-                Height = Application.GetRealHeight(44),
-                TextAlignment = TextAlignment.Center,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-                TextID = StringId.FaceKey,
-            };
-            faceView.AddChidren(btnFaceText);
-
-            if (doorlockUser.faceCount > 0)
-            {
-                btnFaceIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/FaceOnIcon.png";
-                btnFaceText.TextColor = CSS_Color.FirstLevelTitleColor;
-                if (Language.CurrentLanguage == "Chinese")
-                {
-                    btnFaceText.Text = doorlockUser.faceCount + "缁�" + Language.StringByID(StringId.FaceKey);
-                }
-                else
-                {
-                    btnFaceText.Text = doorlockUser.faceCount + " " + Language.StringByID(StringId.FaceKey);
-                }
-
-                if (isEdit)
-                {
-                    var btnClearFace = new Button()
-                    {
-                        X = Application.GetRealWidth(18),
-                        Y = btnFaceText.Bottom,
-                        Width = Application.GetRealWidth(60),
-                        Height = Application.GetRealHeight(28),
-                        BorderWidth = 1,
-                        BorderColor = CSS_Color.MainColor,
-                        Radius = (uint)Application.GetRealWidth(4),
-                        TextID = StringId.Clear,
-                        TextColor = CSS_Color.MainColor,
-                    };
-                    faceView.AddChidren(btnClearFace);
-                    btnClearFace.MouseUpEventHandler = (sender, e) => {
-                        new System.Threading.Thread(() =>
-                        {
-                            try
-                            {
-                                Application.RunOnMainThread(() => {
-                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
-                                });
-                                var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserFacePassword(device.deviceId, doorlockUser.lockUserIndex);
-                                if (pack != null && pack.Code == StateCode.SUCCESS)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        doorlockUser.faceCount = 0;
-                                        //鏇存柊鐣岄潰
-                                        initOptionView(true);
-                                    });
-                                }
-                                else
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        //澶辫触鎻愮ず
-                                        var tip = new Tip()
-                                        {
-                                            MaxWidth = Application.GetRealWidth(300),
-                                            Text = pack.message,
-                                            CloseTime = 3,
-                                            Direction = AMPopTipDirection.None
-                                        };
-                                        tip.Show(MainPage.BaseView);
-                                    });
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                MainPage.Log($"delete face error : {ex.Message}");
-                            }
-                            finally
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    waitPage.Hide();
-                                });
-                            }
-                        })
-                        { IsBackground = true }.Start();
-                    };
-
-                }
-            }
-            #endregion
-
-            #endregion
-
-            #endregion
-
-            var delUserView = new FrameLayout()
-            {
-                Y = unlockOptionView.Bottom,
-                Height = Application.GetRealHeight(310),
-                BackgroundColor = CSS_Color.BackgroundColor,
-            };
-            userPermissionsView.AddChidren(delUserView);
-
-            Button btnDelUser = new Button()
-            {
-                Y = Application.GetRealHeight(40),
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(220),
-                Height = Application.GetRealWidth(44),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-                TextColor = CSS_Color.WarningColor,
-                Radius = (uint)Application.GetRealWidth(22),
-                TextID = StringId.DeleteUser,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-            };
-            delUserView.AddChidren(btnDelUser);
-
-            btnDelUser.MouseUpEventHandler = (sender, e) =>
-            {
-                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteDoorlockUserTip, () =>
-                {
-                    new System.Threading.Thread(() =>
-                    {
-                        try
-                        {
-                            Application.RunOnMainThread(() => {
-                                waitPage.Start(Language.StringByID(StringId.PleaseWait));
-                            });
-                            var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUser(device.deviceId, doorlockUser.lockUserIndex);
-                            if (pack != null && pack.Code == StateCode.SUCCESS)
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    //鏇存柊鐣岄潰
-                                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteSuccess, () => {
-                                        this.RemoveFromParent();
-                                        delCallBackAction?.Invoke();
-                                    });
-                                });
-                            }
-                            else
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    if (string.IsNullOrEmpty(pack.message)) {
-                                        pack.message = Language.StringByID(StringId.OperationFailed);
-                                    }
-                                    //澶辫触鎻愮ず
-                                    var tip = new Tip()
-                                    {
-                                        MaxWidth = Application.GetRealWidth(300),
-                                        Text = pack.message,
-                                        CloseTime = 3,
-                                        Direction = AMPopTipDirection.None
-                                    };
-                                    tip.Show(MainPage.BaseView);
-                                });
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"delete face error : {ex.Message}");
-                        }
-                        finally
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                waitPage.Hide();
-                            });
-                        }
-                    })
-                    { IsBackground = true }.Start();
-                });
-            };
-
-
-
-        }
-
-
-
-        /// <summary>
-        /// 鍔犺浇淇敼鐢ㄦ埛鍚嶇О浜嬩欢
-        /// </summary>
-        void LoadEvent_EditUserName()
-        {
-            //btnUserName.MouseUpEventHandler = eventHandler;
-        }
-
-
-
-    }
-}
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 203c1e3..a1748ae 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -145,17 +145,17 @@
                 }
                 if (DB_ResidenceData.Instance.NeedTip) {
                     DB_ResidenceData.Instance.LastTipTime = DateTime.Now;
-                    if (CN.Jpush.Android.Api.JPushInterface.IsNotificationEnabled(Shared.Application.Activity) != 1)
-                    {
-                        Action action = () =>
-                        {
-                            CN.Jpush.Android.Api.JPushInterface.GoToAppNotificationSettings(Shared.Application.Activity);
-                        };
-                        Shared.Application.RunOnMainThread(() =>
-                        {
-                            new HDL_ON.UI.ConfirmDialog().ShowDialog(StringId.Tip, StringId.Android_MessagePushTip, action);
-                        });
-                    }
+                    //if (CN.Jpush.Android.Api.JPushInterface.IsNotificationEnabled(Shared.Application.Activity) != 1)
+                    //{
+                    //    Action action = () =>
+                    //    {
+                    //        CN.Jpush.Android.Api.JPushInterface.GoToAppNotificationSettings(Shared.Application.Activity);
+                    //    };
+                    //    Shared.Application.RunOnMainThread(() =>
+                    //    {
+                    //        new HDL_ON.UI.ConfirmDialog().ShowDialog(StringId.Tip, StringId.Android_MessagePushTip, action);
+                    //    });
+                    //}
                 }
 #endif
 

--
Gitblit v1.8.0