From 565f7ae8ef01916cb435153a8a01ddd5c5f70c48 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 13 五月 2021 14:43:11 +0800
Subject: [PATCH] 1.场景延时修改成0-3600s

---
 HDL_ON/Entity/Function/Scene.cs                                         |    5 
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs                                    |    5 
 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs   |    1 
 HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs                  |  340 +++++++
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs                      |    4 
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs                     |    2 
 HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs        |    2 
 HDL_ON/HDL_ON.projitems                                                 |    1 
 HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs   |   38 
 HDL_ON/Entity/Function/Function.cs                                      |   31 
 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs |    2 
 HDL-ON_Android/Resources/Resource.designer.cs                           | 1999 ++++++++++++++++++++--------------------
 HDL_ON/UI/UI0-Public/PublicAssmebly.cs                                  |  340 +++---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs                    |    2 
 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs          |    2 
 HDL_ON/DAL/Server/HttpServerRequest.cs                                  |    4 
 .vs/HDL_APP_Project/xs/UserPrefs.xml                                    |   70 
 HDL_ON/UI/MainPage.cs                                                   |    5 
 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs    |    1 
 19 files changed, 1,656 insertions(+), 1,198 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index e6e122d..de93483 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,36 +1,60 @@
 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.26569F89-0BA9-4C06-81F2-764A3AF2E1B7" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Application.cs">
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Scene.cs">
     <Files>
-      <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="151" Column="14" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
-      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
-      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
-      <File FileName="HDL_ON/Common/FileUtlis.cs" />
-      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
-      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
-      <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
-      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
-      <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="176" Column="1" />
-      <File FileName="HDL_ON/Common/ApiUtlis.cs" />
-      <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="8" Column="31" />
-      <File FileName="HDL-ON_Android/Application.cs" Line="329" Column="58" />
+      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs" Line="40" Column="1" IsPinned="True" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="277" Column="68" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs" Line="93" Column="73" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="753" Column="70" />
+      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2431" Column="16" />
+      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs" Line="414" Column="1" />
+      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="364" Column="36" />
+      <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="746" Column="16" />
+      <File FileName="HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs" Line="111" Column="60" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="292" Column="62" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" Line="330" Column="87" />
+      <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="349" Column="30" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="HDL_APP_Project" expanded="True">
             <Node name="HDL_ON" expanded="True">
-              <Node name="DAL" expanded="True" />
-              <Node name="Entity" expanded="True" />
+              <Node name="Common" expanded="True" />
+              <Node name="DAL" expanded="True">
+                <Node name="DriverLayer" expanded="True" />
+                <Node name="Server" expanded="True" />
+              </Node>
+              <Node name="Entity" expanded="True">
+                <Node name="Function" expanded="True">
+                  <Node name="Scene.cs" selected="True" />
+                </Node>
+              </Node>
               <Node name="UI" expanded="True">
                 <Node name="UI0-Public" expanded="True" />
+                <Node name="UI0-Stan" expanded="True">
+                  <Node name="Controls" expanded="True">
+                    <Node name="BottomControls" expanded="True" />
+                  </Node>
+                  <Node name="Form" expanded="True">
+                    <Node name="Base" expanded="True" />
+                  </Node>
+                </Node>
+                <Node name="UI1-Login" expanded="True" />
+                <Node name="UI2" expanded="True">
+                  <Node name="1-HomePage" expanded="True" />
+                  <Node name="3-Intelligence" expanded="True">
+                    <Node name="Scene" expanded="True" />
+                  </Node>
+                  <Node name="FuntionControlView" expanded="True">
+                    <Node name="1ContorlPage" expanded="True" />
+                    <Node name="Electrical" expanded="True" />
+                    <Node name="Energy" expanded="True" />
+                  </Node>
+                </Node>
               </Node>
             </Node>
-            <Node name="HDL-ON_Android" expanded="True">
-              <Node name="Application.cs" selected="True" />
-            </Node>
+            <Node name="HDL-ON_Android" expanded="True" />
             <Node name="HDL-ON_iOS" expanded="True" />
           </Node>
         </State>
@@ -43,13 +67,11 @@
     <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
     <String>Shared.IOS/Shared.IOS.csproj</String>
   </DisabledProjects>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore>
       <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
       <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
-      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="822" column="1" />
     </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index d143a30..3618905 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -5119,1615 +5119,1612 @@
 			public const int label_bg_sel = 2131231231;
 			
 			// aapt resource value: 0x7F080200
-			public const int launchImage = 2131231232;
+			public const int leave_message_play = 2131231232;
 			
 			// aapt resource value: 0x7F080201
-			public const int leave_message_play = 2131231233;
+			public const int leave_message_play_sel = 2131231233;
 			
 			// aapt resource value: 0x7F080202
-			public const int leave_message_play_sel = 2131231234;
+			public const int leave_message_play_selector = 2131231234;
 			
 			// aapt resource value: 0x7F080203
-			public const int leave_message_play_selector = 2131231235;
+			public const int left_horizontal = 2131231235;
 			
 			// aapt resource value: 0x7F080204
-			public const int left_horizontal = 2131231236;
+			public const int left_twinkle = 2131231236;
 			
 			// aapt resource value: 0x7F080205
-			public const int left_twinkle = 2131231237;
+			public const int link_account1 = 2131231237;
 			
 			// aapt resource value: 0x7F080206
-			public const int link_account1 = 2131231238;
+			public const int link_account2 = 2131231238;
 			
 			// aapt resource value: 0x7F080207
-			public const int link_account2 = 2131231239;
+			public const int link_account3 = 2131231239;
 			
 			// aapt resource value: 0x7F080208
-			public const int link_account3 = 2131231240;
-			
-			// aapt resource value: 0x7F080209
-			public const int link_account4 = 2131231241;
-			
-			// aapt resource value: 0x7F08020B
-			public const int Loading = 2131231243;
+			public const int link_account4 = 2131231240;
 			
 			// aapt resource value: 0x7F08020A
-			public const int load_failed_bg = 2131231242;
+			public const int Loading = 2131231242;
+			
+			// aapt resource value: 0x7F080209
+			public const int load_failed_bg = 2131231241;
+			
+			// aapt resource value: 0x7F08020B
+			public const int lock_bg = 2131231243;
 			
 			// aapt resource value: 0x7F08020C
-			public const int lock_bg = 2131231244;
+			public const int login_btn_selector = 2131231244;
 			
 			// aapt resource value: 0x7F08020D
-			public const int login_btn_selector = 2131231245;
+			public const int login_logo = 2131231245;
 			
 			// aapt resource value: 0x7F08020E
-			public const int login_logo = 2131231246;
+			public const int login_logo_button = 2131231246;
 			
 			// aapt resource value: 0x7F08020F
-			public const int login_logo_button = 2131231247;
+			public const int login_logo_button_sel = 2131231247;
 			
 			// aapt resource value: 0x7F080210
-			public const int login_logo_button_sel = 2131231248;
+			public const int logo_loading_1 = 2131231248;
 			
 			// aapt resource value: 0x7F080211
-			public const int logo_loading_1 = 2131231249;
+			public const int logo_loading_2 = 2131231249;
 			
 			// aapt resource value: 0x7F080212
-			public const int logo_loading_2 = 2131231250;
+			public const int logo_loading_3 = 2131231250;
 			
 			// aapt resource value: 0x7F080213
-			public const int logo_loading_3 = 2131231251;
+			public const int logo_loading_4 = 2131231251;
 			
 			// aapt resource value: 0x7F080214
-			public const int logo_loading_4 = 2131231252;
+			public const int mesage_details_callhelp = 2131231252;
 			
 			// aapt resource value: 0x7F080215
-			public const int mesage_details_callhelp = 2131231253;
+			public const int mesage_details_curtain = 2131231253;
 			
 			// aapt resource value: 0x7F080216
-			public const int mesage_details_curtain = 2131231254;
+			public const int mesage_details_data = 2131231254;
 			
 			// aapt resource value: 0x7F080217
-			public const int mesage_details_data = 2131231255;
+			public const int mesage_details_door = 2131231255;
 			
 			// aapt resource value: 0x7F080218
-			public const int mesage_details_door = 2131231256;
+			public const int mesage_details_gas = 2131231256;
 			
 			// aapt resource value: 0x7F080219
-			public const int mesage_details_gas = 2131231257;
+			public const int mesage_details_hdd = 2131231257;
 			
 			// aapt resource value: 0x7F08021A
-			public const int mesage_details_hdd = 2131231258;
+			public const int mesage_details_infrared = 2131231258;
 			
 			// aapt resource value: 0x7F08021B
-			public const int mesage_details_infrared = 2131231259;
+			public const int mesage_details_keyboard = 2131231259;
 			
 			// aapt resource value: 0x7F08021C
-			public const int mesage_details_keyboard = 2131231260;
+			public const int mesage_details_loss = 2131231260;
 			
 			// aapt resource value: 0x7F08021D
-			public const int mesage_details_loss = 2131231261;
+			public const int mesage_details_low_battery = 2131231261;
 			
 			// aapt resource value: 0x7F08021E
-			public const int mesage_details_low_battery = 2131231262;
+			public const int mesage_details_offline = 2131231262;
 			
 			// aapt resource value: 0x7F08021F
-			public const int mesage_details_offline = 2131231263;
+			public const int mesage_details_power = 2131231263;
 			
 			// aapt resource value: 0x7F080220
-			public const int mesage_details_power = 2131231264;
+			public const int mesage_details_smoke = 2131231264;
 			
 			// aapt resource value: 0x7F080221
-			public const int mesage_details_smoke = 2131231265;
+			public const int mesage_details_tampering = 2131231265;
 			
 			// aapt resource value: 0x7F080222
-			public const int mesage_details_tampering = 2131231266;
+			public const int mesage_details_video_loss = 2131231266;
 			
 			// aapt resource value: 0x7F080223
-			public const int mesage_details_video_loss = 2131231267;
+			public const int mesage_details_water = 2131231267;
 			
 			// aapt resource value: 0x7F080224
-			public const int mesage_details_water = 2131231268;
+			public const int message = 2131231268;
 			
 			// aapt resource value: 0x7F080225
-			public const int message = 2131231269;
+			public const int message_a1_bg = 2131231269;
 			
 			// aapt resource value: 0x7F080226
-			public const int message_a1_bg = 2131231270;
+			public const int message_back = 2131231270;
 			
 			// aapt resource value: 0x7F080227
-			public const int message_back = 2131231271;
+			public const int message_back_sel = 2131231271;
 			
 			// aapt resource value: 0x7F080228
-			public const int message_back_sel = 2131231272;
+			public const int message_back_selector = 2131231272;
 			
 			// aapt resource value: 0x7F080229
-			public const int message_back_selector = 2131231273;
+			public const int message_border_bg = 2131231273;
 			
 			// aapt resource value: 0x7F08022A
-			public const int message_border_bg = 2131231274;
+			public const int message_callhelp = 2131231274;
 			
 			// aapt resource value: 0x7F08022B
-			public const int message_callhelp = 2131231275;
+			public const int message_curtain = 2131231275;
 			
 			// aapt resource value: 0x7F08022C
-			public const int message_curtain = 2131231276;
+			public const int message_data = 2131231276;
 			
 			// aapt resource value: 0x7F08022D
-			public const int message_data = 2131231277;
+			public const int message_door = 2131231277;
 			
 			// aapt resource value: 0x7F08022E
-			public const int message_door = 2131231278;
+			public const int message_gas = 2131231278;
 			
 			// aapt resource value: 0x7F08022F
-			public const int message_gas = 2131231279;
+			public const int message_hdd = 2131231279;
 			
 			// aapt resource value: 0x7F080230
-			public const int message_hdd = 2131231280;
+			public const int message_infrared = 2131231280;
 			
 			// aapt resource value: 0x7F080231
-			public const int message_infrared = 2131231281;
+			public const int message_item_bg_selector = 2131231281;
 			
 			// aapt resource value: 0x7F080232
-			public const int message_item_bg_selector = 2131231282;
+			public const int message_keyboard = 2131231282;
 			
 			// aapt resource value: 0x7F080233
-			public const int message_keyboard = 2131231283;
+			public const int message_loss = 2131231283;
 			
 			// aapt resource value: 0x7F080234
-			public const int message_loss = 2131231284;
+			public const int message_low_battery = 2131231284;
 			
 			// aapt resource value: 0x7F080235
-			public const int message_low_battery = 2131231285;
+			public const int message_move_magnetometer = 2131231285;
 			
 			// aapt resource value: 0x7F080236
-			public const int message_move_magnetometer = 2131231286;
+			public const int message_offline = 2131231286;
 			
 			// aapt resource value: 0x7F080237
-			public const int message_offline = 2131231287;
+			public const int message_play = 2131231287;
 			
 			// aapt resource value: 0x7F080238
-			public const int message_play = 2131231288;
+			public const int message_play_dis = 2131231288;
 			
 			// aapt resource value: 0x7F080239
-			public const int message_play_dis = 2131231289;
+			public const int message_play_sel = 2131231289;
 			
 			// aapt resource value: 0x7F08023A
-			public const int message_play_sel = 2131231290;
+			public const int message_play_selector = 2131231290;
 			
 			// aapt resource value: 0x7F08023B
-			public const int message_play_selector = 2131231291;
+			public const int message_power = 2131231291;
 			
 			// aapt resource value: 0x7F08023C
-			public const int message_power = 2131231292;
+			public const int message_sel = 2131231292;
 			
 			// aapt resource value: 0x7F08023D
-			public const int message_sel = 2131231293;
+			public const int message_smoke = 2131231293;
 			
 			// aapt resource value: 0x7F08023E
-			public const int message_smoke = 2131231294;
+			public const int message_tampering = 2131231294;
 			
 			// aapt resource value: 0x7F08023F
-			public const int message_tampering = 2131231295;
+			public const int message_video = 2131231295;
 			
 			// aapt resource value: 0x7F080240
-			public const int message_video = 2131231296;
+			public const int message_video_dis = 2131231296;
 			
 			// aapt resource value: 0x7F080241
-			public const int message_video_dis = 2131231297;
+			public const int message_video_loss = 2131231297;
 			
 			// aapt resource value: 0x7F080242
-			public const int message_video_loss = 2131231298;
+			public const int message_video_sel = 2131231298;
 			
 			// aapt resource value: 0x7F080243
-			public const int message_video_sel = 2131231299;
+			public const int message_video_selector = 2131231299;
 			
 			// aapt resource value: 0x7F080244
-			public const int message_video_selector = 2131231300;
+			public const int message_water = 2131231300;
 			
 			// aapt resource value: 0x7F080245
-			public const int message_water = 2131231301;
+			public const int mic = 2131231301;
 			
 			// aapt resource value: 0x7F080246
-			public const int mic = 2131231302;
+			public const int mm_trans = 2131231302;
 			
 			// aapt resource value: 0x7F080247
-			public const int mm_trans = 2131231303;
+			public const int more = 2131231303;
 			
 			// aapt resource value: 0x7F080248
-			public const int more = 2131231304;
+			public const int my_5k_vr = 2131231304;
 			
 			// aapt resource value: 0x7F080249
-			public const int my_5k_vr = 2131231305;
+			public const int my_5k_vr116 = 2131231305;
 			
 			// aapt resource value: 0x7F08024A
-			public const int my_5k_vr116 = 2131231306;
+			public const int my_a1 = 2131231306;
 			
 			// aapt resource value: 0x7F08024B
-			public const int my_a1 = 2131231307;
+			public const int my_a1c = 2131231307;
 			
 			// aapt resource value: 0x7F08024C
-			public const int my_a1c = 2131231308;
+			public const int my_a1s = 2131231308;
 			
 			// aapt resource value: 0x7F08024D
-			public const int my_a1s = 2131231309;
+			public const int my_add = 2131231309;
 			
 			// aapt resource value: 0x7F08024E
-			public const int my_add = 2131231310;
+			public const int my_c6p = 2131231310;
 			
 			// aapt resource value: 0x7F08024F
-			public const int my_c6p = 2131231311;
+			public const int my_c6t = 2131231311;
 			
 			// aapt resource value: 0x7F080250
-			public const int my_c6t = 2131231312;
+			public const int my_cover = 2131231312;
 			
 			// aapt resource value: 0x7F080251
-			public const int my_cover = 2131231313;
+			public const int my_cover620 = 2131231313;
 			
 			// aapt resource value: 0x7F080252
-			public const int my_cover620 = 2131231314;
+			public const int my_db1 = 2131231314;
 			
 			// aapt resource value: 0x7F080253
-			public const int my_db1 = 2131231315;
+			public const int my_doorbell = 2131231315;
 			
 			// aapt resource value: 0x7F080254
-			public const int my_doorbell = 2131231316;
+			public const int my_doorbell_hik = 2131231316;
 			
 			// aapt resource value: 0x7F080255
-			public const int my_doorbell_hik = 2131231317;
+			public const int my_n1 = 2131231317;
 			
 			// aapt resource value: 0x7F080256
-			public const int my_n1 = 2131231318;
+			public const int my_no_video = 2131231318;
 			
 			// aapt resource value: 0x7F080257
-			public const int my_no_video = 2131231319;
+			public const int my_progress_drawable = 2131231319;
 			
 			// aapt resource value: 0x7F080258
-			public const int my_progress_drawable = 2131231320;
+			public const int my_r1 = 2131231320;
 			
 			// aapt resource value: 0x7F080259
-			public const int my_r1 = 2131231321;
+			public const int my_r2 = 2131231321;
 			
 			// aapt resource value: 0x7F08025A
-			public const int my_r2 = 2131231322;
+			public const int my_shoping = 2131231322;
 			
 			// aapt resource value: 0x7F08025B
-			public const int my_shoping = 2131231323;
+			public const int my_switch_off = 2131231323;
 			
 			// aapt resource value: 0x7F08025C
-			public const int my_switch_off = 2131231324;
+			public const int my_switch_on = 2131231324;
 			
 			// aapt resource value: 0x7F08025D
-			public const int my_switch_on = 2131231325;
+			public const int my_switch_selector = 2131231325;
 			
 			// aapt resource value: 0x7F08025E
-			public const int my_switch_selector = 2131231326;
+			public const int my_vr104d = 2131231326;
 			
 			// aapt resource value: 0x7F08025F
-			public const int my_vr104d = 2131231327;
+			public const int my_w1 = 2131231327;
 			
 			// aapt resource value: 0x7F080260
-			public const int my_w1 = 2131231328;
+			public const int my_w2d = 2131231328;
 			
 			// aapt resource value: 0x7F080261
-			public const int my_w2d = 2131231329;
+			public const int my_w2s = 2131231329;
 			
 			// aapt resource value: 0x7F080262
-			public const int my_w2s = 2131231330;
+			public const int my_w3 = 2131231330;
 			
 			// aapt resource value: 0x7F080263
-			public const int my_w3 = 2131231331;
+			public const int my_wlb = 2131231331;
 			
 			// aapt resource value: 0x7F080264
-			public const int my_wlb = 2131231332;
+			public const int my_x1 = 2131231332;
 			
 			// aapt resource value: 0x7F080265
-			public const int my_x1 = 2131231333;
+			public const int my_x2 = 2131231333;
 			
 			// aapt resource value: 0x7F080266
-			public const int my_x2 = 2131231334;
+			public const int my_x3 = 2131231334;
 			
 			// aapt resource value: 0x7F080267
-			public const int my_x3 = 2131231335;
+			public const int my_x3c = 2131231335;
 			
 			// aapt resource value: 0x7F080268
-			public const int my_x3c = 2131231336;
+			public const int my_x4 = 2131231336;
 			
 			// aapt resource value: 0x7F080269
-			public const int my_x4 = 2131231337;
+			public const int my_x5c = 2131231337;
 			
 			// aapt resource value: 0x7F08026A
-			public const int my_x5c = 2131231338;
+			public const int name_del = 2131231338;
 			
 			// aapt resource value: 0x7F08026B
-			public const int name_del = 2131231339;
+			public const int name_del_sel = 2131231339;
 			
 			// aapt resource value: 0x7F08026C
-			public const int name_del_sel = 2131231340;
+			public const int name_del_selector = 2131231340;
 			
 			// aapt resource value: 0x7F08026D
-			public const int name_del_selector = 2131231341;
-			
-			// aapt resource value: 0x7F08026E
-			public const int navigation_empty_icon = 2131231342;
-			
-			// aapt resource value: 0x7F080271
-			public const int nomessage = 2131231345;
-			
-			// aapt resource value: 0x7F080272
-			public const int notification_action_background = 2131231346;
-			
-			// aapt resource value: 0x7F080273
-			public const int notification_bg = 2131231347;
-			
-			// aapt resource value: 0x7F080274
-			public const int notification_bg_low = 2131231348;
-			
-			// aapt resource value: 0x7F080275
-			public const int notification_bg_low_normal = 2131231349;
-			
-			// aapt resource value: 0x7F080276
-			public const int notification_bg_low_pressed = 2131231350;
-			
-			// aapt resource value: 0x7F080277
-			public const int notification_bg_normal = 2131231351;
-			
-			// aapt resource value: 0x7F080278
-			public const int notification_bg_normal_pressed = 2131231352;
-			
-			// aapt resource value: 0x7F080279
-			public const int notification_icon_background = 2131231353;
-			
-			// aapt resource value: 0x7F08027A
-			public const int notification_template_icon_bg = 2131231354;
-			
-			// aapt resource value: 0x7F08027B
-			public const int notification_template_icon_low_bg = 2131231355;
-			
-			// aapt resource value: 0x7F08027C
-			public const int notification_tile_bg = 2131231356;
-			
-			// aapt resource value: 0x7F08027D
-			public const int notify_bg = 2131231357;
-			
-			// aapt resource value: 0x7F08027E
-			public const int notify_panel_notification_icon_bg = 2131231358;
-			
-			// aapt resource value: 0x7F08026F
-			public const int no_message = 2131231343;
+			public const int navigation_empty_icon = 2131231341;
 			
 			// aapt resource value: 0x7F080270
-			public const int no_read = 2131231344;
+			public const int nomessage = 2131231344;
+			
+			// aapt resource value: 0x7F080271
+			public const int notification_action_background = 2131231345;
+			
+			// aapt resource value: 0x7F080272
+			public const int notification_bg = 2131231346;
+			
+			// aapt resource value: 0x7F080273
+			public const int notification_bg_low = 2131231347;
+			
+			// aapt resource value: 0x7F080274
+			public const int notification_bg_low_normal = 2131231348;
+			
+			// aapt resource value: 0x7F080275
+			public const int notification_bg_low_pressed = 2131231349;
+			
+			// aapt resource value: 0x7F080276
+			public const int notification_bg_normal = 2131231350;
+			
+			// aapt resource value: 0x7F080277
+			public const int notification_bg_normal_pressed = 2131231351;
+			
+			// aapt resource value: 0x7F080278
+			public const int notification_icon_background = 2131231352;
+			
+			// aapt resource value: 0x7F080279
+			public const int notification_template_icon_bg = 2131231353;
+			
+			// aapt resource value: 0x7F08027A
+			public const int notification_template_icon_low_bg = 2131231354;
+			
+			// aapt resource value: 0x7F08027B
+			public const int notification_tile_bg = 2131231355;
+			
+			// aapt resource value: 0x7F08027C
+			public const int notify_bg = 2131231356;
+			
+			// aapt resource value: 0x7F08027D
+			public const int notify_panel_notification_icon_bg = 2131231357;
+			
+			// aapt resource value: 0x7F08026E
+			public const int no_message = 2131231342;
+			
+			// aapt resource value: 0x7F08026F
+			public const int no_read = 2131231343;
+			
+			// aapt resource value: 0x7F08027E
+			public const int number_bg = 2131231358;
 			
 			// aapt resource value: 0x7F08027F
-			public const int number_bg = 2131231359;
+			public const int offline = 2131231359;
 			
 			// aapt resource value: 0x7F080280
-			public const int offline = 2131231360;
+			public const int open_cameralist_alarmlist_selector = 2131231360;
 			
 			// aapt resource value: 0x7F080281
-			public const int open_cameralist_alarmlist_selector = 2131231361;
+			public const int open_cameralist_button_selector = 2131231361;
 			
 			// aapt resource value: 0x7F080282
-			public const int open_cameralist_button_selector = 2131231362;
+			public const int open_cameralist_remotepb_selector = 2131231362;
 			
 			// aapt resource value: 0x7F080283
-			public const int open_cameralist_remotepb_selector = 2131231363;
+			public const int open_cameralist_setup_selector = 2131231363;
 			
 			// aapt resource value: 0x7F080284
-			public const int open_cameralist_setup_selector = 2131231364;
+			public const int opinion = 2131231364;
 			
 			// aapt resource value: 0x7F080285
-			public const int opinion = 2131231365;
+			public const int palyback_alarm_icon2 = 2131231365;
 			
 			// aapt resource value: 0x7F080286
-			public const int palyback_alarm_icon2 = 2131231366;
+			public const int palyback_close = 2131231366;
 			
 			// aapt resource value: 0x7F080287
-			public const int palyback_close = 2131231367;
+			public const int palyback_close_sel = 2131231367;
 			
 			// aapt resource value: 0x7F080288
-			public const int palyback_close_sel = 2131231368;
+			public const int palyback_close_selector = 2131231368;
 			
 			// aapt resource value: 0x7F080289
-			public const int palyback_close_selector = 2131231369;
+			public const int palyback_date_down = 2131231369;
 			
 			// aapt resource value: 0x7F08028A
-			public const int palyback_date_down = 2131231370;
+			public const int palyback_date_down_sel = 2131231370;
 			
 			// aapt resource value: 0x7F08028B
-			public const int palyback_date_down_sel = 2131231371;
+			public const int palyback_full_down = 2131231371;
 			
 			// aapt resource value: 0x7F08028C
-			public const int palyback_full_down = 2131231372;
+			public const int palyback_full_up = 2131231372;
 			
 			// aapt resource value: 0x7F08028D
-			public const int palyback_full_up = 2131231373;
+			public const int palyback_nest = 2131231373;
 			
 			// aapt resource value: 0x7F08028E
-			public const int palyback_nest = 2131231374;
+			public const int palyback_pause = 2131231374;
 			
 			// aapt resource value: 0x7F08028F
-			public const int palyback_pause = 2131231375;
+			public const int palyback_pause_sel = 2131231375;
 			
 			// aapt resource value: 0x7F080290
-			public const int palyback_pause_sel = 2131231376;
+			public const int palyback_previously = 2131231376;
 			
 			// aapt resource value: 0x7F080291
-			public const int palyback_previously = 2131231377;
+			public const int palyback_previously_sel = 2131231377;
 			
 			// aapt resource value: 0x7F080292
-			public const int palyback_previously_sel = 2131231378;
+			public const int palyback_previously_selector = 2131231378;
 			
 			// aapt resource value: 0x7F080293
-			public const int palyback_previously_selector = 2131231379;
+			public const int palyback_replay = 2131231379;
 			
 			// aapt resource value: 0x7F080294
-			public const int palyback_replay = 2131231380;
+			public const int palyback_retry = 2131231380;
 			
 			// aapt resource value: 0x7F080295
-			public const int palyback_retry = 2131231381;
+			public const int palyback_time_bg = 2131231381;
 			
 			// aapt resource value: 0x7F080296
-			public const int palyback_time_bg = 2131231382;
+			public const int palyback_video = 2131231382;
 			
 			// aapt resource value: 0x7F080297
-			public const int palyback_video = 2131231383;
+			public const int palyback_video_now = 2131231383;
 			
 			// aapt resource value: 0x7F080298
-			public const int palyback_video_now = 2131231384;
+			public const int palyback_video_now_sel = 2131231384;
 			
 			// aapt resource value: 0x7F080299
-			public const int palyback_video_now_sel = 2131231385;
+			public const int palyback_video_now_selector = 2131231385;
 			
 			// aapt resource value: 0x7F08029A
-			public const int palyback_video_now_selector = 2131231386;
+			public const int palyback_video_sel = 2131231386;
 			
 			// aapt resource value: 0x7F08029B
-			public const int palyback_video_sel = 2131231387;
+			public const int palyback_video_selector = 2131231387;
 			
 			// aapt resource value: 0x7F08029C
-			public const int palyback_video_selector = 2131231388;
+			public const int pause = 2131231388;
 			
 			// aapt resource value: 0x7F08029D
-			public const int pause = 2131231389;
+			public const int pause_sel = 2131231389;
 			
 			// aapt resource value: 0x7F08029E
-			public const int pause_sel = 2131231390;
+			public const int pic_bg = 2131231390;
 			
 			// aapt resource value: 0x7F08029F
-			public const int pic_bg = 2131231391;
-			
-			// aapt resource value: 0x7F0802A0
-			public const int play = 2131231392;
-			
-			// aapt resource value: 0x7F0802FF
-			public const int playback = 2131231487;
-			
-			// aapt resource value: 0x7F08030F
-			public const int playbackslider = 2131231503;
-			
-			// aapt resource value: 0x7F080310
-			public const int playbackslider_sel = 2131231504;
-			
-			// aapt resource value: 0x7F080300
-			public const int playback_button = 2131231488;
-			
-			// aapt resource value: 0x7F080301
-			public const int playback_cancel = 2131231489;
-			
-			// aapt resource value: 0x7F080302
-			public const int playback_check_selector = 2131231490;
-			
-			// aapt resource value: 0x7F080303
-			public const int playback_cover2 = 2131231491;
-			
-			// aapt resource value: 0x7F080304
-			public const int playback_cut = 2131231492;
-			
-			// aapt resource value: 0x7F080305
-			public const int playback_cut_btn_selector = 2131231493;
-			
-			// aapt resource value: 0x7F080306
-			public const int playback_cut_disable = 2131231494;
-			
-			// aapt resource value: 0x7F080307
-			public const int playback_cut_sel = 2131231495;
-			
-			// aapt resource value: 0x7F080308
-			public const int playback_matte = 2131231496;
-			
-			// aapt resource value: 0x7F080309
-			public const int playback_more_down = 2131231497;
-			
-			// aapt resource value: 0x7F08030A
-			public const int playback_more_down1 = 2131231498;
-			
-			// aapt resource value: 0x7F08030B
-			public const int playback_more_up1 = 2131231499;
-			
-			// aapt resource value: 0x7F08030C
-			public const int playback_play = 2131231500;
-			
-			// aapt resource value: 0x7F08030D
-			public const int playback_play_sel = 2131231501;
-			
-			// aapt resource value: 0x7F08030E
-			public const int playback_sel = 2131231502;
-			
-			// aapt resource value: 0x7F080311
-			public const int playbtn_selector = 2131231505;
-			
-			// aapt resource value: 0x7F0802A1
-			public const int play_balanced = 2131231393;
-			
-			// aapt resource value: 0x7F0802A2
-			public const int play_balanced_disabel = 2131231394;
-			
-			// aapt resource value: 0x7F0802A3
-			public const int play_balanced_sel = 2131231395;
-			
-			// aapt resource value: 0x7F0802A4
-			public const int play_balanced_selector = 2131231396;
-			
-			// aapt resource value: 0x7F0802A5
-			public const int play_big = 2131231397;
-			
-			// aapt resource value: 0x7F0802A7
-			public const int play_bigbtn_selector = 2131231399;
-			
-			// aapt resource value: 0x7F0802A6
-			public const int play_big_press = 2131231398;
-			
-			// aapt resource value: 0x7F0802A8
-			public const int play_button_bg = 2131231400;
-			
-			// aapt resource value: 0x7F0802A9
-			public const int play_button_sel = 2131231401;
-			
-			// aapt resource value: 0x7F0802AA
-			public const int play_button_selector = 2131231402;
-			
-			// aapt resource value: 0x7F0802AB
-			public const int play_close = 2131231403;
-			
-			// aapt resource value: 0x7F0802AC
-			public const int play_close_sel = 2131231404;
-			
-			// aapt resource value: 0x7F0802AD
-			public const int play_close_selector = 2131231405;
-			
-			// aapt resource value: 0x7F0802AE
-			public const int play_disable = 2131231406;
-			
-			// aapt resource value: 0x7F0802AF
-			public const int play_flunet = 2131231407;
-			
-			// aapt resource value: 0x7F0802B0
-			public const int play_flunet_disabel = 2131231408;
-			
-			// aapt resource value: 0x7F0802B1
-			public const int play_flunet_sel = 2131231409;
-			
-			// aapt resource value: 0x7F0802B2
-			public const int play_flunet_selector = 2131231410;
-			
-			// aapt resource value: 0x7F0802B3
-			public const int play_full_loding_logo = 2131231411;
-			
-			// aapt resource value: 0x7F0802B4
-			public const int play_full_multiple = 2131231412;
-			
-			// aapt resource value: 0x7F0802B5
-			public const int play_full_multiple2 = 2131231413;
-			
-			// aapt resource value: 0x7F0802B6
-			public const int play_full_multiple3 = 2131231414;
-			
-			// aapt resource value: 0x7F0802B7
-			public const int play_full_multiple4 = 2131231415;
-			
-			// aapt resource value: 0x7F0802B8
-			public const int play_full_multiple5 = 2131231416;
-			
-			// aapt resource value: 0x7F0802B9
-			public const int play_full_pause = 2131231417;
-			
-			// aapt resource value: 0x7F0802BA
-			public const int play_full_pause_sel = 2131231418;
-			
-			// aapt resource value: 0x7F0802BB
-			public const int play_full_pause_selector = 2131231419;
-			
-			// aapt resource value: 0x7F0802BC
-			public const int play_full_play = 2131231420;
-			
-			// aapt resource value: 0x7F0802BD
-			public const int play_full_play_sel = 2131231421;
-			
-			// aapt resource value: 0x7F0802BE
-			public const int play_full_play_selector = 2131231422;
-			
-			// aapt resource value: 0x7F0802BF
-			public const int play_full_previously = 2131231423;
-			
-			// aapt resource value: 0x7F0802C0
-			public const int play_full_previously_sel = 2131231424;
-			
-			// aapt resource value: 0x7F0802C1
-			public const int play_full_previously_selector = 2131231425;
-			
-			// aapt resource value: 0x7F0802C2
-			public const int play_full_ptz_selector = 2131231426;
-			
-			// aapt resource value: 0x7F0802C3
-			public const int play_full_quality_color_selector = 2131231427;
-			
-			// aapt resource value: 0x7F0802C4
-			public const int play_full_quality_selector = 2131231428;
-			
-			// aapt resource value: 0x7F0802C5
-			public const int play_full_soundoff_btn_selector = 2131231429;
-			
-			// aapt resource value: 0x7F0802C6
-			public const int play_full_soundon_btn_selector = 2131231430;
-			
-			// aapt resource value: 0x7F0802C7
-			public const int play_full_stop = 2131231431;
-			
-			// aapt resource value: 0x7F0802C8
-			public const int play_full_stop_sel = 2131231432;
-			
-			// aapt resource value: 0x7F0802C9
-			public const int play_full_stop_selector = 2131231433;
-			
-			// aapt resource value: 0x7F0802CA
-			public const int play_full_talk_selector = 2131231434;
-			
-			// aapt resource value: 0x7F0802CB
-			public const int play_full_video = 2131231435;
-			
-			// aapt resource value: 0x7F0802CC
-			public const int play_full_video_now = 2131231436;
-			
-			// aapt resource value: 0x7F0802CD
-			public const int play_full_video_now_sel = 2131231437;
-			
-			// aapt resource value: 0x7F0802CE
-			public const int play_full_video_now_selector = 2131231438;
-			
-			// aapt resource value: 0x7F0802CF
-			public const int play_full_video_sel = 2131231439;
-			
-			// aapt resource value: 0x7F0802D0
-			public const int play_full_video_selector = 2131231440;
-			
-			// aapt resource value: 0x7F0802D1
-			public const int play_hd = 2131231441;
-			
-			// aapt resource value: 0x7F0802D2
-			public const int play_hd_disabel = 2131231442;
-			
-			// aapt resource value: 0x7F0802D3
-			public const int play_hd_sel = 2131231443;
-			
-			// aapt resource value: 0x7F0802D4
-			public const int play_hd_selector = 2131231444;
-			
-			// aapt resource value: 0x7F0802D5
-			public const int play_play = 2131231445;
-			
-			// aapt resource value: 0x7F0802D6
-			public const int play_play_dis = 2131231446;
-			
-			// aapt resource value: 0x7F0802D7
-			public const int play_play_sel = 2131231447;
-			
-			// aapt resource value: 0x7F0802D8
-			public const int play_play_selector = 2131231448;
-			
-			// aapt resource value: 0x7F0802D9
-			public const int play_press = 2131231449;
-			
-			// aapt resource value: 0x7F0802DA
-			public const int play_previously = 2131231450;
-			
-			// aapt resource value: 0x7F0802DB
-			public const int play_previously_dis = 2131231451;
-			
-			// aapt resource value: 0x7F0802DC
-			public const int play_previously_sel = 2131231452;
-			
-			// aapt resource value: 0x7F0802DD
-			public const int play_previously_selector = 2131231453;
-			
-			// aapt resource value: 0x7F0802DE
-			public const int play_privacy_selector = 2131231454;
-			
-			// aapt resource value: 0x7F0802DF
-			public const int play_ptz = 2131231455;
-			
-			// aapt resource value: 0x7F0802E0
-			public const int play_ptz_dis = 2131231456;
-			
-			// aapt resource value: 0x7F0802E1
-			public const int play_ptz_sel = 2131231457;
-			
-			// aapt resource value: 0x7F0802E2
-			public const int play_ptz_selector = 2131231458;
-			
-			// aapt resource value: 0x7F0802E3
-			public const int play_small = 2131231459;
-			
-			// aapt resource value: 0x7F0802E5
-			public const int play_smallbtn_selector = 2131231461;
-			
-			// aapt resource value: 0x7F0802E4
-			public const int play_small_press = 2131231460;
-			
-			// aapt resource value: 0x7F0802E6
-			public const int play_speech = 2131231462;
-			
-			// aapt resource value: 0x7F0802E7
-			public const int play_speech_dis = 2131231463;
-			
-			// aapt resource value: 0x7F0802E8
-			public const int play_speech_sel = 2131231464;
-			
-			// aapt resource value: 0x7F0802E9
-			public const int play_speech_selector = 2131231465;
-			
-			// aapt resource value: 0x7F0802EA
-			public const int play_stop = 2131231466;
-			
-			// aapt resource value: 0x7F0802EB
-			public const int play_stop_sel = 2131231467;
-			
-			// aapt resource value: 0x7F0802EC
-			public const int play_stop_selector = 2131231468;
-			
-			// aapt resource value: 0x7F0802ED
-			public const int play_talk = 2131231469;
-			
-			// aapt resource value: 0x7F0802F1
-			public const int play_talkback = 2131231473;
-			
-			// aapt resource value: 0x7F0802F2
-			public const int play_talkback_sel = 2131231474;
-			
-			// aapt resource value: 0x7F0802F3
-			public const int play_talkback_selector = 2131231475;
-			
-			// aapt resource value: 0x7F0802EE
-			public const int play_talk_dis = 2131231470;
-			
-			// aapt resource value: 0x7F0802EF
-			public const int play_talk_sel = 2131231471;
-			
-			// aapt resource value: 0x7F0802F0
-			public const int play_talk_selector = 2131231472;
-			
-			// aapt resource value: 0x7F0802F4
-			public const int play_video = 2131231476;
-			
-			// aapt resource value: 0x7F0802F5
-			public const int play_video_dis = 2131231477;
-			
-			// aapt resource value: 0x7F0802F6
-			public const int play_video_record = 2131231478;
-			
-			// aapt resource value: 0x7F0802F7
-			public const int play_video_sel = 2131231479;
-			
-			// aapt resource value: 0x7F0802F8
-			public const int play_video_selector = 2131231480;
-			
-			// aapt resource value: 0x7F0802F9
-			public const int play_video_start = 2131231481;
-			
-			// aapt resource value: 0x7F0802FA
-			public const int play_video_time_bg = 2131231482;
-			
-			// aapt resource value: 0x7F0802FB
-			public const int play_voice = 2131231483;
-			
-			// aapt resource value: 0x7F0802FC
-			public const int play_voice_dis = 2131231484;
-			
-			// aapt resource value: 0x7F0802FD
-			public const int play_voice_sel = 2131231485;
+			public const int play = 2131231391;
 			
 			// aapt resource value: 0x7F0802FE
-			public const int play_voice_selector = 2131231486;
+			public const int playback = 2131231486;
+			
+			// aapt resource value: 0x7F08030E
+			public const int playbackslider = 2131231502;
+			
+			// aapt resource value: 0x7F08030F
+			public const int playbackslider_sel = 2131231503;
+			
+			// aapt resource value: 0x7F0802FF
+			public const int playback_button = 2131231487;
+			
+			// aapt resource value: 0x7F080300
+			public const int playback_cancel = 2131231488;
+			
+			// aapt resource value: 0x7F080301
+			public const int playback_check_selector = 2131231489;
+			
+			// aapt resource value: 0x7F080302
+			public const int playback_cover2 = 2131231490;
+			
+			// aapt resource value: 0x7F080303
+			public const int playback_cut = 2131231491;
+			
+			// aapt resource value: 0x7F080304
+			public const int playback_cut_btn_selector = 2131231492;
+			
+			// aapt resource value: 0x7F080305
+			public const int playback_cut_disable = 2131231493;
+			
+			// aapt resource value: 0x7F080306
+			public const int playback_cut_sel = 2131231494;
+			
+			// aapt resource value: 0x7F080307
+			public const int playback_matte = 2131231495;
+			
+			// aapt resource value: 0x7F080308
+			public const int playback_more_down = 2131231496;
+			
+			// aapt resource value: 0x7F080309
+			public const int playback_more_down1 = 2131231497;
+			
+			// aapt resource value: 0x7F08030A
+			public const int playback_more_up1 = 2131231498;
+			
+			// aapt resource value: 0x7F08030B
+			public const int playback_play = 2131231499;
+			
+			// aapt resource value: 0x7F08030C
+			public const int playback_play_sel = 2131231500;
+			
+			// aapt resource value: 0x7F08030D
+			public const int playback_sel = 2131231501;
+			
+			// aapt resource value: 0x7F080310
+			public const int playbtn_selector = 2131231504;
+			
+			// aapt resource value: 0x7F0802A0
+			public const int play_balanced = 2131231392;
+			
+			// aapt resource value: 0x7F0802A1
+			public const int play_balanced_disabel = 2131231393;
+			
+			// aapt resource value: 0x7F0802A2
+			public const int play_balanced_sel = 2131231394;
+			
+			// aapt resource value: 0x7F0802A3
+			public const int play_balanced_selector = 2131231395;
+			
+			// aapt resource value: 0x7F0802A4
+			public const int play_big = 2131231396;
+			
+			// aapt resource value: 0x7F0802A6
+			public const int play_bigbtn_selector = 2131231398;
+			
+			// aapt resource value: 0x7F0802A5
+			public const int play_big_press = 2131231397;
+			
+			// aapt resource value: 0x7F0802A7
+			public const int play_button_bg = 2131231399;
+			
+			// aapt resource value: 0x7F0802A8
+			public const int play_button_sel = 2131231400;
+			
+			// aapt resource value: 0x7F0802A9
+			public const int play_button_selector = 2131231401;
+			
+			// aapt resource value: 0x7F0802AA
+			public const int play_close = 2131231402;
+			
+			// aapt resource value: 0x7F0802AB
+			public const int play_close_sel = 2131231403;
+			
+			// aapt resource value: 0x7F0802AC
+			public const int play_close_selector = 2131231404;
+			
+			// aapt resource value: 0x7F0802AD
+			public const int play_disable = 2131231405;
+			
+			// aapt resource value: 0x7F0802AE
+			public const int play_flunet = 2131231406;
+			
+			// aapt resource value: 0x7F0802AF
+			public const int play_flunet_disabel = 2131231407;
+			
+			// aapt resource value: 0x7F0802B0
+			public const int play_flunet_sel = 2131231408;
+			
+			// aapt resource value: 0x7F0802B1
+			public const int play_flunet_selector = 2131231409;
+			
+			// aapt resource value: 0x7F0802B2
+			public const int play_full_loding_logo = 2131231410;
+			
+			// aapt resource value: 0x7F0802B3
+			public const int play_full_multiple = 2131231411;
+			
+			// aapt resource value: 0x7F0802B4
+			public const int play_full_multiple2 = 2131231412;
+			
+			// aapt resource value: 0x7F0802B5
+			public const int play_full_multiple3 = 2131231413;
+			
+			// aapt resource value: 0x7F0802B6
+			public const int play_full_multiple4 = 2131231414;
+			
+			// aapt resource value: 0x7F0802B7
+			public const int play_full_multiple5 = 2131231415;
+			
+			// aapt resource value: 0x7F0802B8
+			public const int play_full_pause = 2131231416;
+			
+			// aapt resource value: 0x7F0802B9
+			public const int play_full_pause_sel = 2131231417;
+			
+			// aapt resource value: 0x7F0802BA
+			public const int play_full_pause_selector = 2131231418;
+			
+			// aapt resource value: 0x7F0802BB
+			public const int play_full_play = 2131231419;
+			
+			// aapt resource value: 0x7F0802BC
+			public const int play_full_play_sel = 2131231420;
+			
+			// aapt resource value: 0x7F0802BD
+			public const int play_full_play_selector = 2131231421;
+			
+			// aapt resource value: 0x7F0802BE
+			public const int play_full_previously = 2131231422;
+			
+			// aapt resource value: 0x7F0802BF
+			public const int play_full_previously_sel = 2131231423;
+			
+			// aapt resource value: 0x7F0802C0
+			public const int play_full_previously_selector = 2131231424;
+			
+			// aapt resource value: 0x7F0802C1
+			public const int play_full_ptz_selector = 2131231425;
+			
+			// aapt resource value: 0x7F0802C2
+			public const int play_full_quality_color_selector = 2131231426;
+			
+			// aapt resource value: 0x7F0802C3
+			public const int play_full_quality_selector = 2131231427;
+			
+			// aapt resource value: 0x7F0802C4
+			public const int play_full_soundoff_btn_selector = 2131231428;
+			
+			// aapt resource value: 0x7F0802C5
+			public const int play_full_soundon_btn_selector = 2131231429;
+			
+			// aapt resource value: 0x7F0802C6
+			public const int play_full_stop = 2131231430;
+			
+			// aapt resource value: 0x7F0802C7
+			public const int play_full_stop_sel = 2131231431;
+			
+			// aapt resource value: 0x7F0802C8
+			public const int play_full_stop_selector = 2131231432;
+			
+			// aapt resource value: 0x7F0802C9
+			public const int play_full_talk_selector = 2131231433;
+			
+			// aapt resource value: 0x7F0802CA
+			public const int play_full_video = 2131231434;
+			
+			// aapt resource value: 0x7F0802CB
+			public const int play_full_video_now = 2131231435;
+			
+			// aapt resource value: 0x7F0802CC
+			public const int play_full_video_now_sel = 2131231436;
+			
+			// aapt resource value: 0x7F0802CD
+			public const int play_full_video_now_selector = 2131231437;
+			
+			// aapt resource value: 0x7F0802CE
+			public const int play_full_video_sel = 2131231438;
+			
+			// aapt resource value: 0x7F0802CF
+			public const int play_full_video_selector = 2131231439;
+			
+			// aapt resource value: 0x7F0802D0
+			public const int play_hd = 2131231440;
+			
+			// aapt resource value: 0x7F0802D1
+			public const int play_hd_disabel = 2131231441;
+			
+			// aapt resource value: 0x7F0802D2
+			public const int play_hd_sel = 2131231442;
+			
+			// aapt resource value: 0x7F0802D3
+			public const int play_hd_selector = 2131231443;
+			
+			// aapt resource value: 0x7F0802D4
+			public const int play_play = 2131231444;
+			
+			// aapt resource value: 0x7F0802D5
+			public const int play_play_dis = 2131231445;
+			
+			// aapt resource value: 0x7F0802D6
+			public const int play_play_sel = 2131231446;
+			
+			// aapt resource value: 0x7F0802D7
+			public const int play_play_selector = 2131231447;
+			
+			// aapt resource value: 0x7F0802D8
+			public const int play_press = 2131231448;
+			
+			// aapt resource value: 0x7F0802D9
+			public const int play_previously = 2131231449;
+			
+			// aapt resource value: 0x7F0802DA
+			public const int play_previously_dis = 2131231450;
+			
+			// aapt resource value: 0x7F0802DB
+			public const int play_previously_sel = 2131231451;
+			
+			// aapt resource value: 0x7F0802DC
+			public const int play_previously_selector = 2131231452;
+			
+			// aapt resource value: 0x7F0802DD
+			public const int play_privacy_selector = 2131231453;
+			
+			// aapt resource value: 0x7F0802DE
+			public const int play_ptz = 2131231454;
+			
+			// aapt resource value: 0x7F0802DF
+			public const int play_ptz_dis = 2131231455;
+			
+			// aapt resource value: 0x7F0802E0
+			public const int play_ptz_sel = 2131231456;
+			
+			// aapt resource value: 0x7F0802E1
+			public const int play_ptz_selector = 2131231457;
+			
+			// aapt resource value: 0x7F0802E2
+			public const int play_small = 2131231458;
+			
+			// aapt resource value: 0x7F0802E4
+			public const int play_smallbtn_selector = 2131231460;
+			
+			// aapt resource value: 0x7F0802E3
+			public const int play_small_press = 2131231459;
+			
+			// aapt resource value: 0x7F0802E5
+			public const int play_speech = 2131231461;
+			
+			// aapt resource value: 0x7F0802E6
+			public const int play_speech_dis = 2131231462;
+			
+			// aapt resource value: 0x7F0802E7
+			public const int play_speech_sel = 2131231463;
+			
+			// aapt resource value: 0x7F0802E8
+			public const int play_speech_selector = 2131231464;
+			
+			// aapt resource value: 0x7F0802E9
+			public const int play_stop = 2131231465;
+			
+			// aapt resource value: 0x7F0802EA
+			public const int play_stop_sel = 2131231466;
+			
+			// aapt resource value: 0x7F0802EB
+			public const int play_stop_selector = 2131231467;
+			
+			// aapt resource value: 0x7F0802EC
+			public const int play_talk = 2131231468;
+			
+			// aapt resource value: 0x7F0802F0
+			public const int play_talkback = 2131231472;
+			
+			// aapt resource value: 0x7F0802F1
+			public const int play_talkback_sel = 2131231473;
+			
+			// aapt resource value: 0x7F0802F2
+			public const int play_talkback_selector = 2131231474;
+			
+			// aapt resource value: 0x7F0802ED
+			public const int play_talk_dis = 2131231469;
+			
+			// aapt resource value: 0x7F0802EE
+			public const int play_talk_sel = 2131231470;
+			
+			// aapt resource value: 0x7F0802EF
+			public const int play_talk_selector = 2131231471;
+			
+			// aapt resource value: 0x7F0802F3
+			public const int play_video = 2131231475;
+			
+			// aapt resource value: 0x7F0802F4
+			public const int play_video_dis = 2131231476;
+			
+			// aapt resource value: 0x7F0802F5
+			public const int play_video_record = 2131231477;
+			
+			// aapt resource value: 0x7F0802F6
+			public const int play_video_sel = 2131231478;
+			
+			// aapt resource value: 0x7F0802F7
+			public const int play_video_selector = 2131231479;
+			
+			// aapt resource value: 0x7F0802F8
+			public const int play_video_start = 2131231480;
+			
+			// aapt resource value: 0x7F0802F9
+			public const int play_video_time_bg = 2131231481;
+			
+			// aapt resource value: 0x7F0802FA
+			public const int play_voice = 2131231482;
+			
+			// aapt resource value: 0x7F0802FB
+			public const int play_voice_dis = 2131231483;
+			
+			// aapt resource value: 0x7F0802FC
+			public const int play_voice_sel = 2131231484;
+			
+			// aapt resource value: 0x7F0802FD
+			public const int play_voice_selector = 2131231485;
+			
+			// aapt resource value: 0x7F080311
+			public const int popdialogbg = 2131231505;
 			
 			// aapt resource value: 0x7F080312
-			public const int popdialogbg = 2131231506;
+			public const int prepare_device = 2131231506;
 			
 			// aapt resource value: 0x7F080313
-			public const int prepare_device = 2131231507;
+			public const int preview_close1_video_ico = 2131231507;
 			
 			// aapt resource value: 0x7F080314
-			public const int preview_close1_video_ico = 2131231508;
+			public const int preview_close_video = 2131231508;
 			
 			// aapt resource value: 0x7F080315
-			public const int preview_close_video = 2131231509;
+			public const int preview_close_video_dis = 2131231509;
 			
 			// aapt resource value: 0x7F080316
-			public const int preview_close_video_dis = 2131231510;
+			public const int preview_close_video_sel = 2131231510;
 			
 			// aapt resource value: 0x7F080317
-			public const int preview_close_video_sel = 2131231511;
+			public const int preview_down_bg_normal = 2131231511;
 			
 			// aapt resource value: 0x7F080318
-			public const int preview_down_bg_normal = 2131231512;
+			public const int preview_down_bg_pressed = 2131231512;
 			
 			// aapt resource value: 0x7F080319
-			public const int preview_down_bg_pressed = 2131231513;
+			public const int preview_down_ico = 2131231513;
 			
 			// aapt resource value: 0x7F08031A
-			public const int preview_down_ico = 2131231514;
+			public const int preview_down_selector = 2131231514;
 			
 			// aapt resource value: 0x7F08031B
-			public const int preview_down_selector = 2131231515;
+			public const int preview_enlarge = 2131231515;
 			
 			// aapt resource value: 0x7F08031C
-			public const int preview_enlarge = 2131231516;
+			public const int preview_enlarge_btn_sel = 2131231516;
 			
 			// aapt resource value: 0x7F08031D
-			public const int preview_enlarge_btn_sel = 2131231517;
+			public const int preview_enlarge_dis = 2131231517;
 			
 			// aapt resource value: 0x7F08031E
-			public const int preview_enlarge_dis = 2131231518;
+			public const int preview_enlarge_selector = 2131231518;
 			
 			// aapt resource value: 0x7F08031F
-			public const int preview_enlarge_selector = 2131231519;
+			public const int preview_play_btn = 2131231519;
 			
 			// aapt resource value: 0x7F080320
-			public const int preview_play_btn = 2131231520;
+			public const int preview_play_btn_dis = 2131231520;
 			
 			// aapt resource value: 0x7F080321
-			public const int preview_play_btn_dis = 2131231521;
+			public const int preview_play_btn_sel = 2131231521;
 			
 			// aapt resource value: 0x7F080322
-			public const int preview_play_btn_sel = 2131231522;
+			public const int preview_recording = 2131231522;
 			
 			// aapt resource value: 0x7F080323
-			public const int preview_recording = 2131231523;
+			public const int preview_recording_dis = 2131231523;
 			
 			// aapt resource value: 0x7F080324
-			public const int preview_recording_dis = 2131231524;
+			public const int preview_recording_sel = 2131231524;
 			
 			// aapt resource value: 0x7F080325
-			public const int preview_recording_sel = 2131231525;
+			public const int preview_selection_bg = 2131231525;
 			
 			// aapt resource value: 0x7F080326
-			public const int preview_selection_bg = 2131231526;
+			public const int preview_stopplay_btn_dis = 2131231526;
 			
 			// aapt resource value: 0x7F080327
-			public const int preview_stopplay_btn_dis = 2131231527;
+			public const int preview_unvoice_btn = 2131231527;
 			
 			// aapt resource value: 0x7F080328
-			public const int preview_unvoice_btn = 2131231528;
+			public const int preview_unvoice_btn_sel = 2131231528;
 			
 			// aapt resource value: 0x7F080329
-			public const int preview_unvoice_btn_sel = 2131231529;
+			public const int preview_video_selection = 2131231529;
 			
 			// aapt resource value: 0x7F08032A
-			public const int preview_video_selection = 2131231530;
+			public const int preview_video_selection_hover = 2131231530;
 			
 			// aapt resource value: 0x7F08032B
-			public const int preview_video_selection_hover = 2131231531;
+			public const int preview_voice_btn = 2131231531;
 			
 			// aapt resource value: 0x7F08032C
-			public const int preview_voice_btn = 2131231532;
+			public const int preview_voice_btn_dis = 2131231532;
 			
 			// aapt resource value: 0x7F08032D
-			public const int preview_voice_btn_dis = 2131231533;
+			public const int preview_voice_btn_sel = 2131231533;
 			
 			// aapt resource value: 0x7F08032E
-			public const int preview_voice_btn_sel = 2131231534;
+			public const int previously = 2131231534;
 			
 			// aapt resource value: 0x7F08032F
-			public const int previously = 2131231535;
+			public const int previously_dis = 2131231535;
 			
 			// aapt resource value: 0x7F080330
-			public const int previously_dis = 2131231536;
+			public const int previously_sel = 2131231536;
 			
 			// aapt resource value: 0x7F080331
-			public const int previously_sel = 2131231537;
+			public const int ptz_bg = 2131231537;
 			
 			// aapt resource value: 0x7F080332
-			public const int ptz_bg = 2131231538;
+			public const int ptz_bottom_limit = 2131231538;
 			
 			// aapt resource value: 0x7F080333
-			public const int ptz_bottom_limit = 2131231539;
+			public const int ptz_bottom_sel = 2131231539;
 			
 			// aapt resource value: 0x7F080334
-			public const int ptz_bottom_sel = 2131231540;
+			public const int ptz_left_limit = 2131231540;
 			
 			// aapt resource value: 0x7F080335
-			public const int ptz_left_limit = 2131231541;
+			public const int ptz_left_sel = 2131231541;
 			
 			// aapt resource value: 0x7F080336
-			public const int ptz_left_sel = 2131231542;
+			public const int ptz_prompt = 2131231542;
 			
 			// aapt resource value: 0x7F080337
-			public const int ptz_prompt = 2131231543;
+			public const int ptz_right_limit = 2131231543;
 			
 			// aapt resource value: 0x7F080338
-			public const int ptz_right_limit = 2131231544;
+			public const int ptz_right_sel = 2131231544;
 			
 			// aapt resource value: 0x7F080339
-			public const int ptz_right_sel = 2131231545;
+			public const int ptz_top_limit = 2131231545;
 			
 			// aapt resource value: 0x7F08033A
-			public const int ptz_top_limit = 2131231546;
+			public const int ptz_turn = 2131231546;
 			
 			// aapt resource value: 0x7F08033B
-			public const int ptz_turn = 2131231547;
+			public const int ptz_turn_sel = 2131231547;
 			
 			// aapt resource value: 0x7F08033C
-			public const int ptz_turn_sel = 2131231548;
+			public const int ptz_turn_selector = 2131231548;
 			
 			// aapt resource value: 0x7F08033D
-			public const int ptz_turn_selector = 2131231549;
+			public const int ptz_up_sel = 2131231549;
 			
 			// aapt resource value: 0x7F08033E
-			public const int ptz_up_sel = 2131231550;
+			public const int push_close = 2131231550;
 			
 			// aapt resource value: 0x7F08033F
-			public const int push_close = 2131231551;
+			public const int push_close_sel = 2131231551;
 			
 			// aapt resource value: 0x7F080340
-			public const int push_close_sel = 2131231552;
+			public const int push_close_selector = 2131231552;
 			
 			// aapt resource value: 0x7F080341
-			public const int push_close_selector = 2131231553;
+			public const int put_ico = 2131231553;
 			
 			// aapt resource value: 0x7F080342
-			public const int put_ico = 2131231554;
+			public const int query_loding1 = 2131231554;
 			
 			// aapt resource value: 0x7F080343
-			public const int query_loding1 = 2131231555;
+			public const int query_loding2 = 2131231555;
 			
 			// aapt resource value: 0x7F080344
-			public const int query_loding2 = 2131231556;
+			public const int query_loding3 = 2131231556;
 			
 			// aapt resource value: 0x7F080345
-			public const int query_loding3 = 2131231557;
+			public const int query_loding4 = 2131231557;
 			
 			// aapt resource value: 0x7F080346
-			public const int query_loding4 = 2131231558;
+			public const int query_loding5 = 2131231558;
 			
 			// aapt resource value: 0x7F080347
-			public const int query_loding5 = 2131231559;
+			public const int radius_rect_bg_qq_group = 2131231559;
 			
 			// aapt resource value: 0x7F080348
-			public const int radius_rect_bg_qq_group = 2131231560;
+			public const int read_button = 2131231560;
 			
 			// aapt resource value: 0x7F080349
-			public const int read_button = 2131231561;
+			public const int read_button_sel = 2131231561;
 			
 			// aapt resource value: 0x7F08034A
-			public const int read_button_sel = 2131231562;
+			public const int read_button_selector = 2131231562;
 			
 			// aapt resource value: 0x7F08034B
-			public const int read_button_selector = 2131231563;
+			public const int refresh_selector = 2131231563;
 			
 			// aapt resource value: 0x7F08034C
-			public const int refresh_selector = 2131231564;
+			public const int register_server_bg = 2131231564;
 			
 			// aapt resource value: 0x7F08034D
-			public const int register_server_bg = 2131231565;
+			public const int remote_cal_selector = 2131231565;
 			
 			// aapt resource value: 0x7F08034E
-			public const int remote_cal_selector = 2131231566;
+			public const int remote_exit_btn_selector = 2131231566;
 			
 			// aapt resource value: 0x7F08034F
-			public const int remote_exit_btn_selector = 2131231567;
+			public const int remote_list_pause_btn_selector = 2131231567;
 			
 			// aapt resource value: 0x7F080350
-			public const int remote_list_pause_btn_selector = 2131231568;
+			public const int remote_list_play_btn_selector = 2131231568;
 			
 			// aapt resource value: 0x7F080351
-			public const int remote_list_play_btn_selector = 2131231569;
+			public const int remote_list_soundoff_btn_selector = 2131231569;
 			
 			// aapt resource value: 0x7F080352
-			public const int remote_list_soundoff_btn_selector = 2131231570;
+			public const int remote_list_soundon_btn_selector = 2131231570;
 			
 			// aapt resource value: 0x7F080353
-			public const int remote_list_soundon_btn_selector = 2131231571;
+			public const int remote_play = 2131231571;
 			
 			// aapt resource value: 0x7F080354
-			public const int remote_play = 2131231572;
+			public const int remote_play_sel = 2131231572;
 			
 			// aapt resource value: 0x7F080355
-			public const int remote_play_sel = 2131231573;
+			public const int remote_seekbar_style = 2131231573;
 			
 			// aapt resource value: 0x7F080356
-			public const int remote_seekbar_style = 2131231574;
+			public const int remote_seekbar_thumb = 2131231574;
 			
 			// aapt resource value: 0x7F080357
-			public const int remote_seekbar_thumb = 2131231575;
-			
-			// aapt resource value: 0x7F080358
-			public const int reset_deivce = 2131231576;
-			
-			// aapt resource value: 0x7F080365
-			public const int results_4_dvr = 2131231589;
-			
-			// aapt resource value: 0x7F080366
-			public const int results_8_16_nvr = 2131231590;
-			
-			// aapt resource value: 0x7F080367
-			public const int results_8_nvr = 2131231591;
-			
-			// aapt resource value: 0x7F080368
-			public const int results_c6p = 2131231592;
-			
-			// aapt resource value: 0x7F080369
-			public const int results_mini_360_plus = 2131231593;
-			
-			// aapt resource value: 0x7F08036A
-			public const int results_mini_trooper = 2131231594;
-			
-			// aapt resource value: 0x7F08036B
-			public const int results_pic_a1 = 2131231595;
-			
-			// aapt resource value: 0x7F08036C
-			public const int results_pic_a1c = 2131231596;
-			
-			// aapt resource value: 0x7F08036D
-			public const int results_pic_a1s = 2131231597;
-			
-			// aapt resource value: 0x7F08036E
-			public const int results_pic_baidu_c2s = 2131231598;
-			
-			// aapt resource value: 0x7F08036F
-			public const int results_pic_bg = 2131231599;
-			
-			// aapt resource value: 0x7F080370
-			public const int results_pic_c1 = 2131231600;
-			
-			// aapt resource value: 0x7F080371
-			public const int results_pic_c2 = 2131231601;
-			
-			// aapt resource value: 0x7F080374
-			public const int results_pic_c2c = 2131231604;
-			
-			// aapt resource value: 0x7F080375
-			public const int results_pic_c2mini = 2131231605;
-			
-			// aapt resource value: 0x7F080376
-			public const int results_pic_c2mini2 = 2131231606;
-			
-			// aapt resource value: 0x7F080377
-			public const int results_pic_c2plus = 2131231607;
-			
-			// aapt resource value: 0x7F080378
-			public const int results_pic_c2s = 2131231608;
-			
-			// aapt resource value: 0x7F080379
-			public const int results_pic_c2w = 2131231609;
-			
-			// aapt resource value: 0x7F080372
-			public const int results_pic_c2_2 = 2131231602;
-			
-			// aapt resource value: 0x7F080373
-			public const int results_pic_c2_usa = 2131231603;
-			
-			// aapt resource value: 0x7F08037A
-			public const int results_pic_c3 = 2131231610;
-			
-			// aapt resource value: 0x7F08037B
-			public const int results_pic_c3c = 2131231611;
-			
-			// aapt resource value: 0x7F08037C
-			public const int results_pic_c3e = 2131231612;
-			
-			// aapt resource value: 0x7F08037D
-			public const int results_pic_c3s = 2131231613;
-			
-			// aapt resource value: 0x7F08037E
-			public const int results_pic_c4 = 2131231614;
-			
-			// aapt resource value: 0x7F08037F
-			public const int results_pic_c4c = 2131231615;
-			
-			// aapt resource value: 0x7F080380
-			public const int results_pic_c4e = 2131231616;
-			
-			// aapt resource value: 0x7F080381
-			public const int results_pic_c4s = 2131231617;
-			
-			// aapt resource value: 0x7F080382
-			public const int results_pic_c6 = 2131231618;
-			
-			// aapt resource value: 0x7F080383
-			public const int results_pic_c6c = 2131231619;
-			
-			// aapt resource value: 0x7F080384
-			public const int results_pic_c6c_1 = 2131231620;
-			
-			// aapt resource value: 0x7F080385
-			public const int results_pic_c6c_2 = 2131231621;
-			
-			// aapt resource value: 0x7F080386
-			public const int results_pic_c6h = 2131231622;
-			
-			// aapt resource value: 0x7F080387
-			public const int results_pic_co2 = 2131231623;
-			
-			// aapt resource value: 0x7F080388
-			public const int results_pic_d1 = 2131231624;
-			
-			// aapt resource value: 0x7F080389
-			public const int results_pic_default = 2131231625;
-			
-			// aapt resource value: 0x7F08038A
-			public const int results_pic_f1 = 2131231626;
-			
-			// aapt resource value: 0x7F08038B
-			public const int results_pic_h2c = 2131231627;
-			
-			// aapt resource value: 0x7F08038C
-			public const int results_pic_h2s = 2131231628;
-			
-			// aapt resource value: 0x7F08038D
-			public const int results_pic_n1 = 2131231629;
-			
-			// aapt resource value: 0x7F08038E
-			public const int results_pic_n1w = 2131231630;
-			
-			// aapt resource value: 0x7F08038F
-			public const int results_pic_r1 = 2131231631;
-			
-			// aapt resource value: 0x7F080390
-			public const int results_pic_r2 = 2131231632;
-			
-			// aapt resource value: 0x7F080391
-			public const int results_pic_w1 = 2131231633;
-			
-			// aapt resource value: 0x7F080392
-			public const int results_pic_w3 = 2131231634;
-			
-			// aapt resource value: 0x7F080393
-			public const int results_pic_x1 = 2131231635;
-			
-			// aapt resource value: 0x7F080394
-			public const int results_pic_x2 = 2131231636;
-			
-			// aapt resource value: 0x7F080395
-			public const int results_pic_x3 = 2131231637;
-			
-			// aapt resource value: 0x7F080396
-			public const int results_pic_x3c = 2131231638;
-			
-			// aapt resource value: 0x7F080397
-			public const int results_pic_x4 = 2131231639;
-			
-			// aapt resource value: 0x7F080398
-			public const int results_pic_z1 = 2131231640;
-			
-			// aapt resource value: 0x7F080399
-			public const int results_w2d = 2131231641;
-			
-			// aapt resource value: 0x7F08039A
-			public const int results_w2s = 2131231642;
-			
-			// aapt resource value: 0x7F08039B
-			public const int results_wlb = 2131231643;
-			
-			// aapt resource value: 0x7F08039C
-			public const int results_x5_108tp = 2131231644;
-			
-			// aapt resource value: 0x7F080359
-			public const int result_5k_vr104d = 2131231577;
-			
-			// aapt resource value: 0x7F08035A
-			public const int result_5k_vr116d = 2131231578;
-			
-			// aapt resource value: 0x7F08035B
-			public const int result_8_16dvr = 2131231579;
-			
-			// aapt resource value: 0x7F08035C
-			public const int result_cs_c3w = 2131231580;
-			
-			// aapt resource value: 0x7F08035D
-			public const int result_cs_vr104d = 2131231581;
-			
-			// aapt resource value: 0x7F08035E
-			public const int result_cs_vr108d = 2131231582;
-			
-			// aapt resource value: 0x7F08035F
-			public const int result_cs_vr116d = 2131231583;
-			
-			// aapt resource value: 0x7F080360
-			public const int result_pic_dh1 = 2131231584;
-			
-			// aapt resource value: 0x7F080361
-			public const int result_pic_doorbell = 2131231585;
-			
-			// aapt resource value: 0x7F080362
-			public const int result_pic_doorbell_hik = 2131231586;
-			
-			// aapt resource value: 0x7F080363
-			public const int result_pic_light = 2131231587;
+			public const int reset_deivce = 2131231575;
 			
 			// aapt resource value: 0x7F080364
-			public const int result_x5c = 2131231588;
+			public const int results_4_dvr = 2131231588;
+			
+			// aapt resource value: 0x7F080365
+			public const int results_8_16_nvr = 2131231589;
+			
+			// aapt resource value: 0x7F080366
+			public const int results_8_nvr = 2131231590;
+			
+			// aapt resource value: 0x7F080367
+			public const int results_c6p = 2131231591;
+			
+			// aapt resource value: 0x7F080368
+			public const int results_mini_360_plus = 2131231592;
+			
+			// aapt resource value: 0x7F080369
+			public const int results_mini_trooper = 2131231593;
+			
+			// aapt resource value: 0x7F08036A
+			public const int results_pic_a1 = 2131231594;
+			
+			// aapt resource value: 0x7F08036B
+			public const int results_pic_a1c = 2131231595;
+			
+			// aapt resource value: 0x7F08036C
+			public const int results_pic_a1s = 2131231596;
+			
+			// aapt resource value: 0x7F08036D
+			public const int results_pic_baidu_c2s = 2131231597;
+			
+			// aapt resource value: 0x7F08036E
+			public const int results_pic_bg = 2131231598;
+			
+			// aapt resource value: 0x7F08036F
+			public const int results_pic_c1 = 2131231599;
+			
+			// aapt resource value: 0x7F080370
+			public const int results_pic_c2 = 2131231600;
+			
+			// aapt resource value: 0x7F080373
+			public const int results_pic_c2c = 2131231603;
+			
+			// aapt resource value: 0x7F080374
+			public const int results_pic_c2mini = 2131231604;
+			
+			// aapt resource value: 0x7F080375
+			public const int results_pic_c2mini2 = 2131231605;
+			
+			// aapt resource value: 0x7F080376
+			public const int results_pic_c2plus = 2131231606;
+			
+			// aapt resource value: 0x7F080377
+			public const int results_pic_c2s = 2131231607;
+			
+			// aapt resource value: 0x7F080378
+			public const int results_pic_c2w = 2131231608;
+			
+			// aapt resource value: 0x7F080371
+			public const int results_pic_c2_2 = 2131231601;
+			
+			// aapt resource value: 0x7F080372
+			public const int results_pic_c2_usa = 2131231602;
+			
+			// aapt resource value: 0x7F080379
+			public const int results_pic_c3 = 2131231609;
+			
+			// aapt resource value: 0x7F08037A
+			public const int results_pic_c3c = 2131231610;
+			
+			// aapt resource value: 0x7F08037B
+			public const int results_pic_c3e = 2131231611;
+			
+			// aapt resource value: 0x7F08037C
+			public const int results_pic_c3s = 2131231612;
+			
+			// aapt resource value: 0x7F08037D
+			public const int results_pic_c4 = 2131231613;
+			
+			// aapt resource value: 0x7F08037E
+			public const int results_pic_c4c = 2131231614;
+			
+			// aapt resource value: 0x7F08037F
+			public const int results_pic_c4e = 2131231615;
+			
+			// aapt resource value: 0x7F080380
+			public const int results_pic_c4s = 2131231616;
+			
+			// aapt resource value: 0x7F080381
+			public const int results_pic_c6 = 2131231617;
+			
+			// aapt resource value: 0x7F080382
+			public const int results_pic_c6c = 2131231618;
+			
+			// aapt resource value: 0x7F080383
+			public const int results_pic_c6c_1 = 2131231619;
+			
+			// aapt resource value: 0x7F080384
+			public const int results_pic_c6c_2 = 2131231620;
+			
+			// aapt resource value: 0x7F080385
+			public const int results_pic_c6h = 2131231621;
+			
+			// aapt resource value: 0x7F080386
+			public const int results_pic_co2 = 2131231622;
+			
+			// aapt resource value: 0x7F080387
+			public const int results_pic_d1 = 2131231623;
+			
+			// aapt resource value: 0x7F080388
+			public const int results_pic_default = 2131231624;
+			
+			// aapt resource value: 0x7F080389
+			public const int results_pic_f1 = 2131231625;
+			
+			// aapt resource value: 0x7F08038A
+			public const int results_pic_h2c = 2131231626;
+			
+			// aapt resource value: 0x7F08038B
+			public const int results_pic_h2s = 2131231627;
+			
+			// aapt resource value: 0x7F08038C
+			public const int results_pic_n1 = 2131231628;
+			
+			// aapt resource value: 0x7F08038D
+			public const int results_pic_n1w = 2131231629;
+			
+			// aapt resource value: 0x7F08038E
+			public const int results_pic_r1 = 2131231630;
+			
+			// aapt resource value: 0x7F08038F
+			public const int results_pic_r2 = 2131231631;
+			
+			// aapt resource value: 0x7F080390
+			public const int results_pic_w1 = 2131231632;
+			
+			// aapt resource value: 0x7F080391
+			public const int results_pic_w3 = 2131231633;
+			
+			// aapt resource value: 0x7F080392
+			public const int results_pic_x1 = 2131231634;
+			
+			// aapt resource value: 0x7F080393
+			public const int results_pic_x2 = 2131231635;
+			
+			// aapt resource value: 0x7F080394
+			public const int results_pic_x3 = 2131231636;
+			
+			// aapt resource value: 0x7F080395
+			public const int results_pic_x3c = 2131231637;
+			
+			// aapt resource value: 0x7F080396
+			public const int results_pic_x4 = 2131231638;
+			
+			// aapt resource value: 0x7F080397
+			public const int results_pic_z1 = 2131231639;
+			
+			// aapt resource value: 0x7F080398
+			public const int results_w2d = 2131231640;
+			
+			// aapt resource value: 0x7F080399
+			public const int results_w2s = 2131231641;
+			
+			// aapt resource value: 0x7F08039A
+			public const int results_wlb = 2131231642;
+			
+			// aapt resource value: 0x7F08039B
+			public const int results_x5_108tp = 2131231643;
+			
+			// aapt resource value: 0x7F080358
+			public const int result_5k_vr104d = 2131231576;
+			
+			// aapt resource value: 0x7F080359
+			public const int result_5k_vr116d = 2131231577;
+			
+			// aapt resource value: 0x7F08035A
+			public const int result_8_16dvr = 2131231578;
+			
+			// aapt resource value: 0x7F08035B
+			public const int result_cs_c3w = 2131231579;
+			
+			// aapt resource value: 0x7F08035C
+			public const int result_cs_vr104d = 2131231580;
+			
+			// aapt resource value: 0x7F08035D
+			public const int result_cs_vr108d = 2131231581;
+			
+			// aapt resource value: 0x7F08035E
+			public const int result_cs_vr116d = 2131231582;
+			
+			// aapt resource value: 0x7F08035F
+			public const int result_pic_dh1 = 2131231583;
+			
+			// aapt resource value: 0x7F080360
+			public const int result_pic_doorbell = 2131231584;
+			
+			// aapt resource value: 0x7F080361
+			public const int result_pic_doorbell_hik = 2131231585;
+			
+			// aapt resource value: 0x7F080362
+			public const int result_pic_light = 2131231586;
+			
+			// aapt resource value: 0x7F080363
+			public const int result_x5c = 2131231587;
+			
+			// aapt resource value: 0x7F08039C
+			public const int right_horizontal = 2131231644;
 			
 			// aapt resource value: 0x7F08039D
-			public const int right_horizontal = 2131231645;
+			public const int right_twinkle = 2131231645;
 			
 			// aapt resource value: 0x7F08039E
-			public const int right_twinkle = 2131231646;
+			public const int ring_off = 2131231646;
 			
 			// aapt resource value: 0x7F08039F
-			public const int ring_off = 2131231647;
+			public const int say_bg = 2131231647;
 			
 			// aapt resource value: 0x7F0803A0
-			public const int say_bg = 2131231648;
+			public const int screenshot = 2131231648;
 			
 			// aapt resource value: 0x7F0803A1
-			public const int screenshot = 2131231649;
+			public const int screenshot_def = 2131231649;
 			
 			// aapt resource value: 0x7F0803A2
-			public const int screenshot_def = 2131231650;
+			public const int screenshot_sel = 2131231650;
 			
 			// aapt resource value: 0x7F0803A3
-			public const int screenshot_sel = 2131231651;
+			public const int search = 2131231651;
 			
 			// aapt resource value: 0x7F0803A4
-			public const int search = 2131231652;
+			public const int search_bnt = 2131231652;
 			
 			// aapt resource value: 0x7F0803A5
-			public const int search_bnt = 2131231653;
+			public const int search_bnt_sel = 2131231653;
 			
 			// aapt resource value: 0x7F0803A6
-			public const int search_bnt_sel = 2131231654;
+			public const int search_button_selector = 2131231654;
 			
 			// aapt resource value: 0x7F0803A7
-			public const int search_button_selector = 2131231655;
+			public const int search_input = 2131231655;
 			
 			// aapt resource value: 0x7F0803A8
-			public const int search_input = 2131231656;
-			
-			// aapt resource value: 0x7F0803A9
-			public const int seekbar_thumb = 2131231657;
-			
-			// aapt resource value: 0x7F0803AB
-			public const int selected_icon = 2131231659;
-			
-			// aapt resource value: 0x7F0803AC
-			public const int selector_pickerview_btn = 2131231660;
+			public const int seekbar_thumb = 2131231656;
 			
 			// aapt resource value: 0x7F0803AA
-			public const int select_icon = 2131231658;
+			public const int selected_icon = 2131231658;
+			
+			// aapt resource value: 0x7F0803AB
+			public const int selector_pickerview_btn = 2131231659;
+			
+			// aapt resource value: 0x7F0803A9
+			public const int select_icon = 2131231657;
+			
+			// aapt resource value: 0x7F0803AC
+			public const int server1 = 2131231660;
 			
 			// aapt resource value: 0x7F0803AD
-			public const int server1 = 2131231661;
+			public const int server2 = 2131231661;
 			
 			// aapt resource value: 0x7F0803AE
-			public const int server2 = 2131231662;
+			public const int server3 = 2131231662;
 			
 			// aapt resource value: 0x7F0803AF
-			public const int server3 = 2131231663;
+			public const int server4 = 2131231663;
 			
 			// aapt resource value: 0x7F0803B0
-			public const int server4 = 2131231664;
+			public const int setup = 2131231664;
 			
 			// aapt resource value: 0x7F0803B1
-			public const int setup = 2131231665;
+			public const int setup_sel = 2131231665;
 			
 			// aapt resource value: 0x7F0803B2
-			public const int setup_sel = 2131231666;
+			public const int setup_wechat = 2131231666;
 			
 			// aapt resource value: 0x7F0803B3
-			public const int setup_wechat = 2131231667;
+			public const int share_management_label_button = 2131231667;
 			
 			// aapt resource value: 0x7F0803B4
-			public const int share_management_label_button = 2131231668;
+			public const int share_management_label_button_sel = 2131231668;
 			
 			// aapt resource value: 0x7F0803B5
-			public const int share_management_label_button_sel = 2131231669;
+			public const int shipin7_alarm_msg_new = 2131231669;
 			
 			// aapt resource value: 0x7F0803B6
-			public const int shipin7_alarm_msg_new = 2131231670;
+			public const int shrink_screen_normal = 2131231670;
 			
 			// aapt resource value: 0x7F0803B7
-			public const int shrink_screen_normal = 2131231671;
+			public const int shrink_screen_pressed = 2131231671;
 			
 			// aapt resource value: 0x7F0803B8
-			public const int shrink_screen_pressed = 2131231672;
+			public const int small_button_cameralist = 2131231672;
 			
 			// aapt resource value: 0x7F0803B9
-			public const int small_button_cameralist = 2131231673;
+			public const int sound_off = 2131231673;
 			
 			// aapt resource value: 0x7F0803BA
-			public const int sound_off = 2131231674;
+			public const int sound_off_blue = 2131231674;
 			
 			// aapt resource value: 0x7F0803BB
-			public const int sound_off_blue = 2131231675;
+			public const int sound_off_sel = 2131231675;
 			
 			// aapt resource value: 0x7F0803BC
-			public const int sound_off_sel = 2131231676;
+			public const int sound_off_sel_blue = 2131231676;
 			
 			// aapt resource value: 0x7F0803BD
-			public const int sound_off_sel_blue = 2131231677;
+			public const int sound_on = 2131231677;
 			
 			// aapt resource value: 0x7F0803BE
-			public const int sound_on = 2131231678;
+			public const int sound_on_blue = 2131231678;
 			
 			// aapt resource value: 0x7F0803BF
-			public const int sound_on_blue = 2131231679;
+			public const int sound_on_sel = 2131231679;
 			
 			// aapt resource value: 0x7F0803C0
-			public const int sound_on_sel = 2131231680;
+			public const int sound_on_sel_blue = 2131231680;
 			
 			// aapt resource value: 0x7F0803C1
-			public const int sound_on_sel_blue = 2131231681;
+			public const int sound_source = 2131231681;
 			
 			// aapt resource value: 0x7F0803C2
-			public const int sound_source = 2131231682;
+			public const int sound_source_sel = 2131231682;
 			
 			// aapt resource value: 0x7F0803C3
-			public const int sound_source_sel = 2131231683;
+			public const int speech = 2131231683;
 			
 			// aapt resource value: 0x7F0803C4
-			public const int speech = 2131231684;
+			public const int speech_0 = 2131231684;
 			
 			// aapt resource value: 0x7F0803C5
-			public const int speech_0 = 2131231685;
+			public const int speech_1 = 2131231685;
 			
 			// aapt resource value: 0x7F0803C6
-			public const int speech_1 = 2131231686;
+			public const int speech_2 = 2131231686;
 			
 			// aapt resource value: 0x7F0803C7
-			public const int speech_2 = 2131231687;
+			public const int speech_3 = 2131231687;
 			
 			// aapt resource value: 0x7F0803C8
-			public const int speech_3 = 2131231688;
+			public const int speech_4 = 2131231688;
 			
 			// aapt resource value: 0x7F0803C9
-			public const int speech_4 = 2131231689;
+			public const int speech_5 = 2131231689;
 			
 			// aapt resource value: 0x7F0803CA
-			public const int speech_5 = 2131231690;
+			public const int speech_full_selector = 2131231690;
 			
 			// aapt resource value: 0x7F0803CB
-			public const int speech_full_selector = 2131231691;
-			
-			// aapt resource value: 0x7F0803CC
-			public const int stop = 2131231692;
-			
-			// aapt resource value: 0x7F0803CF
-			public const int stopbtn_selector = 2131231695;
-			
-			// aapt resource value: 0x7F0803D0
-			public const int stoplay_btn = 2131231696;
-			
-			// aapt resource value: 0x7F0803D1
-			public const int stoplay_btn_sel = 2131231697;
-			
-			// aapt resource value: 0x7F0803CD
-			public const int stop_disable = 2131231693;
+			public const int stop = 2131231691;
 			
 			// aapt resource value: 0x7F0803CE
-			public const int stop_press = 2131231694;
+			public const int stopbtn_selector = 2131231694;
+			
+			// aapt resource value: 0x7F0803CF
+			public const int stoplay_btn = 2131231695;
+			
+			// aapt resource value: 0x7F0803D0
+			public const int stoplay_btn_sel = 2131231696;
+			
+			// aapt resource value: 0x7F0803CC
+			public const int stop_disable = 2131231692;
+			
+			// aapt resource value: 0x7F0803CD
+			public const int stop_press = 2131231693;
+			
+			// aapt resource value: 0x7F0803D1
+			public const int success = 2131231697;
 			
 			// aapt resource value: 0x7F0803D2
-			public const int success = 2131231698;
+			public const int success_icon = 2131231698;
 			
 			// aapt resource value: 0x7F0803D3
-			public const int success_icon = 2131231699;
+			public const int success_img = 2131231699;
 			
 			// aapt resource value: 0x7F0803D4
-			public const int success_img = 2131231700;
+			public const int sure_background_def = 2131231700;
 			
 			// aapt resource value: 0x7F0803D5
-			public const int sure_background_def = 2131231701;
+			public const int sure_background_sel = 2131231701;
 			
 			// aapt resource value: 0x7F0803D6
-			public const int sure_background_sel = 2131231702;
+			public const int switch_camera = 2131231702;
 			
 			// aapt resource value: 0x7F0803D7
-			public const int switch_camera = 2131231703;
+			public const int tab_left = 2131231703;
 			
 			// aapt resource value: 0x7F0803D8
-			public const int tab_left = 2131231704;
+			public const int tab_left_sel = 2131231704;
 			
 			// aapt resource value: 0x7F0803D9
-			public const int tab_left_sel = 2131231705;
+			public const int tab_right = 2131231705;
 			
 			// aapt resource value: 0x7F0803DA
-			public const int tab_right = 2131231706;
+			public const int tab_right_sel = 2131231706;
 			
 			// aapt resource value: 0x7F0803DB
-			public const int tab_right_sel = 2131231707;
+			public const int tiltle_button_selector = 2131231707;
 			
 			// aapt resource value: 0x7F0803DC
-			public const int tiltle_button_selector = 2131231708;
+			public const int timeline = 2131231708;
 			
 			// aapt resource value: 0x7F0803DD
-			public const int timeline = 2131231709;
+			public const int timeline_sel = 2131231709;
 			
 			// aapt resource value: 0x7F0803DE
-			public const int timeline_sel = 2131231710;
+			public const int tip_background = 2131231710;
 			
 			// aapt resource value: 0x7F0803DF
-			public const int tip_background = 2131231711;
+			public const int tip_textview_bg = 2131231711;
 			
 			// aapt resource value: 0x7F0803E0
-			public const int tip_textview_bg = 2131231712;
+			public const int title_down_bg = 2131231712;
 			
 			// aapt resource value: 0x7F0803E1
-			public const int title_down_bg = 2131231713;
+			public const int title_down_play = 2131231713;
 			
 			// aapt resource value: 0x7F0803E2
-			public const int title_down_play = 2131231714;
+			public const int title_down_play_sel = 2131231714;
 			
 			// aapt resource value: 0x7F0803E3
-			public const int title_down_play_sel = 2131231715;
+			public const int title_down_play_selector = 2131231715;
 			
 			// aapt resource value: 0x7F0803E4
-			public const int title_down_play_selector = 2131231716;
+			public const int title_menu_bg = 2131231716;
 			
 			// aapt resource value: 0x7F0803E5
-			public const int title_menu_bg = 2131231717;
+			public const int tittel_button_bg = 2131231717;
 			
 			// aapt resource value: 0x7F0803E6
-			public const int tittel_button_bg = 2131231718;
+			public const int tittel_button_press_bg = 2131231718;
 			
 			// aapt resource value: 0x7F0803E7
-			public const int tittel_button_press_bg = 2131231719;
+			public const int tooltip_frame_dark = 2131231719;
 			
 			// aapt resource value: 0x7F0803E8
-			public const int tooltip_frame_dark = 2131231720;
+			public const int tooltip_frame_light = 2131231720;
 			
 			// aapt resource value: 0x7F0803E9
-			public const int tooltip_frame_light = 2131231721;
+			public const int top_bar_bg = 2131231721;
 			
 			// aapt resource value: 0x7F0803EA
-			public const int top_bar_bg = 2131231722;
+			public const int track_bar_bg = 2131231722;
 			
 			// aapt resource value: 0x7F0803EB
-			public const int track_bar_bg = 2131231723;
+			public const int translucent = 2131231723;
 			
 			// aapt resource value: 0x7F0803EC
-			public const int translucent = 2131231724;
+			public const int @unchecked = 2131231724;
 			
 			// aapt resource value: 0x7F0803ED
-			public const int @unchecked = 2131231725;
+			public const int unlock = 2131231725;
 			
 			// aapt resource value: 0x7F0803EE
-			public const int unlock = 2131231726;
+			public const int unlock_def = 2131231726;
 			
 			// aapt resource value: 0x7F0803EF
-			public const int unlock_def = 2131231727;
-			
-			// aapt resource value: 0x7F0803F0
-			public const int unlock_sel = 2131231728;
-			
-			// aapt resource value: 0x7F0803F3
-			public const int upgrade = 2131231731;
-			
-			// aapt resource value: 0x7F0803F1
-			public const int up_horizontal = 2131231729;
+			public const int unlock_sel = 2131231727;
 			
 			// aapt resource value: 0x7F0803F2
-			public const int up_twinkle = 2131231730;
+			public const int upgrade = 2131231730;
+			
+			// aapt resource value: 0x7F0803F0
+			public const int up_horizontal = 2131231728;
+			
+			// aapt resource value: 0x7F0803F1
+			public const int up_twinkle = 2131231729;
+			
+			// aapt resource value: 0x7F0803F3
+			public const int user = 2131231731;
 			
 			// aapt resource value: 0x7F0803F4
-			public const int user = 2131231732;
+			public const int vertical_preview_sound_selector = 2131231732;
 			
 			// aapt resource value: 0x7F0803F5
-			public const int vertical_preview_sound_selector = 2131231733;
-			
-			// aapt resource value: 0x7F0803F6
-			public const int vertical_preview_stop_selector = 2131231734;
-			
-			// aapt resource value: 0x7F080406
-			public const int videogo_icon = 2131231750;
-			
-			// aapt resource value: 0x7F0803F7
-			public const int video_background = 2131231735;
-			
-			// aapt resource value: 0x7F0803F8
-			public const int video_camera1_1 = 2131231736;
-			
-			// aapt resource value: 0x7F0803F9
-			public const int video_camera1_2 = 2131231737;
-			
-			// aapt resource value: 0x7F0803FA
-			public const int video_camera1_3 = 2131231738;
-			
-			// aapt resource value: 0x7F0803FB
-			public const int video_file_watermark = 2131231739;
-			
-			// aapt resource value: 0x7F0803FC
-			public const int video_quality_selector = 2131231740;
-			
-			// aapt resource value: 0x7F0803FD
-			public const int video_talk_sdk_icn_watch = 2131231741;
-			
-			// aapt resource value: 0x7F0803FE
-			public const int video_talk_sdk_placeholder_images_user = 2131231742;
-			
-			// aapt resource value: 0x7F0803FF
-			public const int video_talk_sdk_video_answer = 2131231743;
-			
-			// aapt resource value: 0x7F080400
-			public const int video_talk_sdk_video_hangup = 2131231744;
-			
-			// aapt resource value: 0x7F080401
-			public const int video_talk_sdk_video_record_off = 2131231745;
-			
-			// aapt resource value: 0x7F080402
-			public const int video_talk_sdk_video_record_on = 2131231746;
-			
-			// aapt resource value: 0x7F080403
-			public const int video_talk_sdk_video_snap = 2131231747;
-			
-			// aapt resource value: 0x7F080404
-			public const int video_talk_sdk_video_stop = 2131231748;
+			public const int vertical_preview_stop_selector = 2131231733;
 			
 			// aapt resource value: 0x7F080405
-			public const int video_talk_sdk_video_switch_camera = 2131231749;
+			public const int videogo_icon = 2131231749;
 			
-			// aapt resource value: 0x7F080410
-			public const int waiting_bg = 2131231760;
+			// aapt resource value: 0x7F0803F6
+			public const int video_background = 2131231734;
 			
-			// aapt resource value: 0x7F080411
-			public const int waiting_progressbar_bg = 2131231761;
+			// aapt resource value: 0x7F0803F7
+			public const int video_camera1_1 = 2131231735;
 			
-			// aapt resource value: 0x7F080407
-			public const int wait_1 = 2131231751;
+			// aapt resource value: 0x7F0803F8
+			public const int video_camera1_2 = 2131231736;
 			
-			// aapt resource value: 0x7F080408
-			public const int wait_2 = 2131231752;
+			// aapt resource value: 0x7F0803F9
+			public const int video_camera1_3 = 2131231737;
 			
-			// aapt resource value: 0x7F080409
-			public const int wait_3 = 2131231753;
+			// aapt resource value: 0x7F0803FA
+			public const int video_file_watermark = 2131231738;
 			
-			// aapt resource value: 0x7F08040A
-			public const int wait_4 = 2131231754;
+			// aapt resource value: 0x7F0803FB
+			public const int video_quality_selector = 2131231739;
 			
-			// aapt resource value: 0x7F08040B
-			public const int wait_5 = 2131231755;
+			// aapt resource value: 0x7F0803FC
+			public const int video_talk_sdk_icn_watch = 2131231740;
 			
-			// aapt resource value: 0x7F08040C
-			public const int wait_6 = 2131231756;
+			// aapt resource value: 0x7F0803FD
+			public const int video_talk_sdk_placeholder_images_user = 2131231741;
 			
-			// aapt resource value: 0x7F08040D
-			public const int wait_7 = 2131231757;
+			// aapt resource value: 0x7F0803FE
+			public const int video_talk_sdk_video_answer = 2131231742;
 			
-			// aapt resource value: 0x7F08040E
-			public const int wait_8 = 2131231758;
+			// aapt resource value: 0x7F0803FF
+			public const int video_talk_sdk_video_hangup = 2131231743;
+			
+			// aapt resource value: 0x7F080400
+			public const int video_talk_sdk_video_record_off = 2131231744;
+			
+			// aapt resource value: 0x7F080401
+			public const int video_talk_sdk_video_record_on = 2131231745;
+			
+			// aapt resource value: 0x7F080402
+			public const int video_talk_sdk_video_snap = 2131231746;
+			
+			// aapt resource value: 0x7F080403
+			public const int video_talk_sdk_video_stop = 2131231747;
+			
+			// aapt resource value: 0x7F080404
+			public const int video_talk_sdk_video_switch_camera = 2131231748;
 			
 			// aapt resource value: 0x7F08040F
-			public const int wait_upload_img = 2131231759;
+			public const int waiting_bg = 2131231759;
+			
+			// aapt resource value: 0x7F080410
+			public const int waiting_progressbar_bg = 2131231760;
+			
+			// aapt resource value: 0x7F080406
+			public const int wait_1 = 2131231750;
+			
+			// aapt resource value: 0x7F080407
+			public const int wait_2 = 2131231751;
+			
+			// aapt resource value: 0x7F080408
+			public const int wait_3 = 2131231752;
+			
+			// aapt resource value: 0x7F080409
+			public const int wait_4 = 2131231753;
+			
+			// aapt resource value: 0x7F08040A
+			public const int wait_5 = 2131231754;
+			
+			// aapt resource value: 0x7F08040B
+			public const int wait_6 = 2131231755;
+			
+			// aapt resource value: 0x7F08040C
+			public const int wait_7 = 2131231756;
+			
+			// aapt resource value: 0x7F08040D
+			public const int wait_8 = 2131231757;
+			
+			// aapt resource value: 0x7F08040E
+			public const int wait_upload_img = 2131231758;
+			
+			// aapt resource value: 0x7F080411
+			public const int water_alarm = 2131231761;
 			
 			// aapt resource value: 0x7F080412
-			public const int water_alarm = 2131231762;
+			public const int wifi_config_bg = 2131231762;
 			
 			// aapt resource value: 0x7F080413
-			public const int wifi_config_bg = 2131231763;
+			public const int wifi_connect_tip = 2131231763;
 			
 			// aapt resource value: 0x7F080414
-			public const int wifi_connect_tip = 2131231764;
+			public const int yuntai_normal = 2131231764;
 			
 			// aapt resource value: 0x7F080415
-			public const int yuntai_normal = 2131231765;
+			public const int yuntai_pressed = 2131231765;
 			
 			// aapt resource value: 0x7F080416
-			public const int yuntai_pressed = 2131231766;
+			public const int yxs_head = 2131231766;
 			
 			// aapt resource value: 0x7F080417
-			public const int yxs_head = 2131231767;
-			
-			// aapt resource value: 0x7F080418
-			public const int z1_bg = 2131231768;
+			public const int z1_bg = 2131231767;
 			
 			static Drawable()
 			{
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 408f9cf..5820301 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -2427,7 +2427,7 @@
         {
             var requestJson = HttpUtil.GetSignRequestJson(new GetSpeakerObj
             {
-                homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
             });
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_List_Get, requestJson);
         }
@@ -2463,7 +2463,7 @@
         public ResponsePackNew GetSpeakerDeviceList(int getType, string tokenId)
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
             d.Add("tokenId", tokenId);
             if (getType > 0)
             {
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 5c0437e..f7f94b2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1233,6 +1233,30 @@
         /// 绾㈠閬ユ帶鍣�
         /// </summary>
         public const string IrLearn = "ir.learn";
+        /// <summary>
+        /// 绾㈠鎶曞奖浠�
+        /// </summary>
+        public const string PjtIr = "ir.pjt";
+        /// <summary>
+        /// 绾㈠鏈洪《鐩�
+        /// </summary>
+        public const string StbIr = "ir.stb";
+        /// <summary>
+        /// 绾㈠褰辩鏈�
+        /// </summary>
+        public const string DvDIr = "ir.dvd";
+        /// <summary>
+        /// 绾㈠绌烘皵鍑�鍖栧櫒
+        /// </summary>
+        public const string PurifierIr = "ir.air_purifier";
+        /// <summary>
+        /// 绾㈠鐑按鍣�
+        /// </summary>
+        public const string HeaterIr = " ir.water_heater";
+        /// <summary>
+        /// 绾㈠椋庢墖
+        /// </summary>
+        public const string FanIr = "ir.fan";
 
         #region 娑傞甫
         /// <summary>
@@ -1277,6 +1301,13 @@
 
         #endregion
 
+        #region 鑳芥簮
+        /// <summary>
+        /// 鑳芥簮-鐢佃兘
+        /// </summary>
+        public const string ElectricEnergy = "energy.electric";
+        #endregion 
+
         #region 璁惧绫�
         /// <summary>
         /// 绾㈠瀹�
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 2f73b07..ded2b0c 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -346,7 +346,10 @@
         /// </summary>
         public string GetDelayText()
         {
-            string text = "";
+            var delayInt = 0;
+            int.TryParse(delay,out delayInt);
+            string text = (delayInt / 60)+Language.StringByID(StringId.m)+(delayInt % 60)+Language.StringByID(StringId.s);
+            return text;
             switch (delay)
             {
                 case "0":
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index ee33be2..f81fac9 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -407,6 +407,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerListPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerSelectDevicesPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerRoomListPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\DvdPage.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)DAL\" />
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index bc607ef..1315ac8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -371,7 +371,10 @@
                     {
                         if (view != null)
                         {
-                            view.RemoveFromParent();
+                            if(view.Tag.ToString() != "unlockpage")
+                            {
+                                view.RemoveFromParent();
+                            }
                         }
                     }
                 }
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index a8c069b..de994f8 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -3,6 +3,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using HDL_ON.Entity;
+using HDL_ON.Stan;
 using HDL_ON.UI.CSS;
 using Shared;
 
@@ -572,152 +573,177 @@
         /// 鍦烘櫙寤舵椂璁剧疆寮圭獥
         /// </summary>
         /// <param name="function"></param>
-        public void SetSceneDelayDialog(Dictionary<string,string>items, Action<string> action,string curItemKey)
+        public void SetSceneDelayDialog(Action<string> action,string curItemKey)//Dictionary<string,string>items, 
         {
-            Button lastButton = new Button();
-            Dialog dialog = new Dialog();
-            var pView = new FrameLayout()
+            List<int> mRange = new List<int>();
+            List<int> sRange = new List<int>();
+            for (int i = 0; i <= 59; i++)
             {
-                BackgroundColor = CSS_Color.DialogTransparentColor1,
-            };
-            dialog.AddChidren(pView);
-
-            var itemCount = items.Count;
-            var optionBaseViewHeight = ((itemCount > 3 ? itemCount : 3) + 1) * Application.GetRealHeight(50);
-            var optionBaseView = new FrameLayout()
-            {
-                //Y = Application.GetRealHeight(439),
-                Y = Application.GetRealHeight(647) - optionBaseViewHeight,
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(343),
-                //Height = Application.GetRealHeight(208),
-                Height = optionBaseViewHeight,
-                //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(100),
-                TextID = StringId.SceneDelay,
-                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(160),
-                Width = Application.GetRealWidth(160),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.Confirm,
-            };
-            topView.AddChidren(btnConfrim);
-
-            var itemsView = new VerticalScrolViewLayout()
-            {
-                Y = topView.Bottom,
-                Height = optionBaseViewHeight - Application.GetRealHeight(50),
-                ScrollEnabled = itemCount > 4,
-            };
-            optionBaseView.AddChidren(itemsView);
-
-            bool isFrist = true;
-            Button btnLastSelectedTip = null;
-
-            foreach (var item in items)
-            {
-                if (isFrist)
-                {
-                    isFrist = false;
-                }
-                else
-                {
-                    itemsView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
-                }
-                var row = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(50),
-                };
-                itemsView.AddChidren(row);
-
-                var btnTipSelected = new Button()
-                {
-                    X = Application.GetRealWidth(303),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetRealWidth(28),
-                    Height= Application.GetRealWidth(28),
-                    UnSelectedImagePath = "Public/ChooseIcon.png",
-                    SelectedImagePath = "Public/ChooseOnIcon.png",
-                };
-                row.AddChidren(btnTipSelected);
-                if( item.Key == curItemKey)
-                {
-                    btnTipSelected.IsSelected = true;
-                    btnLastSelectedTip = btnTipSelected;
-                }
-
-
-                var btnRowTitle = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Text = item.Value,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextAlignment = TextAlignment.CenterLeft,
-                };
-                row.AddChidren(btnRowTitle);
-
-                btnRowTitle.MouseUpEventHandler = (sender, e) =>
-                {
-                    if (btnTipSelected.IsSelected)
-                    {
-                        curItemKey = "0";
-                        btnTipSelected.IsSelected = false;
-                        btnLastSelectedTip = null;
-                    }
-                    else
-                    {
-                        curItemKey = item.Key;
-                        if (btnLastSelectedTip != null)
-                        {
-                            btnLastSelectedTip.IsSelected = false;
-                        }
-                        btnTipSelected.IsSelected = true;
-                        btnLastSelectedTip = btnTipSelected;
-                    }
-                };
-
+                mRange.Add(i);
+                sRange.Add(i);
             }
+            sRange.Add(60);
+            BottomTimeSelectControl timeControl = new BottomTimeSelectControl(mRange, sRange, 5, Language.StringByID(StringId.SceneDelay));
+            timeControl.RowHeight = Application.GetRealHeight(50);
+            timeControl.InitControl(0, 0, 262, false);
+            timeControl.ChangePickerEvent2();
+            timeControl.FinishEvent = (type, hours, min) =>
+            {
+                if(type == 1)
+                {
+                    curItemKey = (hours * 60 + min).ToString();
+                    action(curItemKey);
+                }
+            };
+
+
+
+            return;
+
+            //    Button lastButton = new Button();
+            //Dialog dialog = new Dialog();
+            //var pView = new FrameLayout()
+            //{
+            //    BackgroundColor = CSS_Color.DialogTransparentColor1,
+            //};
+            //dialog.AddChidren(pView);
+
+            //var itemCount = items.Count;
+            //var optionBaseViewHeight = ((itemCount > 3 ? itemCount : 3) + 1) * Application.GetRealHeight(50);
+            //var optionBaseView = new FrameLayout()
+            //{
+            //    //Y = Application.GetRealHeight(439),
+            //    Y = Application.GetRealHeight(647) - optionBaseViewHeight,
+            //    Gravity = Gravity.CenterHorizontal,
+            //    Width = Application.GetRealWidth(343),
+            //    //Height = Application.GetRealHeight(208),
+            //    Height = optionBaseViewHeight,
+            //    //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(100),
+            //    TextID = StringId.SceneDelay,
+            //    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(160),
+            //    Width = Application.GetRealWidth(160),
+            //    TextAlignment = TextAlignment.CenterRight,
+            //    TextColor = CSS_Color.MainColor,
+            //    TextSize = CSS_FontSize.TextFontSize,
+            //    TextID = StringId.Confirm,
+            //};
+            //topView.AddChidren(btnConfrim);
+
+            //var itemsView = new VerticalScrolViewLayout()
+            //{
+            //    Y = topView.Bottom,
+            //    Height = optionBaseViewHeight - Application.GetRealHeight(50),
+            //    ScrollEnabled = itemCount > 4,
+            //};
+            //optionBaseView.AddChidren(itemsView);
+
+            //bool isFrist = true;
+            //Button btnLastSelectedTip = null;
+
+            //foreach (var item in items)
+            //{
+            //    if (isFrist)
+            //    {
+            //        isFrist = false;
+            //    }
+            //    else
+            //    {
+            //        itemsView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+            //    }
+            //    var row = new FrameLayout()
+            //    {
+            //        Height = Application.GetRealHeight(50),
+            //    };
+            //    itemsView.AddChidren(row);
+
+            //    var btnTipSelected = new Button()
+            //    {
+            //        X = Application.GetRealWidth(303),
+            //        Gravity = Gravity.CenterVertical,
+            //        Width = Application.GetRealWidth(28),
+            //        Height= Application.GetRealWidth(28),
+            //        UnSelectedImagePath = "Public/ChooseIcon.png",
+            //        SelectedImagePath = "Public/ChooseOnIcon.png",
+            //    };
+            //    row.AddChidren(btnTipSelected);
+            //    if( item.Key == curItemKey)
+            //    {
+            //        btnTipSelected.IsSelected = true;
+            //        btnLastSelectedTip = btnTipSelected;
+            //    }
+
+
+            //    var btnRowTitle = new Button()
+            //    {
+            //        X = Application.GetRealWidth(16),
+            //        Text = item.Value,
+            //        TextSize = CSS_FontSize.TextFontSize,
+            //        TextColor = CSS_Color.FirstLevelTitleColor,
+            //        TextAlignment = TextAlignment.CenterLeft,
+            //    };
+            //    row.AddChidren(btnRowTitle);
+
+            //    btnRowTitle.MouseUpEventHandler = (sender, e) =>
+            //    {
+            //        if (btnTipSelected.IsSelected)
+            //        {
+            //            curItemKey = "0";
+            //            btnTipSelected.IsSelected = false;
+            //            btnLastSelectedTip = null;
+            //        }
+            //        else
+            //        {
+            //            curItemKey = item.Key;
+            //            if (btnLastSelectedTip != null)
+            //            {
+            //                btnLastSelectedTip.IsSelected = false;
+            //            }
+            //            btnTipSelected.IsSelected = true;
+            //            btnLastSelectedTip = btnTipSelected;
+            //        }
+            //    };
+
+            //}
 
             //Button btn1 = new Button()
             //{
@@ -801,22 +827,22 @@
 
 
 
-            dialog.Show();
+            //dialog.Show();
 
-            pView.MouseUpEventHandler = (sender, e) =>
-            {
-                dialog.Close();
-            };
+            //pView.MouseUpEventHandler = (sender, e) =>
+            //{
+            //    dialog.Close();
+            //};
 
-            btnCancel.MouseUpEventHandler = (sender, e) =>
-            {
-                dialog.Close();
-            };
-            btnConfrim.MouseUpEventHandler = (sender, e) =>
-            {
-                action(curItemKey);
-                dialog.Close();
-            };
+            //btnCancel.MouseUpEventHandler = (sender, e) =>
+            //{
+            //    dialog.Close();
+            //};
+            //btnConfrim.MouseUpEventHandler = (sender, e) =>
+            //{
+            //    action(curItemKey);
+            //    dialog.Close();
+            //};
             //btn1.MouseUpEventHandler = (sender, e) => {
             //    btn1.IsSelected = !btn1.IsSelected;
             //    btn2.IsSelected = false;
diff --git a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
index 49c40dd..9b483a8 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
@@ -87,7 +87,7 @@
         /// <param name="i_hour">榛樿閫夋嫨鏃�</param>
         /// <param name="i_minute">榛樿閫夋嫨鍒�</param>
         /// <param name="contentView">閫夋嫨鍖哄煙楂樺害</param>
-        public void InitControl(int i_hour, int i_minute,int contentView = 297)
+        public void InitControl(int i_hour, int i_minute,int contentView = 297,bool isHour = true)
         {
             //宸茬粡鍒濆鍖�
             if (base.btnCancel != null) { return; }
@@ -108,7 +108,7 @@
             base.btnConfirm.ButtonClickEvent += (sender, e) =>
             {
                 //鏈夐�夋嫨浜嗘墠鑳界偣纭
-                if (selectHour != 0 || selectMinute != 0)
+                //if (selectHour != 0 || selectMinute != 0)
                 {
                     base.Close();
                     this.FinishEvent?.Invoke(1, selectHour, selectMinute);
@@ -128,6 +128,13 @@
             var strhour = Language.StringByID(StringId.h);
             //鍒�
             var strMinute = Language.StringByID(StringId.m);
+
+            if(!isHour)
+            {
+                strhour = Language.StringByID(StringId.m);
+                strMinute = Language.StringByID(StringId.s);
+            }
+
             //XX鏃�
             listHour = new List<string>();// { "00" + strhour };
             //XX鍒�
@@ -188,8 +195,33 @@
                     selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));
                 }
             };
+        }
+
+        /// <summary>
+        /// 鐗规畩鐨勯泦鍚堥�夋嫨浜嬩欢锛屽満鏅椂闂磋缃娇鐢�
+        /// </summary>
+        public void ChangePickerEvent2()
+        {
+            pickerView.OnSelectChangeEvent = (value1, value2, value3) =>
+            {
+                if (value1 == 60 && value2 == 60)
+                {
+                    value2 = 0;
+                    pickerView.setCurrentItems(value1, value2, 0);
+                }
+                //else if (value1 == 4 && value2 == 1)
+                //{
+                //    value2 = 0;
+                //    pickerView.setCurrentItems(value1, value2, 0);
+                //}
+                //else
+                //{
+                //    //鏇存敼绱㈠紩
+                //    selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));
+                //    selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));
+                //}
+            };
         }
-
         #endregion
 
         #region 鈻� 涓�鑸柟娉昣__________________________
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 83713a1..871b7a1 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -381,6 +381,11 @@
                 MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
             }
 
+
+#if DEBUG
+            //FunctionList.List.Functions.Add(new Function() { spk = SPK.ClothesHanger, name = "娴嬭瘯鍑夐湼", attributes = new List<FunctionAttributes> { new FunctionAttributes { key = FunctionAttributeKey.HotDry } ,new FunctionAttributes { key = FunctionAttributeKey.HotDryTime } ,new FunctionAttributes { key = FunctionAttributeKey.HotDryTimeLeft } } });
+#endif
+
         }
         /// <summary>
         /// 鍔犺浇鍐呭鍖哄煙
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index a89fdc6..111d2f4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -281,7 +281,9 @@
                     items.Add("60", "1min");
                     items.Add("120", "2min");
                     items.Add("300", "5min");
-                    new PublicAssmebly().SetSceneDelayDialog(items, action ,scene.delay);
+                    new PublicAssmebly().SetSceneDelayDialog( action ,scene.delay);
+
+
                 };
 
                 contentView.AddChidren(new Button()
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 59f0947..3d30cdf 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -289,7 +289,7 @@
                     items.Add("60", "1min");
                     items.Add("120", "2min");
                     items.Add("300", "5min");
-                    new PublicAssmebly().SetSceneDelayDialog(items,action,scene.delay);
+                    new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
                 };
 
                 contentView.AddChidren(new Button()
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 558b9df..418ce6a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -327,7 +327,7 @@
                 items.Add("60", "1min");
                 items.Add("120", "2min");
                 items.Add("300", "5min");
-                new PublicAssmebly().SetSceneDelayDialog(items,action,sceneFunction.delay);
+                new PublicAssmebly().SetSceneDelayDialog(action, sceneFunction.delay);
             };
             #endregion
 
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 559faa4..7390c4d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -750,7 +750,7 @@
 
 
             #region 鏅鸿兘闊崇
-            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
             {
                 //supportView 鍔犻珮 鏄剧ず3琛� 3*44
                 supportView.Height = Application.GetRealWidth(3*44);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
index fd1aac3..2443d5c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
@@ -90,7 +90,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = DB_ResidenceData.Instance.CurrentRegion.Name,
+                Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
             };
             titleView.AddChidren(btnHomeTitle);
 
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 7fed444..489d1a5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -25,6 +25,7 @@
         public AppUnlockGesturePage(string pw, Action action)
         {
             bodyView = this;
+            bodyView.Tag = "unlockpage";
             oldPasswrod = pw;
             backAction = action;
         }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 4188ad6..706facf 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -23,6 +23,7 @@
         public AppUnlockPasswordPage(string pw, Action action)
         {
             bodyView = this;
+            bodyView.Tag = "unlockpage";
             oldPasswrod = pw;
             backAction = action;
         }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
index 0a3c074..d701f51 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -405,7 +405,7 @@
                 {
                     lightingView.SetViewStatus(lightTemp.state == "on");
                 }
-                MainPage.Log($"鏃堕棿鎴筹細{device.time_stamp}  鏃堕棿锛歿device.GeteTime()} 鐑樺共:{hotDryTemp.state} 椋庡共:{windDryTemp.state} 娑堟瘨:{disinfectTemp.state} 鐏厜鐘舵�侊細{lightTemp.state}");
+                //MainPage.Log($"鏃堕棿鎴筹細{device.time_stamp}  鏃堕棿锛歿device.GeteTime()} 鐑樺共:{hotDryTemp.state} 椋庡共:{windDryTemp.state} 娑堟瘨:{disinfectTemp.state} 鐏厜鐘舵�侊細{lightTemp.state}");
                 #endregion
 
                 #region 淇敼鏃堕棿
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs
index 8e59d4b..9049d4e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs
@@ -1,10 +1,344 @@
 锘縰sing System;
-namespace HDL_ON.UI.UI2.FuntionControlView.Electrical
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
 {
-    public class DvdPage
+    public class DvdPage : FrameLayout
     {
-        public DvdPage()
+        #region 鎺т欢闆嗗悎
+        FrameLayout bodyView;
+        /// <summary>
+        /// 鍔熻兘鍚嶇О鎸夐挳
+        /// </summary>
+        Button btnFunctionName;
+        /// <summary>
+        /// 鎴块棿妤煎眰淇℃伅鎸夐挳
+        /// </summary>
+        Button btnFromFoorAndRoom;
+        /// <summary>
+        /// 鏀惰棌鎸夐挳
+        /// </summary>
+        Button btnCollection;
+
+        Button btnChangeTVAV;
+        FrameLayout topMenuView;
+        Button btnTopMenuUp;
+        Button btnTopMenuLeft;
+        Button btnTopMenuRight;
+        Button btnTopMenuDown;
+        Button btnOk;
+        FrameLayout channleView;
+        Button btnChlReduce;
+        Button btnChlPlus;
+        FrameLayout volView;
+        Button btnVolReduce;
+        Button btnVolPlus;
+        Button btnBack;
+        Button btnMenu;
+        Button btn123;
+        Button btnMute;
+        Button btnPower;
+
+        #endregion
+
+        #region 鍖哄煙鍙橀噺
+        TV tvTemp = new TV();
+        Function function;
+        Button btnCollection_Out;
+        Button btnFunctionName_Out;
+        Button btnFromFloor_Out;
+        /// <summary>
+        /// 鍒锋柊鏄剧ず淇℃伅
+        /// </summary>
+        Action actionRefresh;
+        #endregion
+
+        public DvdPage(Function func)
         {
+            bodyView = this;
+            function = func;
         }
+
+
+        public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
+        {
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+            btnCollection_Out = btnCollectionIcon;
+            btnFunctionName_Out = btnFunctionNameOut;
+            btnFromFloor_Out = btnFromFloorOut;
+
+            FrameLayout controlView = new FrameLayout()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(88),
+                Width = Application.GetRealWidth(327),
+                Height = Application.GetRealHeight(526),
+                BackgroundImagePath = "Public/Fragmentbg.png",
+            };
+            bodyView.AddChidren(controlView);
+
+            btnFunctionName = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(14),
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(37),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
+                Text = function.name,
+            };
+            controlView.AddChidren(btnFunctionName);
+
+            btnFromFoorAndRoom = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Y = btnFunctionName.Bottom,
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(21),
+                TextColor = CSS_Color.PromptingColor1,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                Text = function.GetRoomListName()
+            };
+            controlView.AddChidren(btnFromFoorAndRoom);
+
+            btnCollection = new Button()
+            {
+                X = Application.GetRealWidth(273),
+                Y = Application.GetRealHeight(14),
+                Width = Application.GetMinRealAverage(40),
+                Height = Application.GetMinRealAverage(40),
+                SelectedImagePath = "Collection/CollectionIcon.png",
+                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
+                IsSelected = function.collect
+            };
+            controlView.AddChidren(btnCollection);
+            //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+            //{
+            //    controlView.AddChidren(btnCollection);
+            //}
+
+
+
+            #region 杞洏鎺у埗鍖哄煙
+            topMenuView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(88),
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(199),
+                Height = Application.GetRealWidth(199),
+                BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png",
+            };
+            controlView.AddChidren(topMenuView);
+
+            btnTopMenuUp = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(80),
+                Height = Application.GetRealWidth(50),
+            };
+            topMenuView.AddChidren(btnTopMenuUp);
+
+            btnTopMenuLeft = new Button()
+            {
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetRealWidth(50),
+                Height = Application.GetRealWidth(80),
+            };
+            topMenuView.AddChidren(btnTopMenuLeft);
+
+            btnTopMenuRight = new Button()
+            {
+                X = Application.GetRealWidth(150),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetRealWidth(50),
+                Height = Application.GetRealWidth(80),
+            };
+            topMenuView.AddChidren(btnTopMenuRight);
+
+            btnTopMenuDown = new Button()
+            {
+                Y = Application.GetRealWidth(150),
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(80),
+                Height = Application.GetRealWidth(50),
+            };
+            topMenuView.AddChidren(btnTopMenuDown);
+
+            btnOk = new Button()
+            {
+                Gravity = Gravity.Center,
+                Width = Application.GetRealWidth(100),
+                Height = Application.GetRealWidth(100),
+            };
+            topMenuView.AddChidren(btnOk);
+
+
+
+            #endregion
+
+
+            #region 棰戦亾闊抽噺璋冭妭
+            channleView = new FrameLayout()
+            {
+                X = Application.GetRealWidth(26),
+                Y = Application.GetRealHeight(246),
+                Width = Application.GetRealWidth(44),
+                Height = Application.GetRealWidth(102),
+                BackgroundImagePath = "FunctionIcon/Electrical/TV/MenuBgIcon.png",
+            };
+            controlView.AddChidren(channleView);
+
+            btnChlPlus = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(10),
+                Width = Application.GetRealWidth(24),
+                Height = Application.GetRealWidth(24),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/PlusIcon.png"
+            };
+            channleView.AddChidren(btnChlPlus);
+
+            Button btnChlText;
+            btnChlText = new Button()
+            {
+                Gravity = Gravity.CenterVertical,
+                Height = Application.GetRealWidth(23),
+                TextAlignment = TextAlignment.Center,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextID = StringId.Chl,
+            };
+            channleView.AddChidren(btnChlText);
+
+            btnChlReduce = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealWidth(66),
+                Width = Application.GetRealWidth(24),
+                Height = Application.GetRealWidth(24),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/ReduceIcon.png"
+            };
+            channleView.AddChidren(btnChlReduce);
+
+            volView = new FrameLayout()
+            {
+                X = Application.GetRealWidth(257),
+                Y = Application.GetRealHeight(246),
+                Width = Application.GetRealWidth(44),
+                Height = Application.GetRealWidth(102),
+                BackgroundImagePath = "FunctionIcon/Electrical/TV/MenuBgIcon.png",
+            };
+            controlView.AddChidren(volView);
+
+            btnVolPlus = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(10),
+                Width = Application.GetRealWidth(24),
+                Height = Application.GetRealWidth(24),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/PlusIcon.png"
+            };
+            volView.AddChidren(btnVolPlus);
+
+            Button btnVolText;
+            btnVolText = new Button()
+            {
+                Gravity = Gravity.CenterVertical,
+                Height = Application.GetRealWidth(23),
+                TextAlignment = TextAlignment.Center,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextID = StringId.Vol,
+            };
+            volView.AddChidren(btnVolText);
+
+            btnVolReduce = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealWidth(66),
+                Width = Application.GetRealWidth(24),
+                Height = Application.GetRealWidth(24),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/ReduceIcon.png"
+            };
+            volView.AddChidren(btnVolReduce);
+
+
+
+            #endregion
+
+            #region 搴曢儴鎺у埗鍖哄煙
+            btnBack = new Button()
+            {
+                X = Application.GetRealWidth(52),
+                Y = Application.GetRealHeight(402),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVBackIcon.png",
+            };
+            controlView.AddChidren(btnBack);
+
+            btnChangeTVAV = new Button()
+            {
+                X = Application.GetRealWidth(116),
+                Y = Application.GetRealHeight(402),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVAV.png",
+            };
+            controlView.AddChidren(btnChangeTVAV);
+
+            btn123 = new Button()
+            {
+                X = Application.GetRealWidth(180),
+                Y = Application.GetRealHeight(402),
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealWidth(40),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/TV123Icon.png",
+            };
+            controlView.AddChidren(btn123);
+
+            btnMute = new Button()
+            {
+                X = Application.GetRealWidth(244),
+                Y = Application.GetRealHeight(402),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVMuteIcon.png",
+            };
+            controlView.AddChidren(btnMute);
+
+            btnMenu = new Button()
+            {
+                X = Application.GetRealWidth(116),
+                Y = Application.GetRealHeight(466),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVMenuIcon.png",
+            };
+            controlView.AddChidren(btnMenu);
+
+            btnPower = new Button()
+            {
+                X = Application.GetRealWidth(180),
+                Y = Application.GetRealHeight(466),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVPowerIcon.png",
+            };
+            controlView.AddChidren(btnPower);
+
+            #endregion
+
+            new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(function, actionRefresh);
+            DriverLayer.Control.Ins.SendReadCommand(function);
+
+        }
+
+
     }
 }

--
Gitblit v1.8.0