From b3e96fce4cc01113128ddf8e0a18fc19594a9e56 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 05 十二月 2019 18:38:30 +0800
Subject: [PATCH] 一个新的版本
---
ZigbeeApp/Home.Ios/AppDelegate.cs | 0
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 28
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 8550 +++++++++++++++++++-------------------
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 88
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 9
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs | 72
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 152
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 27
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 14
ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs | 2
ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs | 7
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 56
ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2Selected.png | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 13
ZigbeeApp/Home.Ios/Resources/Phone/Scene/Background.png | 0
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 130
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 46
ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs | 7
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 26
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs | 56
ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs | 46
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 82
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 27
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 7
ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs | 7
ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json | 775 +++
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 35
ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs | 17
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 26
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 4
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 246 +
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 31
ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs | 225 +
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 14
ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs | 10
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 34
ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 6
ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs | 83
ZigbeeApp/Home.Ios/Resources/Phone/Room/List.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 77
ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll | 0
ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 137
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs | 9
ZigbeeApp/Shared/Shared.projitems | 5
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 41
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 3
ZigbeeApp/Home.Ios/Resources/Phone/Room/Temperature.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs | 19
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 6
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 18
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 2
ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs | 10
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 145
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 123
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 28
ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2Selected.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs | 2
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs | 8
ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs | 4
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 24
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 132
ZigbeeApp/Shared/Common/CommonPage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 23
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 136
ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs | 23
ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs | 1
ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Humidity.png | 0
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2.png | 0
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs | 16
ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Temperature.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs | 2
ZigbeeApp/Home.Ios/Resources/Language.ini | 34
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 37
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs | 40
ZigbeeApp/Home.Ios/Home.IOS.csproj | 9
ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 9
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs | 58
ZigbeeApp/Shared/R.cs | 392 -
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 6
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 52
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2Selected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 21
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 91
ZigbeeApp/GateWay.Droid/Assets/Phone/Room/List.png | 0
ZigbeeApp/Shared/Common/Device.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs | 127
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs | 2
ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 19
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 4
ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs | 7
ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 18
/dev/null | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs | 17
ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/Background.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2Selected.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Room/Humidity.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 40
ZigbeeApp/Shared/Common/House.cs | 6
133 files changed, 7,715 insertions(+), 5,530 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
old mode 100755
new mode 100644
index 086da77..d6e2069
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -71,7 +71,7 @@
66=璇峰皢IC鍗℃斁鍦ㄦ劅搴斿尯鍩熶笂
67=褰曞叆鐘舵��
68=瀵嗙爜褰曞叆鎴愬姛
-69=瀵嗙爜澶囨敞锛�
+69=瀵嗙爜澶囨敞:
70=閰嶅瀹㈡埛
71=鏃�
72=鎴愬憳绠＄悊
@@ -642,9 +642,33 @@
10129=璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
10130=鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
10131=璐﹀彿鎴栧瘑鐮侀敊璇�
-10132=璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+10132=璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
10133=璇疯緭鍏ラ獙璇佺爜
10134=鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
+10135=鐧诲綍涓�...
+10136=褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
+10137=浣忓畢鍚嶇О涓虹┖
+10138=閭閿欒锛岃閲嶆柊杈撳叆
+10139=鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
+10141=浣犲凡琚己鍒朵笅绾匡紒
+
+10150=鏀规埧闂村悕绉板凡瀛樺湪
+10151=鍦烘櫙鍚嶄笉鑳戒负绌�
+10152=鎺у埗鍦烘櫙澶辫触
+10153=鍦烘櫙涓虹┖
+10154=璇ュ満鏅腑娌℃湁鎵ц鐩爣
+10155=鎿嶄綔澶辫触
+10156=鍙戦�侀獙璇佺爜澶辫触
+10157=缃戝叧涓嶅湪绾�
+
+10160=宸叉槸鏈�鏂扮増鏈�
+10161=鏇存柊
+10162=鏇存柊鍐呭
+10163=鏇存柊澶辫触
+10164=鏇存柊涓�...
+10165=鍙栨秷鏇存柊
+
+
11000=鍔熻兘
11001=鍦烘櫙
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2.png
new file mode 100755
index 0000000..0ae50e7
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2Selected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2Selected.png
new file mode 100755
index 0000000..4c660b7
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MinusSign2Selected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2.png
new file mode 100755
index 0000000..e9b40fa
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2Selected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2Selected.png
new file mode 100755
index 0000000..f6dcee1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PlusSign2Selected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Humidity.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Humidity.png
new file mode 100755
index 0000000..4986073
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Humidity.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/List.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/List.png
new file mode 100755
index 0000000..b63955c
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/List.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Temperature.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Temperature.png
new file mode 100755
index 0000000..fc66b4f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Temperature.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/Background.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/Background.png
new file mode 100755
index 0000000..10c30f2
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/Background.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 0bbf23c..5f603fa 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -1266,6 +1266,30 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\MinusSign2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\MinusSign2Selected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\PlusSign2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\PlusSign2Selected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\Humidity.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\List.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\Temperature.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Scene\Background.png" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 1bf5fc4..f97a88d 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019112901" android:installLocation="auto" android:versionName="1.0.19112901">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019120501" android:installLocation="auto" android:versionName="1.0.19120501">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 8bc0fda..703272a 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -34,221 +34,221 @@
public partial class Animation
{
- // aapt resource value: 0x7f050000
- public const int abc_fade_in = 2131034112;
+ // aapt resource value: 0x7F010000
+ public const int abc_fade_in = 2130771968;
- // aapt resource value: 0x7f050001
- public const int abc_fade_out = 2131034113;
+ // aapt resource value: 0x7F010001
+ public const int abc_fade_out = 2130771969;
- // aapt resource value: 0x7f050002
- public const int abc_grow_fade_in_from_bottom = 2131034114;
+ // aapt resource value: 0x7F010002
+ public const int abc_grow_fade_in_from_bottom = 2130771970;
- // aapt resource value: 0x7f050003
- public const int abc_popup_enter = 2131034115;
+ // aapt resource value: 0x7F010003
+ public const int abc_popup_enter = 2130771971;
- // aapt resource value: 0x7f050004
- public const int abc_popup_exit = 2131034116;
+ // aapt resource value: 0x7F010004
+ public const int abc_popup_exit = 2130771972;
- // aapt resource value: 0x7f050005
- public const int abc_shrink_fade_out_from_bottom = 2131034117;
+ // aapt resource value: 0x7F010005
+ public const int abc_shrink_fade_out_from_bottom = 2130771973;
- // aapt resource value: 0x7f050006
- public const int abc_slide_in_bottom = 2131034118;
+ // aapt resource value: 0x7F010006
+ public const int abc_slide_in_bottom = 2130771974;
- // aapt resource value: 0x7f050007
- public const int abc_slide_in_top = 2131034119;
+ // aapt resource value: 0x7F010007
+ public const int abc_slide_in_top = 2130771975;
- // aapt resource value: 0x7f050008
- public const int abc_slide_out_bottom = 2131034120;
+ // aapt resource value: 0x7F010008
+ public const int abc_slide_out_bottom = 2130771976;
- // aapt resource value: 0x7f050009
- public const int abc_slide_out_top = 2131034121;
+ // aapt resource value: 0x7F010009
+ public const int abc_slide_out_top = 2130771977;
- // aapt resource value: 0x7f05000a
- public const int fingerprint_draw_off_animation_interpolator_0 = 2131034122;
+ // aapt resource value: 0x7F01000A
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2130771978;
- // aapt resource value: 0x7f05000b
- public const int fingerprint_draw_off_animation_interpolator_1 = 2131034123;
+ // aapt resource value: 0x7F01000B
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2130771979;
- // aapt resource value: 0x7f05000c
- public const int fingerprint_draw_off_ridge_1_path_animation = 2131034124;
+ // aapt resource value: 0x7F01000C
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2130771980;
- // aapt resource value: 0x7f05000d
- public const int fingerprint_draw_off_ridge_2_path_animation = 2131034125;
+ // aapt resource value: 0x7F01000D
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2130771981;
- // aapt resource value: 0x7f05000e
- public const int fingerprint_draw_off_ridge_5_path_animation = 2131034126;
+ // aapt resource value: 0x7F01000E
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2130771982;
- // aapt resource value: 0x7f05000f
- public const int fingerprint_draw_off_ridge_6_path_animation = 2131034127;
+ // aapt resource value: 0x7F01000F
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2130771983;
- // aapt resource value: 0x7f050010
- public const int fingerprint_draw_off_ridge_7_path_animation = 2131034128;
+ // aapt resource value: 0x7F010010
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2130771984;
- // aapt resource value: 0x7f050011
- public const int fingerprint_draw_on_animation_interpolator_0 = 2131034129;
+ // aapt resource value: 0x7F010011
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2130771985;
- // aapt resource value: 0x7f050012
- public const int fingerprint_draw_on_animation_interpolator_1 = 2131034130;
+ // aapt resource value: 0x7F010012
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2130771986;
- // aapt resource value: 0x7f050013
- public const int fingerprint_draw_on_ridge_1_path_animation = 2131034131;
+ // aapt resource value: 0x7F010013
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2130771987;
- // aapt resource value: 0x7f050014
- public const int fingerprint_draw_on_ridge_2_path_animation = 2131034132;
+ // aapt resource value: 0x7F010014
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2130771988;
- // aapt resource value: 0x7f050015
- public const int fingerprint_draw_on_ridge_5_path_animation = 2131034133;
+ // aapt resource value: 0x7F010015
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2130771989;
- // aapt resource value: 0x7f050016
- public const int fingerprint_draw_on_ridge_6_path_animation = 2131034134;
+ // aapt resource value: 0x7F010016
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2130771990;
- // aapt resource value: 0x7f050017
- public const int fingerprint_draw_on_ridge_7_path_animation = 2131034135;
+ // aapt resource value: 0x7F010017
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2130771991;
- // aapt resource value: 0x7f050018
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034136;
+ // aapt resource value: 0x7F010018
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771992;
- // aapt resource value: 0x7f050019
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034137;
+ // aapt resource value: 0x7F010019
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771993;
- // aapt resource value: 0x7f05001a
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034138;
+ // aapt resource value: 0x7F01001A
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771994;
- // aapt resource value: 0x7f05001b
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034139;
+ // aapt resource value: 0x7F01001B
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771995;
- // aapt resource value: 0x7f05001c
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034140;
+ // aapt resource value: 0x7F01001C
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130771996;
- // aapt resource value: 0x7f05001d
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034141;
+ // aapt resource value: 0x7F01001D
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130771997;
- // aapt resource value: 0x7f05001e
- public const int fingerprint_error_state_to_fp_group_1_animation = 2131034142;
+ // aapt resource value: 0x7F01001E
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2130771998;
- // aapt resource value: 0x7f05001f
- public const int fingerprint_error_state_to_fp_group_2_animation = 2131034143;
+ // aapt resource value: 0x7F01001F
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2130771999;
- // aapt resource value: 0x7f050020
- public const int fingerprint_error_state_to_fp_path_1_animation = 2131034144;
+ // aapt resource value: 0x7F010020
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2130772000;
- // aapt resource value: 0x7f050021
- public const int fingerprint_error_state_to_fp_path_2_animation = 2131034145;
+ // aapt resource value: 0x7F010021
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2130772001;
- // aapt resource value: 0x7f050022
- public const int fingerprint_error_state_to_fp_path_3_animation = 2131034146;
+ // aapt resource value: 0x7F010022
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2130772002;
- // aapt resource value: 0x7f050023
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034147;
+ // aapt resource value: 0x7F010023
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772003;
- // aapt resource value: 0x7f050024
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034148;
+ // aapt resource value: 0x7F010024
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772004;
- // aapt resource value: 0x7f050025
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034149;
+ // aapt resource value: 0x7F010025
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772005;
- // aapt resource value: 0x7f050026
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034150;
+ // aapt resource value: 0x7F010026
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772006;
- // aapt resource value: 0x7f050027
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034151;
+ // aapt resource value: 0x7F010027
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772007;
- // aapt resource value: 0x7f050028
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034152;
+ // aapt resource value: 0x7F010028
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772008;
- // aapt resource value: 0x7f050029
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034153;
+ // aapt resource value: 0x7F010029
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772009;
- // aapt resource value: 0x7f05002a
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034154;
+ // aapt resource value: 0x7F01002A
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772010;
- // aapt resource value: 0x7f05002b
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034155;
+ // aapt resource value: 0x7F01002B
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772011;
- // aapt resource value: 0x7f05002c
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034156;
+ // aapt resource value: 0x7F01002C
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772012;
- // aapt resource value: 0x7f05002d
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034157;
+ // aapt resource value: 0x7F01002D
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772013;
- // aapt resource value: 0x7f05002e
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034158;
+ // aapt resource value: 0x7F01002E
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772014;
- // aapt resource value: 0x7f05002f
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034159;
+ // aapt resource value: 0x7F01002F
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772015;
- // aapt resource value: 0x7f050030
- public const int fingerprint_fp_to_error_state_group_1_animation = 2131034160;
+ // aapt resource value: 0x7F010030
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2130772016;
- // aapt resource value: 0x7f050031
- public const int fingerprint_fp_to_error_state_group_2_animation = 2131034161;
+ // aapt resource value: 0x7F010031
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2130772017;
- // aapt resource value: 0x7f050032
- public const int fingerprint_fp_to_error_state_path_1_animation = 2131034162;
+ // aapt resource value: 0x7F010032
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2130772018;
- // aapt resource value: 0x7f050033
- public const int fingerprint_fp_to_error_state_path_2_animation = 2131034163;
+ // aapt resource value: 0x7F010033
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2130772019;
- // aapt resource value: 0x7f050034
- public const int fingerprint_fp_to_error_state_path_3_animation = 2131034164;
+ // aapt resource value: 0x7F010034
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2130772020;
- // aapt resource value: 0x7f050035
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034165;
+ // aapt resource value: 0x7F010035
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772021;
- // aapt resource value: 0x7f050036
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034166;
+ // aapt resource value: 0x7F010036
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772022;
- // aapt resource value: 0x7f050037
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034167;
+ // aapt resource value: 0x7F010037
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772023;
- // aapt resource value: 0x7f050038
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034168;
+ // aapt resource value: 0x7F010038
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772024;
- // aapt resource value: 0x7f050039
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034169;
+ // aapt resource value: 0x7F010039
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772025;
- // aapt resource value: 0x7f05003a
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034170;
+ // aapt resource value: 0x7F01003A
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772026;
- // aapt resource value: 0x7f05003b
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034171;
+ // aapt resource value: 0x7F01003B
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772027;
- // aapt resource value: 0x7f05003c
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034172;
+ // aapt resource value: 0x7F01003C
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772028;
- // aapt resource value: 0x7f05003d
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034173;
+ // aapt resource value: 0x7F01003D
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772029;
- // aapt resource value: 0x7f05003e
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034174;
+ // aapt resource value: 0x7F01003E
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772030;
- // aapt resource value: 0x7f05003f
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034175;
+ // aapt resource value: 0x7F01003F
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772031;
- // aapt resource value: 0x7f050040
- public const int move_in = 2131034176;
+ // aapt resource value: 0x7F010040
+ public const int move_in = 2130772032;
- // aapt resource value: 0x7f050041
- public const int move_out = 2131034177;
+ // aapt resource value: 0x7F010041
+ public const int move_out = 2130772033;
- // aapt resource value: 0x7f050042
- public const int pickerview_dialog_scale_in = 2131034178;
+ // aapt resource value: 0x7F010042
+ public const int pickerview_dialog_scale_in = 2130772034;
- // aapt resource value: 0x7f050043
- public const int pickerview_dialog_scale_out = 2131034179;
+ // aapt resource value: 0x7F010043
+ public const int pickerview_dialog_scale_out = 2130772035;
- // aapt resource value: 0x7f050044
- public const int pickerview_slide_in_bottom = 2131034180;
+ // aapt resource value: 0x7F010044
+ public const int pickerview_slide_in_bottom = 2130772036;
- // aapt resource value: 0x7f050045
- public const int pickerview_slide_out_bottom = 2131034181;
+ // aapt resource value: 0x7F010045
+ public const int pickerview_slide_out_bottom = 2130772037;
- // aapt resource value: 0x7f050046
- public const int tooltip_enter = 2131034182;
+ // aapt resource value: 0x7F010046
+ public const int tooltip_enter = 2130772038;
- // aapt resource value: 0x7f050047
- public const int tooltip_exit = 2131034183;
+ // aapt resource value: 0x7F010047
+ public const int tooltip_exit = 2130772039;
static Animation()
{
@@ -263,8 +263,8 @@
public partial class Array
{
- // aapt resource value: 0x7f0e0000
- public const int arc_colors_default = 2131623936;
+ // aapt resource value: 0x7F020000
+ public const int arc_colors_default = 2130837504;
static Array()
{
@@ -279,1109 +279,1109 @@
public partial class Attribute
{
- // aapt resource value: 0x7f010052
- public const int actionBarDivider = 2130772050;
+ // aapt resource value: 0x7F030000
+ public const int actionBarDivider = 2130903040;
- // aapt resource value: 0x7f010053
- public const int actionBarItemBackground = 2130772051;
+ // aapt resource value: 0x7F030001
+ public const int actionBarItemBackground = 2130903041;
- // aapt resource value: 0x7f01004c
- public const int actionBarPopupTheme = 2130772044;
+ // aapt resource value: 0x7F030002
+ public const int actionBarPopupTheme = 2130903042;
- // aapt resource value: 0x7f010051
- public const int actionBarSize = 2130772049;
+ // aapt resource value: 0x7F030003
+ public const int actionBarSize = 2130903043;
- // aapt resource value: 0x7f01004e
- public const int actionBarSplitStyle = 2130772046;
+ // aapt resource value: 0x7F030004
+ public const int actionBarSplitStyle = 2130903044;
- // aapt resource value: 0x7f01004d
- public const int actionBarStyle = 2130772045;
+ // aapt resource value: 0x7F030005
+ public const int actionBarStyle = 2130903045;
- // aapt resource value: 0x7f010048
- public const int actionBarTabBarStyle = 2130772040;
+ // aapt resource value: 0x7F030006
+ public const int actionBarTabBarStyle = 2130903046;
- // aapt resource value: 0x7f010047
- public const int actionBarTabStyle = 2130772039;
+ // aapt resource value: 0x7F030007
+ public const int actionBarTabStyle = 2130903047;
- // aapt resource value: 0x7f010049
- public const int actionBarTabTextStyle = 2130772041;
+ // aapt resource value: 0x7F030008
+ public const int actionBarTabTextStyle = 2130903048;
- // aapt resource value: 0x7f01004f
- public const int actionBarTheme = 2130772047;
+ // aapt resource value: 0x7F030009
+ public const int actionBarTheme = 2130903049;
- // aapt resource value: 0x7f010050
- public const int actionBarWidgetTheme = 2130772048;
+ // aapt resource value: 0x7F03000A
+ public const int actionBarWidgetTheme = 2130903050;
- // aapt resource value: 0x7f01006d
- public const int actionButtonStyle = 2130772077;
+ // aapt resource value: 0x7F03000B
+ public const int actionButtonStyle = 2130903051;
- // aapt resource value: 0x7f010069
- public const int actionDropDownStyle = 2130772073;
+ // aapt resource value: 0x7F03000C
+ public const int actionDropDownStyle = 2130903052;
- // aapt resource value: 0x7f0100c4
- public const int actionLayout = 2130772164;
+ // aapt resource value: 0x7F03000D
+ public const int actionLayout = 2130903053;
- // aapt resource value: 0x7f010054
- public const int actionMenuTextAppearance = 2130772052;
+ // aapt resource value: 0x7F03000E
+ public const int actionMenuTextAppearance = 2130903054;
- // aapt resource value: 0x7f010055
- public const int actionMenuTextColor = 2130772053;
+ // aapt resource value: 0x7F03000F
+ public const int actionMenuTextColor = 2130903055;
- // aapt resource value: 0x7f010058
- public const int actionModeBackground = 2130772056;
+ // aapt resource value: 0x7F030010
+ public const int actionModeBackground = 2130903056;
- // aapt resource value: 0x7f010057
- public const int actionModeCloseButtonStyle = 2130772055;
+ // aapt resource value: 0x7F030011
+ public const int actionModeCloseButtonStyle = 2130903057;
- // aapt resource value: 0x7f01005a
- public const int actionModeCloseDrawable = 2130772058;
+ // aapt resource value: 0x7F030012
+ public const int actionModeCloseDrawable = 2130903058;
- // aapt resource value: 0x7f01005c
- public const int actionModeCopyDrawable = 2130772060;
+ // aapt resource value: 0x7F030013
+ public const int actionModeCopyDrawable = 2130903059;
- // aapt resource value: 0x7f01005b
- public const int actionModeCutDrawable = 2130772059;
+ // aapt resource value: 0x7F030014
+ public const int actionModeCutDrawable = 2130903060;
- // aapt resource value: 0x7f010060
- public const int actionModeFindDrawable = 2130772064;
+ // aapt resource value: 0x7F030015
+ public const int actionModeFindDrawable = 2130903061;
- // aapt resource value: 0x7f01005d
- public const int actionModePasteDrawable = 2130772061;
+ // aapt resource value: 0x7F030016
+ public const int actionModePasteDrawable = 2130903062;
- // aapt resource value: 0x7f010062
- public const int actionModePopupWindowStyle = 2130772066;
+ // aapt resource value: 0x7F030017
+ public const int actionModePopupWindowStyle = 2130903063;
- // aapt resource value: 0x7f01005e
- public const int actionModeSelectAllDrawable = 2130772062;
+ // aapt resource value: 0x7F030018
+ public const int actionModeSelectAllDrawable = 2130903064;
- // aapt resource value: 0x7f01005f
- public const int actionModeShareDrawable = 2130772063;
+ // aapt resource value: 0x7F030019
+ public const int actionModeShareDrawable = 2130903065;
- // aapt resource value: 0x7f010059
- public const int actionModeSplitBackground = 2130772057;
+ // aapt resource value: 0x7F03001A
+ public const int actionModeSplitBackground = 2130903066;
- // aapt resource value: 0x7f010056
- public const int actionModeStyle = 2130772054;
+ // aapt resource value: 0x7F03001B
+ public const int actionModeStyle = 2130903067;
- // aapt resource value: 0x7f010061
- public const int actionModeWebSearchDrawable = 2130772065;
+ // aapt resource value: 0x7F03001C
+ public const int actionModeWebSearchDrawable = 2130903068;
- // aapt resource value: 0x7f01004a
- public const int actionOverflowButtonStyle = 2130772042;
+ // aapt resource value: 0x7F03001D
+ public const int actionOverflowButtonStyle = 2130903069;
- // aapt resource value: 0x7f01004b
- public const int actionOverflowMenuStyle = 2130772043;
+ // aapt resource value: 0x7F03001E
+ public const int actionOverflowMenuStyle = 2130903070;
- // aapt resource value: 0x7f0100c6
- public const int actionProviderClass = 2130772166;
+ // aapt resource value: 0x7F03001F
+ public const int actionProviderClass = 2130903071;
- // aapt resource value: 0x7f0100c5
- public const int actionViewClass = 2130772165;
+ // aapt resource value: 0x7F030020
+ public const int actionViewClass = 2130903072;
- // aapt resource value: 0x7f010075
- public const int activityChooserViewStyle = 2130772085;
+ // aapt resource value: 0x7F030021
+ public const int activityChooserViewStyle = 2130903073;
- // aapt resource value: 0x7f01009a
- public const int alertDialogButtonGroupStyle = 2130772122;
+ // aapt resource value: 0x7F030022
+ public const int alertDialogButtonGroupStyle = 2130903074;
- // aapt resource value: 0x7f01009b
- public const int alertDialogCenterButtons = 2130772123;
+ // aapt resource value: 0x7F030023
+ public const int alertDialogCenterButtons = 2130903075;
- // aapt resource value: 0x7f010099
- public const int alertDialogStyle = 2130772121;
+ // aapt resource value: 0x7F030024
+ public const int alertDialogStyle = 2130903076;
- // aapt resource value: 0x7f01009c
- public const int alertDialogTheme = 2130772124;
+ // aapt resource value: 0x7F030025
+ public const int alertDialogTheme = 2130903077;
- // aapt resource value: 0x7f0100b2
- public const int allowStacking = 2130772146;
+ // aapt resource value: 0x7F030026
+ public const int allowStacking = 2130903078;
- // aapt resource value: 0x7f0100b3
- public const int alpha = 2130772147;
+ // aapt resource value: 0x7F030027
+ public const int alpha = 2130903079;
- // aapt resource value: 0x7f0100c1
- public const int alphabeticModifiers = 2130772161;
+ // aapt resource value: 0x7F030028
+ public const int alphabeticModifiers = 2130903080;
- // aapt resource value: 0x7f010151
- public const int arc_border_color = 2130772305;
+ // aapt resource value: 0x7F030029
+ public const int arc_border_color = 2130903081;
- // aapt resource value: 0x7f010150
- public const int arc_border_width = 2130772304;
+ // aapt resource value: 0x7F03002A
+ public const int arc_border_width = 2130903082;
- // aapt resource value: 0x7f01014f
- public const int arc_colors = 2130772303;
+ // aapt resource value: 0x7F03002B
+ public const int arc_colors = 2130903083;
- // aapt resource value: 0x7f010152
- public const int arc_max = 2130772306;
+ // aapt resource value: 0x7F03002C
+ public const int arc_max = 2130903084;
- // aapt resource value: 0x7f010153
- public const int arc_min = 2130772307;
+ // aapt resource value: 0x7F03002D
+ public const int arc_min = 2130903085;
- // aapt resource value: 0x7f01014d
- public const int arc_open_angle = 2130772301;
+ // aapt resource value: 0x7F03002E
+ public const int arc_open_angle = 2130903086;
- // aapt resource value: 0x7f010154
- public const int arc_progress = 2130772308;
+ // aapt resource value: 0x7F03002F
+ public const int arc_progress = 2130903087;
- // aapt resource value: 0x7f01015c
- public const int arc_progress_bar_color = 2130772316;
+ // aapt resource value: 0x7F030030
+ public const int arc_progress_bar_color = 2130903088;
- // aapt resource value: 0x7f01015d
- public const int arc_progress_bar_text_unit = 2130772317;
+ // aapt resource value: 0x7F030031
+ public const int arc_progress_bar_text_unit = 2130903089;
- // aapt resource value: 0x7f01014e
- public const int arc_rotate_angle = 2130772302;
+ // aapt resource value: 0x7F030032
+ public const int arc_rotate_angle = 2130903090;
- // aapt resource value: 0x7f01015b
- public const int arc_shadow_radius = 2130772315;
+ // aapt resource value: 0x7F030033
+ public const int arc_shadow_radius = 2130903091;
- // aapt resource value: 0x7f010156
- public const int arc_thumb_color = 2130772310;
+ // aapt resource value: 0x7F030034
+ public const int arc_thumb_color = 2130903092;
- // aapt resource value: 0x7f010157
- public const int arc_thumb_radius = 2130772311;
+ // aapt resource value: 0x7F030035
+ public const int arc_thumb_radius = 2130903093;
- // aapt resource value: 0x7f010159
- public const int arc_thumb_shadow_color = 2130772313;
+ // aapt resource value: 0x7F030036
+ public const int arc_thumb_shadow_color = 2130903094;
- // aapt resource value: 0x7f010158
- public const int arc_thumb_shadow_radius = 2130772312;
+ // aapt resource value: 0x7F030037
+ public const int arc_thumb_shadow_radius = 2130903095;
- // aapt resource value: 0x7f010155
- public const int arc_thumb_width = 2130772309;
+ // aapt resource value: 0x7F030038
+ public const int arc_thumb_width = 2130903096;
- // aapt resource value: 0x7f01014c
- public const int arc_width = 2130772300;
+ // aapt resource value: 0x7F030039
+ public const int arc_width = 2130903097;
- // aapt resource value: 0x7f0100ba
- public const int arrowHeadLength = 2130772154;
+ // aapt resource value: 0x7F03003A
+ public const int arrowHeadLength = 2130903098;
- // aapt resource value: 0x7f0100bb
- public const int arrowShaftLength = 2130772155;
+ // aapt resource value: 0x7F03003B
+ public const int arrowShaftLength = 2130903099;
- // aapt resource value: 0x7f0100a1
- public const int autoCompleteTextViewStyle = 2130772129;
+ // aapt resource value: 0x7F03003C
+ public const int autoCompleteTextViewStyle = 2130903100;
- // aapt resource value: 0x7f01003b
- public const int autoSizeMaxTextSize = 2130772027;
+ // aapt resource value: 0x7F03003D
+ public const int autoSizeMaxTextSize = 2130903101;
- // aapt resource value: 0x7f01003a
- public const int autoSizeMinTextSize = 2130772026;
+ // aapt resource value: 0x7F03003E
+ public const int autoSizeMinTextSize = 2130903102;
- // aapt resource value: 0x7f010039
- public const int autoSizePresetSizes = 2130772025;
+ // aapt resource value: 0x7F03003F
+ public const int autoSizePresetSizes = 2130903103;
- // aapt resource value: 0x7f010038
- public const int autoSizeStepGranularity = 2130772024;
+ // aapt resource value: 0x7F030040
+ public const int autoSizeStepGranularity = 2130903104;
- // aapt resource value: 0x7f010037
- public const int autoSizeTextType = 2130772023;
+ // aapt resource value: 0x7F030041
+ public const int autoSizeTextType = 2130903105;
- // aapt resource value: 0x7f010015
- public const int background = 2130771989;
+ // aapt resource value: 0x7F030042
+ public const int background = 2130903106;
- // aapt resource value: 0x7f010017
- public const int backgroundSplit = 2130771991;
+ // aapt resource value: 0x7F030043
+ public const int backgroundSplit = 2130903107;
- // aapt resource value: 0x7f010016
- public const int backgroundStacked = 2130771990;
+ // aapt resource value: 0x7F030044
+ public const int backgroundStacked = 2130903108;
- // aapt resource value: 0x7f0100fd
- public const int backgroundTint = 2130772221;
+ // aapt resource value: 0x7F030045
+ public const int backgroundTint = 2130903109;
- // aapt resource value: 0x7f0100fe
- public const int backgroundTintMode = 2130772222;
+ // aapt resource value: 0x7F030046
+ public const int backgroundTintMode = 2130903110;
- // aapt resource value: 0x7f0100bc
- public const int barLength = 2130772156;
+ // aapt resource value: 0x7F030047
+ public const int barLength = 2130903111;
- // aapt resource value: 0x7f010108
- public const int biometricPromptDialogTheme = 2130772232;
+ // aapt resource value: 0x7F030048
+ public const int biometricPromptDialogTheme = 2130903112;
- // aapt resource value: 0x7f010072
- public const int borderlessButtonStyle = 2130772082;
+ // aapt resource value: 0x7F030049
+ public const int borderlessButtonStyle = 2130903113;
- // aapt resource value: 0x7f01006f
- public const int buttonBarButtonStyle = 2130772079;
+ // aapt resource value: 0x7F03004A
+ public const int buttonBarButtonStyle = 2130903114;
- // aapt resource value: 0x7f01009f
- public const int buttonBarNegativeButtonStyle = 2130772127;
+ // aapt resource value: 0x7F03004B
+ public const int buttonBarNegativeButtonStyle = 2130903115;
- // aapt resource value: 0x7f0100a0
- public const int buttonBarNeutralButtonStyle = 2130772128;
+ // aapt resource value: 0x7F03004C
+ public const int buttonBarNeutralButtonStyle = 2130903116;
- // aapt resource value: 0x7f01009e
- public const int buttonBarPositiveButtonStyle = 2130772126;
+ // aapt resource value: 0x7F03004D
+ public const int buttonBarPositiveButtonStyle = 2130903117;
- // aapt resource value: 0x7f01006e
- public const int buttonBarStyle = 2130772078;
+ // aapt resource value: 0x7F03004E
+ public const int buttonBarStyle = 2130903118;
- // aapt resource value: 0x7f0100f2
- public const int buttonGravity = 2130772210;
+ // aapt resource value: 0x7F03004F
+ public const int buttonGravity = 2130903119;
- // aapt resource value: 0x7f01002a
- public const int buttonPanelSideLayout = 2130772010;
+ // aapt resource value: 0x7F030050
+ public const int buttonPanelSideLayout = 2130903120;
- // aapt resource value: 0x7f0100a2
- public const int buttonStyle = 2130772130;
+ // aapt resource value: 0x7F030051
+ public const int buttonStyle = 2130903121;
- // aapt resource value: 0x7f0100a3
- public const int buttonStyleSmall = 2130772131;
+ // aapt resource value: 0x7F030052
+ public const int buttonStyleSmall = 2130903122;
- // aapt resource value: 0x7f0100b4
- public const int buttonTint = 2130772148;
+ // aapt resource value: 0x7F030053
+ public const int buttonTint = 2130903123;
- // aapt resource value: 0x7f0100b5
- public const int buttonTintMode = 2130772149;
+ // aapt resource value: 0x7F030054
+ public const int buttonTintMode = 2130903124;
- // aapt resource value: 0x7f0100a4
- public const int checkboxStyle = 2130772132;
+ // aapt resource value: 0x7F030055
+ public const int checkboxStyle = 2130903125;
- // aapt resource value: 0x7f0100a5
- public const int checkedTextViewStyle = 2130772133;
+ // aapt resource value: 0x7F030056
+ public const int checkedTextViewStyle = 2130903126;
- // aapt resource value: 0x7f0100d5
- public const int closeIcon = 2130772181;
+ // aapt resource value: 0x7F030057
+ public const int closeIcon = 2130903127;
- // aapt resource value: 0x7f010027
- public const int closeItemLayout = 2130772007;
+ // aapt resource value: 0x7F030058
+ public const int closeItemLayout = 2130903128;
- // aapt resource value: 0x7f0100f4
- public const int collapseContentDescription = 2130772212;
+ // aapt resource value: 0x7F030059
+ public const int collapseContentDescription = 2130903129;
- // aapt resource value: 0x7f0100f3
- public const int collapseIcon = 2130772211;
+ // aapt resource value: 0x7F03005A
+ public const int collapseIcon = 2130903130;
- // aapt resource value: 0x7f0100b6
- public const int color = 2130772150;
+ // aapt resource value: 0x7F03005B
+ public const int color = 2130903131;
- // aapt resource value: 0x7f010091
- public const int colorAccent = 2130772113;
+ // aapt resource value: 0x7F03005C
+ public const int colorAccent = 2130903132;
- // aapt resource value: 0x7f010098
- public const int colorBackgroundFloating = 2130772120;
+ // aapt resource value: 0x7F03005D
+ public const int colorBackgroundFloating = 2130903133;
- // aapt resource value: 0x7f010095
- public const int colorButtonNormal = 2130772117;
+ // aapt resource value: 0x7F03005E
+ public const int colorButtonNormal = 2130903134;
- // aapt resource value: 0x7f010093
- public const int colorControlActivated = 2130772115;
+ // aapt resource value: 0x7F03005F
+ public const int colorControlActivated = 2130903135;
- // aapt resource value: 0x7f010094
- public const int colorControlHighlight = 2130772116;
+ // aapt resource value: 0x7F030060
+ public const int colorControlHighlight = 2130903136;
- // aapt resource value: 0x7f010092
- public const int colorControlNormal = 2130772114;
+ // aapt resource value: 0x7F030061
+ public const int colorControlNormal = 2130903137;
- // aapt resource value: 0x7f0100b1
- public const int colorError = 2130772145;
+ // aapt resource value: 0x7F030062
+ public const int colorError = 2130903138;
- // aapt resource value: 0x7f01008f
- public const int colorPrimary = 2130772111;
+ // aapt resource value: 0x7F030063
+ public const int colorPrimary = 2130903139;
- // aapt resource value: 0x7f010090
- public const int colorPrimaryDark = 2130772112;
+ // aapt resource value: 0x7F030064
+ public const int colorPrimaryDark = 2130903140;
- // aapt resource value: 0x7f010096
- public const int colorSwitchThumbNormal = 2130772118;
+ // aapt resource value: 0x7F030065
+ public const int colorSwitchThumbNormal = 2130903141;
- // aapt resource value: 0x7f0100da
- public const int commitIcon = 2130772186;
+ // aapt resource value: 0x7F030066
+ public const int commitIcon = 2130903142;
- // aapt resource value: 0x7f0100c7
- public const int contentDescription = 2130772167;
+ // aapt resource value: 0x7F030067
+ public const int contentDescription = 2130903143;
- // aapt resource value: 0x7f010020
- public const int contentInsetEnd = 2130772000;
+ // aapt resource value: 0x7F030068
+ public const int contentInsetEnd = 2130903144;
- // aapt resource value: 0x7f010024
- public const int contentInsetEndWithActions = 2130772004;
+ // aapt resource value: 0x7F030069
+ public const int contentInsetEndWithActions = 2130903145;
- // aapt resource value: 0x7f010021
- public const int contentInsetLeft = 2130772001;
+ // aapt resource value: 0x7F03006A
+ public const int contentInsetLeft = 2130903146;
- // aapt resource value: 0x7f010022
- public const int contentInsetRight = 2130772002;
+ // aapt resource value: 0x7F03006B
+ public const int contentInsetRight = 2130903147;
- // aapt resource value: 0x7f01001f
- public const int contentInsetStart = 2130771999;
+ // aapt resource value: 0x7F03006C
+ public const int contentInsetStart = 2130903148;
- // aapt resource value: 0x7f010023
- public const int contentInsetStartWithNavigation = 2130772003;
+ // aapt resource value: 0x7F03006D
+ public const int contentInsetStartWithNavigation = 2130903149;
- // aapt resource value: 0x7f010097
- public const int controlBackground = 2130772119;
+ // aapt resource value: 0x7F03006E
+ public const int controlBackground = 2130903150;
- // aapt resource value: 0x7f010160
- public const int curtain_bar_bg_color = 2130772320;
+ // aapt resource value: 0x7F03006F
+ public const int curtain_bar_bg_color = 2130903151;
- // aapt resource value: 0x7f010161
- public const int curtain_bar_border_color = 2130772321;
+ // aapt resource value: 0x7F030070
+ public const int curtain_bar_border_color = 2130903152;
- // aapt resource value: 0x7f01015e
- public const int curtain_bar_color = 2130772318;
+ // aapt resource value: 0x7F030071
+ public const int curtain_bar_color = 2130903153;
- // aapt resource value: 0x7f010163
- public const int curtain_bar_height = 2130772323;
+ // aapt resource value: 0x7F030072
+ public const int curtain_bar_height = 2130903154;
- // aapt resource value: 0x7f010162
- public const int curtain_bar_width = 2130772322;
+ // aapt resource value: 0x7F030073
+ public const int curtain_bar_width = 2130903155;
- // aapt resource value: 0x7f010018
- public const int customNavigationLayout = 2130771992;
+ // aapt resource value: 0x7F030074
+ public const int customNavigationLayout = 2130903156;
- // aapt resource value: 0x7f0100d4
- public const int defaultQueryHint = 2130772180;
+ // aapt resource value: 0x7F030075
+ public const int defaultQueryHint = 2130903157;
- // aapt resource value: 0x7f010067
- public const int dialogPreferredPadding = 2130772071;
+ // aapt resource value: 0x7F030076
+ public const int dialogPreferredPadding = 2130903158;
- // aapt resource value: 0x7f010066
- public const int dialogTheme = 2130772070;
+ // aapt resource value: 0x7F030077
+ public const int dialogTheme = 2130903159;
- // aapt resource value: 0x7f01000e
- public const int displayOptions = 2130771982;
+ // aapt resource value: 0x7F030078
+ public const int displayOptions = 2130903160;
- // aapt resource value: 0x7f010014
- public const int divider = 2130771988;
+ // aapt resource value: 0x7F030079
+ public const int divider = 2130903161;
- // aapt resource value: 0x7f010074
- public const int dividerHorizontal = 2130772084;
+ // aapt resource value: 0x7F03007A
+ public const int dividerHorizontal = 2130903162;
- // aapt resource value: 0x7f0100c0
- public const int dividerPadding = 2130772160;
+ // aapt resource value: 0x7F03007B
+ public const int dividerPadding = 2130903163;
- // aapt resource value: 0x7f010073
- public const int dividerVertical = 2130772083;
+ // aapt resource value: 0x7F03007C
+ public const int dividerVertical = 2130903164;
- // aapt resource value: 0x7f0100b8
- public const int drawableSize = 2130772152;
+ // aapt resource value: 0x7F03007D
+ public const int drawableSize = 2130903165;
- // aapt resource value: 0x7f010009
- public const int drawerArrowStyle = 2130771977;
+ // aapt resource value: 0x7F03007E
+ public const int drawerArrowStyle = 2130903166;
- // aapt resource value: 0x7f010086
- public const int dropDownListViewStyle = 2130772102;
+ // aapt resource value: 0x7F030080
+ public const int dropdownListPreferredItemHeight = 2130903168;
- // aapt resource value: 0x7f01006a
- public const int dropdownListPreferredItemHeight = 2130772074;
+ // aapt resource value: 0x7F03007F
+ public const int dropDownListViewStyle = 2130903167;
- // aapt resource value: 0x7f01007b
- public const int editTextBackground = 2130772091;
+ // aapt resource value: 0x7F030081
+ public const int editTextBackground = 2130903169;
- // aapt resource value: 0x7f01007a
- public const int editTextColor = 2130772090;
+ // aapt resource value: 0x7F030082
+ public const int editTextColor = 2130903170;
- // aapt resource value: 0x7f0100a6
- public const int editTextStyle = 2130772134;
+ // aapt resource value: 0x7F030083
+ public const int editTextStyle = 2130903171;
- // aapt resource value: 0x7f010025
- public const int elevation = 2130772005;
+ // aapt resource value: 0x7F030084
+ public const int elevation = 2130903172;
- // aapt resource value: 0x7f010029
- public const int expandActivityOverflowButtonDrawable = 2130772009;
+ // aapt resource value: 0x7F030085
+ public const int expandActivityOverflowButtonDrawable = 2130903173;
- // aapt resource value: 0x7f010004
- public const int fastScrollEnabled = 2130771972;
+ // aapt resource value: 0x7F030086
+ public const int fastScrollEnabled = 2130903174;
- // aapt resource value: 0x7f010007
- public const int fastScrollHorizontalThumbDrawable = 2130771975;
+ // aapt resource value: 0x7F030087
+ public const int fastScrollHorizontalThumbDrawable = 2130903175;
- // aapt resource value: 0x7f010008
- public const int fastScrollHorizontalTrackDrawable = 2130771976;
+ // aapt resource value: 0x7F030088
+ public const int fastScrollHorizontalTrackDrawable = 2130903176;
- // aapt resource value: 0x7f010005
- public const int fastScrollVerticalThumbDrawable = 2130771973;
+ // aapt resource value: 0x7F030089
+ public const int fastScrollVerticalThumbDrawable = 2130903177;
- // aapt resource value: 0x7f010006
- public const int fastScrollVerticalTrackDrawable = 2130771974;
+ // aapt resource value: 0x7F03008A
+ public const int fastScrollVerticalTrackDrawable = 2130903178;
- // aapt resource value: 0x7f010106
- public const int font = 2130772230;
+ // aapt resource value: 0x7F03008B
+ public const int font = 2130903179;
- // aapt resource value: 0x7f01003c
- public const int fontFamily = 2130772028;
+ // aapt resource value: 0x7F03008C
+ public const int fontFamily = 2130903180;
- // aapt resource value: 0x7f0100ff
- public const int fontProviderAuthority = 2130772223;
+ // aapt resource value: 0x7F03008D
+ public const int fontProviderAuthority = 2130903181;
- // aapt resource value: 0x7f010102
- public const int fontProviderCerts = 2130772226;
+ // aapt resource value: 0x7F03008E
+ public const int fontProviderCerts = 2130903182;
- // aapt resource value: 0x7f010103
- public const int fontProviderFetchStrategy = 2130772227;
+ // aapt resource value: 0x7F03008F
+ public const int fontProviderFetchStrategy = 2130903183;
- // aapt resource value: 0x7f010104
- public const int fontProviderFetchTimeout = 2130772228;
+ // aapt resource value: 0x7F030090
+ public const int fontProviderFetchTimeout = 2130903184;
- // aapt resource value: 0x7f010100
- public const int fontProviderPackage = 2130772224;
+ // aapt resource value: 0x7F030091
+ public const int fontProviderPackage = 2130903185;
- // aapt resource value: 0x7f010101
- public const int fontProviderQuery = 2130772225;
+ // aapt resource value: 0x7F030092
+ public const int fontProviderQuery = 2130903186;
- // aapt resource value: 0x7f010105
- public const int fontStyle = 2130772229;
+ // aapt resource value: 0x7F030093
+ public const int fontStyle = 2130903187;
- // aapt resource value: 0x7f010107
- public const int fontWeight = 2130772231;
+ // aapt resource value: 0x7F030094
+ public const int fontWeight = 2130903188;
- // aapt resource value: 0x7f0100b9
- public const int gapBetweenBars = 2130772153;
+ // aapt resource value: 0x7F030095
+ public const int gapBetweenBars = 2130903189;
- // aapt resource value: 0x7f0100d6
- public const int goIcon = 2130772182;
+ // aapt resource value: 0x7F030096
+ public const int goIcon = 2130903190;
- // aapt resource value: 0x7f01015a
- public const int hdl_arc_thumb_mode = 2130772314;
+ // aapt resource value: 0x7F030097
+ public const int hdl_arc_thumb_mode = 2130903191;
- // aapt resource value: 0x7f01000a
- public const int height = 2130771978;
+ // aapt resource value: 0x7F030098
+ public const int height = 2130903192;
- // aapt resource value: 0x7f01001e
- public const int hideOnContentScroll = 2130771998;
+ // aapt resource value: 0x7F030099
+ public const int hideOnContentScroll = 2130903193;
- // aapt resource value: 0x7f01006c
- public const int homeAsUpIndicator = 2130772076;
+ // aapt resource value: 0x7F03009A
+ public const int homeAsUpIndicator = 2130903194;
- // aapt resource value: 0x7f010019
- public const int homeLayout = 2130771993;
+ // aapt resource value: 0x7F03009B
+ public const int homeLayout = 2130903195;
- // aapt resource value: 0x7f010012
- public const int icon = 2130771986;
+ // aapt resource value: 0x7F03009C
+ public const int icon = 2130903196;
- // aapt resource value: 0x7f0100c9
- public const int iconTint = 2130772169;
+ // aapt resource value: 0x7F03009F
+ public const int iconifiedByDefault = 2130903199;
- // aapt resource value: 0x7f0100ca
- public const int iconTintMode = 2130772170;
+ // aapt resource value: 0x7F03009D
+ public const int iconTint = 2130903197;
- // aapt resource value: 0x7f0100d2
- public const int iconifiedByDefault = 2130772178;
+ // aapt resource value: 0x7F03009E
+ public const int iconTintMode = 2130903198;
- // aapt resource value: 0x7f01007c
- public const int imageButtonStyle = 2130772092;
+ // aapt resource value: 0x7F0300A0
+ public const int imageButtonStyle = 2130903200;
- // aapt resource value: 0x7f01001b
- public const int indeterminateProgressStyle = 2130771995;
+ // aapt resource value: 0x7F0300A1
+ public const int indeterminateProgressStyle = 2130903201;
- // aapt resource value: 0x7f010028
- public const int initialActivityCount = 2130772008;
+ // aapt resource value: 0x7F0300A2
+ public const int initialActivityCount = 2130903202;
- // aapt resource value: 0x7f01000b
- public const int isLightTheme = 2130771979;
+ // aapt resource value: 0x7F0300A3
+ public const int isLightTheme = 2130903203;
- // aapt resource value: 0x7f01001d
- public const int itemPadding = 2130771997;
+ // aapt resource value: 0x7F0300A4
+ public const int itemPadding = 2130903204;
- // aapt resource value: 0x7f0100d1
- public const int layout = 2130772177;
+ // aapt resource value: 0x7F0300A5
+ public const int layout = 2130903205;
- // aapt resource value: 0x7f010000
- public const int layoutManager = 2130771968;
+ // aapt resource value: 0x7F0300A6
+ public const int layoutManager = 2130903206;
- // aapt resource value: 0x7f010145
- public const int layout_srlBackgroundColor = 2130772293;
+ // aapt resource value: 0x7F0300A7
+ public const int layout_srlBackgroundColor = 2130903207;
- // aapt resource value: 0x7f010109
- public const int layout_srlSpinnerStyle = 2130772233;
+ // aapt resource value: 0x7F0300A8
+ public const int layout_srlSpinnerStyle = 2130903208;
- // aapt resource value: 0x7f01008e
- public const int listChoiceBackgroundIndicator = 2130772110;
+ // aapt resource value: 0x7F0300A9
+ public const int listChoiceBackgroundIndicator = 2130903209;
- // aapt resource value: 0x7f010068
- public const int listDividerAlertDialog = 2130772072;
+ // aapt resource value: 0x7F0300AA
+ public const int listDividerAlertDialog = 2130903210;
- // aapt resource value: 0x7f01002e
- public const int listItemLayout = 2130772014;
+ // aapt resource value: 0x7F0300AB
+ public const int listItemLayout = 2130903211;
- // aapt resource value: 0x7f01002b
- public const int listLayout = 2130772011;
+ // aapt resource value: 0x7F0300AC
+ public const int listLayout = 2130903212;
- // aapt resource value: 0x7f0100ae
- public const int listMenuViewStyle = 2130772142;
+ // aapt resource value: 0x7F0300AD
+ public const int listMenuViewStyle = 2130903213;
- // aapt resource value: 0x7f010087
- public const int listPopupWindowStyle = 2130772103;
+ // aapt resource value: 0x7F0300AE
+ public const int listPopupWindowStyle = 2130903214;
- // aapt resource value: 0x7f010081
- public const int listPreferredItemHeight = 2130772097;
+ // aapt resource value: 0x7F0300AF
+ public const int listPreferredItemHeight = 2130903215;
- // aapt resource value: 0x7f010083
- public const int listPreferredItemHeightLarge = 2130772099;
+ // aapt resource value: 0x7F0300B0
+ public const int listPreferredItemHeightLarge = 2130903216;
- // aapt resource value: 0x7f010082
- public const int listPreferredItemHeightSmall = 2130772098;
+ // aapt resource value: 0x7F0300B1
+ public const int listPreferredItemHeightSmall = 2130903217;
- // aapt resource value: 0x7f010084
- public const int listPreferredItemPaddingLeft = 2130772100;
+ // aapt resource value: 0x7F0300B2
+ public const int listPreferredItemPaddingLeft = 2130903218;
- // aapt resource value: 0x7f010085
- public const int listPreferredItemPaddingRight = 2130772101;
+ // aapt resource value: 0x7F0300B3
+ public const int listPreferredItemPaddingRight = 2130903219;
- // aapt resource value: 0x7f010013
- public const int logo = 2130771987;
+ // aapt resource value: 0x7F0300B4
+ public const int logo = 2130903220;
- // aapt resource value: 0x7f0100f7
- public const int logoDescription = 2130772215;
+ // aapt resource value: 0x7F0300B5
+ public const int logoDescription = 2130903221;
- // aapt resource value: 0x7f0100f1
- public const int maxButtonHeight = 2130772209;
+ // aapt resource value: 0x7F0300B6
+ public const int maxButtonHeight = 2130903222;
- // aapt resource value: 0x7f0100be
- public const int measureWithLargestChild = 2130772158;
+ // aapt resource value: 0x7F0300B7
+ public const int measureWithLargestChild = 2130903223;
- // aapt resource value: 0x7f01002c
- public const int multiChoiceItemLayout = 2130772012;
+ // aapt resource value: 0x7F0300B8
+ public const int multiChoiceItemLayout = 2130903224;
- // aapt resource value: 0x7f0100f6
- public const int navigationContentDescription = 2130772214;
+ // aapt resource value: 0x7F0300B9
+ public const int navigationContentDescription = 2130903225;
- // aapt resource value: 0x7f0100f5
- public const int navigationIcon = 2130772213;
+ // aapt resource value: 0x7F0300BA
+ public const int navigationIcon = 2130903226;
- // aapt resource value: 0x7f01000d
- public const int navigationMode = 2130771981;
+ // aapt resource value: 0x7F0300BB
+ public const int navigationMode = 2130903227;
- // aapt resource value: 0x7f0100c2
- public const int numericModifiers = 2130772162;
+ // aapt resource value: 0x7F0300BC
+ public const int numericModifiers = 2130903228;
- // aapt resource value: 0x7f0100cd
- public const int overlapAnchor = 2130772173;
+ // aapt resource value: 0x7F0300BD
+ public const int overlapAnchor = 2130903229;
- // aapt resource value: 0x7f0100cf
- public const int paddingBottomNoButtons = 2130772175;
+ // aapt resource value: 0x7F0300BE
+ public const int paddingBottomNoButtons = 2130903230;
- // aapt resource value: 0x7f0100fb
- public const int paddingEnd = 2130772219;
+ // aapt resource value: 0x7F0300BF
+ public const int paddingEnd = 2130903231;
- // aapt resource value: 0x7f0100fa
- public const int paddingStart = 2130772218;
+ // aapt resource value: 0x7F0300C0
+ public const int paddingStart = 2130903232;
- // aapt resource value: 0x7f0100d0
- public const int paddingTopNoTitle = 2130772176;
+ // aapt resource value: 0x7F0300C1
+ public const int paddingTopNoTitle = 2130903233;
- // aapt resource value: 0x7f01008b
- public const int panelBackground = 2130772107;
+ // aapt resource value: 0x7F0300C2
+ public const int panelBackground = 2130903234;
- // aapt resource value: 0x7f01008d
- public const int panelMenuListTheme = 2130772109;
+ // aapt resource value: 0x7F0300C3
+ public const int panelMenuListTheme = 2130903235;
- // aapt resource value: 0x7f01008c
- public const int panelMenuListWidth = 2130772108;
+ // aapt resource value: 0x7F0300C4
+ public const int panelMenuListWidth = 2130903236;
- // aapt resource value: 0x7f010078
- public const int popupMenuStyle = 2130772088;
+ // aapt resource value: 0x7F0300C5
+ public const int popupMenuStyle = 2130903237;
- // aapt resource value: 0x7f010026
- public const int popupTheme = 2130772006;
+ // aapt resource value: 0x7F0300C6
+ public const int popupTheme = 2130903238;
- // aapt resource value: 0x7f010079
- public const int popupWindowStyle = 2130772089;
+ // aapt resource value: 0x7F0300C7
+ public const int popupWindowStyle = 2130903239;
- // aapt resource value: 0x7f0100cb
- public const int preserveIconSpacing = 2130772171;
+ // aapt resource value: 0x7F0300C8
+ public const int preserveIconSpacing = 2130903240;
- // aapt resource value: 0x7f01001c
- public const int progressBarPadding = 2130771996;
+ // aapt resource value: 0x7F0300C9
+ public const int progressBarPadding = 2130903241;
- // aapt resource value: 0x7f01001a
- public const int progressBarStyle = 2130771994;
+ // aapt resource value: 0x7F0300CA
+ public const int progressBarStyle = 2130903242;
- // aapt resource value: 0x7f0100dc
- public const int queryBackground = 2130772188;
+ // aapt resource value: 0x7F0300CB
+ public const int queryBackground = 2130903243;
- // aapt resource value: 0x7f0100d3
- public const int queryHint = 2130772179;
+ // aapt resource value: 0x7F0300CC
+ public const int queryHint = 2130903244;
- // aapt resource value: 0x7f0100a7
- public const int radioButtonStyle = 2130772135;
+ // aapt resource value: 0x7F0300CD
+ public const int radioButtonStyle = 2130903245;
- // aapt resource value: 0x7f0100a8
- public const int ratingBarStyle = 2130772136;
+ // aapt resource value: 0x7F0300CE
+ public const int ratingBarStyle = 2130903246;
- // aapt resource value: 0x7f0100a9
- public const int ratingBarStyleIndicator = 2130772137;
+ // aapt resource value: 0x7F0300CF
+ public const int ratingBarStyleIndicator = 2130903247;
- // aapt resource value: 0x7f0100aa
- public const int ratingBarStyleSmall = 2130772138;
+ // aapt resource value: 0x7F0300D0
+ public const int ratingBarStyleSmall = 2130903248;
- // aapt resource value: 0x7f010002
- public const int reverseLayout = 2130771970;
+ // aapt resource value: 0x7F0300D1
+ public const int reverseLayout = 2130903249;
- // aapt resource value: 0x7f0100d8
- public const int searchHintIcon = 2130772184;
+ // aapt resource value: 0x7F0300D2
+ public const int searchHintIcon = 2130903250;
- // aapt resource value: 0x7f0100d7
- public const int searchIcon = 2130772183;
+ // aapt resource value: 0x7F0300D3
+ public const int searchIcon = 2130903251;
- // aapt resource value: 0x7f010080
- public const int searchViewStyle = 2130772096;
+ // aapt resource value: 0x7F0300D4
+ public const int searchViewStyle = 2130903252;
- // aapt resource value: 0x7f01015f
- public const int second_curtain_bar_color = 2130772319;
+ // aapt resource value: 0x7F0300D5
+ public const int second_curtain_bar_color = 2130903253;
- // aapt resource value: 0x7f010165
- public const int second_wave_color = 2130772325;
+ // aapt resource value: 0x7F0300D6
+ public const int second_wave_color = 2130903254;
- // aapt resource value: 0x7f0100ab
- public const int seekBarStyle = 2130772139;
+ // aapt resource value: 0x7F0300D7
+ public const int seekBarStyle = 2130903255;
- // aapt resource value: 0x7f010070
- public const int selectableItemBackground = 2130772080;
+ // aapt resource value: 0x7F0300D8
+ public const int selectableItemBackground = 2130903256;
- // aapt resource value: 0x7f010071
- public const int selectableItemBackgroundBorderless = 2130772081;
+ // aapt resource value: 0x7F0300D9
+ public const int selectableItemBackgroundBorderless = 2130903257;
- // aapt resource value: 0x7f0100c3
- public const int showAsAction = 2130772163;
+ // aapt resource value: 0x7F0300DA
+ public const int showAsAction = 2130903258;
- // aapt resource value: 0x7f0100bf
- public const int showDividers = 2130772159;
+ // aapt resource value: 0x7F0300DB
+ public const int showDividers = 2130903259;
- // aapt resource value: 0x7f0100e8
- public const int showText = 2130772200;
+ // aapt resource value: 0x7F0300DC
+ public const int showText = 2130903260;
- // aapt resource value: 0x7f01002f
- public const int showTitle = 2130772015;
+ // aapt resource value: 0x7F0300DD
+ public const int showTitle = 2130903261;
- // aapt resource value: 0x7f01002d
- public const int singleChoiceItemLayout = 2130772013;
+ // aapt resource value: 0x7F0300DE
+ public const int singleChoiceItemLayout = 2130903262;
- // aapt resource value: 0x7f010001
- public const int spanCount = 2130771969;
+ // aapt resource value: 0x7F0300DF
+ public const int spanCount = 2130903263;
- // aapt resource value: 0x7f0100b7
- public const int spinBars = 2130772151;
+ // aapt resource value: 0x7F0300E0
+ public const int spinBars = 2130903264;
- // aapt resource value: 0x7f01006b
- public const int spinnerDropDownItemStyle = 2130772075;
+ // aapt resource value: 0x7F0300E1
+ public const int spinnerDropDownItemStyle = 2130903265;
- // aapt resource value: 0x7f0100ac
- public const int spinnerStyle = 2130772140;
+ // aapt resource value: 0x7F0300E2
+ public const int spinnerStyle = 2130903266;
- // aapt resource value: 0x7f0100e7
- public const int splitTrack = 2130772199;
+ // aapt resource value: 0x7F0300E3
+ public const int splitTrack = 2130903267;
- // aapt resource value: 0x7f010030
- public const int srcCompat = 2130772016;
+ // aapt resource value: 0x7F0300E4
+ public const int srcCompat = 2130903268;
- // aapt resource value: 0x7f01010a
- public const int srlAccentColor = 2130772234;
+ // aapt resource value: 0x7F0300E5
+ public const int srlAccentColor = 2130903269;
- // aapt resource value: 0x7f010120
- public const int srlAnimatingColor = 2130772256;
+ // aapt resource value: 0x7F0300E6
+ public const int srlAnimatingColor = 2130903270;
- // aapt resource value: 0x7f01010b
- public const int srlClassicsSpinnerStyle = 2130772235;
+ // aapt resource value: 0x7F0300E7
+ public const int srlClassicsSpinnerStyle = 2130903271;
- // aapt resource value: 0x7f010142
- public const int srlDisableContentWhenLoading = 2130772290;
+ // aapt resource value: 0x7F0300E8
+ public const int srlDisableContentWhenLoading = 2130903272;
- // aapt resource value: 0x7f010141
- public const int srlDisableContentWhenRefresh = 2130772289;
+ // aapt resource value: 0x7F0300E9
+ public const int srlDisableContentWhenRefresh = 2130903273;
- // aapt resource value: 0x7f010129
- public const int srlDragRate = 2130772265;
+ // aapt resource value: 0x7F0300EA
+ public const int srlDragRate = 2130903274;
- // aapt resource value: 0x7f01010c
- public const int srlDrawableArrow = 2130772236;
+ // aapt resource value: 0x7F0300EB
+ public const int srlDrawableArrow = 2130903275;
- // aapt resource value: 0x7f01010d
- public const int srlDrawableArrowSize = 2130772237;
+ // aapt resource value: 0x7F0300EC
+ public const int srlDrawableArrowSize = 2130903276;
- // aapt resource value: 0x7f01010e
- public const int srlDrawableMarginRight = 2130772238;
+ // aapt resource value: 0x7F0300ED
+ public const int srlDrawableMarginRight = 2130903277;
- // aapt resource value: 0x7f01010f
- public const int srlDrawableProgress = 2130772239;
+ // aapt resource value: 0x7F0300EE
+ public const int srlDrawableProgress = 2130903278;
- // aapt resource value: 0x7f010110
- public const int srlDrawableProgressSize = 2130772240;
+ // aapt resource value: 0x7F0300EF
+ public const int srlDrawableProgressSize = 2130903279;
- // aapt resource value: 0x7f010111
- public const int srlDrawableSize = 2130772241;
+ // aapt resource value: 0x7F0300F0
+ public const int srlDrawableSize = 2130903280;
- // aapt resource value: 0x7f010135
- public const int srlEnableAutoLoadMore = 2130772277;
+ // aapt resource value: 0x7F0300F1
+ public const int srlEnableAutoLoadMore = 2130903281;
- // aapt resource value: 0x7f01013f
- public const int srlEnableClipFooterWhenFixedBehind = 2130772287;
+ // aapt resource value: 0x7F0300F2
+ public const int srlEnableClipFooterWhenFixedBehind = 2130903282;
- // aapt resource value: 0x7f01013e
- public const int srlEnableClipHeaderWhenFixedBehind = 2130772286;
+ // aapt resource value: 0x7F0300F3
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130903283;
- // aapt resource value: 0x7f01013c
- public const int srlEnableFooterFollowWhenLoadFinished = 2130772284;
+ // aapt resource value: 0x7F0300F4
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130903284;
- // aapt resource value: 0x7f01013d
- public const int srlEnableFooterFollowWhenNoMoreData = 2130772285;
+ // aapt resource value: 0x7F0300F5
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130903285;
- // aapt resource value: 0x7f010131
- public const int srlEnableFooterTranslationContent = 2130772273;
+ // aapt resource value: 0x7F0300F6
+ public const int srlEnableFooterTranslationContent = 2130903286;
- // aapt resource value: 0x7f010130
- public const int srlEnableHeaderTranslationContent = 2130772272;
+ // aapt resource value: 0x7F0300F7
+ public const int srlEnableHeaderTranslationContent = 2130903287;
- // aapt resource value: 0x7f010112
- public const int srlEnableHorizontalDrag = 2130772242;
+ // aapt resource value: 0x7F0300F8
+ public const int srlEnableHorizontalDrag = 2130903288;
- // aapt resource value: 0x7f010123
- public const int srlEnableLastTime = 2130772259;
+ // aapt resource value: 0x7F0300F9
+ public const int srlEnableLastTime = 2130903289;
- // aapt resource value: 0x7f01012f
- public const int srlEnableLoadMore = 2130772271;
+ // aapt resource value: 0x7F0300FA
+ public const int srlEnableLoadMore = 2130903290;
- // aapt resource value: 0x7f01013b
- public const int srlEnableLoadMoreWhenContentNotFull = 2130772283;
+ // aapt resource value: 0x7F0300FB
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130903291;
- // aapt resource value: 0x7f010138
- public const int srlEnableNestedScrolling = 2130772280;
+ // aapt resource value: 0x7F0300FC
+ public const int srlEnableNestedScrolling = 2130903292;
- // aapt resource value: 0x7f010136
- public const int srlEnableOverScrollBounce = 2130772278;
+ // aapt resource value: 0x7F0300FD
+ public const int srlEnableOverScrollBounce = 2130903293;
- // aapt resource value: 0x7f010140
- public const int srlEnableOverScrollDrag = 2130772288;
+ // aapt resource value: 0x7F0300FE
+ public const int srlEnableOverScrollDrag = 2130903294;
- // aapt resource value: 0x7f010134
- public const int srlEnablePreviewInEditMode = 2130772276;
+ // aapt resource value: 0x7F0300FF
+ public const int srlEnablePreviewInEditMode = 2130903295;
- // aapt resource value: 0x7f01014b
- public const int srlEnablePullToCloseTwoLevel = 2130772299;
+ // aapt resource value: 0x7F030100
+ public const int srlEnablePullToCloseTwoLevel = 2130903296;
- // aapt resource value: 0x7f010137
- public const int srlEnablePureScrollMode = 2130772279;
+ // aapt resource value: 0x7F030101
+ public const int srlEnablePureScrollMode = 2130903297;
- // aapt resource value: 0x7f01012e
- public const int srlEnableRefresh = 2130772270;
+ // aapt resource value: 0x7F030102
+ public const int srlEnableRefresh = 2130903298;
- // aapt resource value: 0x7f010139
- public const int srlEnableScrollContentWhenLoaded = 2130772281;
+ // aapt resource value: 0x7F030103
+ public const int srlEnableScrollContentWhenLoaded = 2130903299;
- // aapt resource value: 0x7f01013a
- public const int srlEnableScrollContentWhenRefreshed = 2130772282;
+ // aapt resource value: 0x7F030104
+ public const int srlEnableScrollContentWhenRefreshed = 2130903300;
- // aapt resource value: 0x7f01014a
- public const int srlEnableTwoLevel = 2130772298;
+ // aapt resource value: 0x7F030105
+ public const int srlEnableTwoLevel = 2130903301;
- // aapt resource value: 0x7f010113
- public const int srlFinishDuration = 2130772243;
+ // aapt resource value: 0x7F030106
+ public const int srlFinishDuration = 2130903302;
- // aapt resource value: 0x7f010144
- public const int srlFixedFooterViewId = 2130772292;
+ // aapt resource value: 0x7F030107
+ public const int srlFixedFooterViewId = 2130903303;
- // aapt resource value: 0x7f010143
- public const int srlFixedHeaderViewId = 2130772291;
+ // aapt resource value: 0x7F030108
+ public const int srlFixedHeaderViewId = 2130903304;
- // aapt resource value: 0x7f010149
- public const int srlFloorDuration = 2130772297;
+ // aapt resource value: 0x7F030109
+ public const int srlFloorDuration = 2130903305;
- // aapt resource value: 0x7f010147
- public const int srlFloorRage = 2130772295;
+ // aapt resource value: 0x7F03010A
+ public const int srlFloorRage = 2130903306;
- // aapt resource value: 0x7f010126
- public const int srlFooterHeight = 2130772262;
+ // aapt resource value: 0x7F03010B
+ public const int srlFooterHeight = 2130903307;
- // aapt resource value: 0x7f010128
- public const int srlFooterInsetStart = 2130772264;
+ // aapt resource value: 0x7F03010C
+ public const int srlFooterInsetStart = 2130903308;
- // aapt resource value: 0x7f01012b
- public const int srlFooterMaxDragRate = 2130772267;
+ // aapt resource value: 0x7F03010D
+ public const int srlFooterMaxDragRate = 2130903309;
- // aapt resource value: 0x7f010133
- public const int srlFooterTranslationViewId = 2130772275;
+ // aapt resource value: 0x7F03010E
+ public const int srlFooterTranslationViewId = 2130903310;
- // aapt resource value: 0x7f01012d
- public const int srlFooterTriggerRate = 2130772269;
+ // aapt resource value: 0x7F03010F
+ public const int srlFooterTriggerRate = 2130903311;
- // aapt resource value: 0x7f010125
- public const int srlHeaderHeight = 2130772261;
+ // aapt resource value: 0x7F030110
+ public const int srlHeaderHeight = 2130903312;
- // aapt resource value: 0x7f010127
- public const int srlHeaderInsetStart = 2130772263;
+ // aapt resource value: 0x7F030111
+ public const int srlHeaderInsetStart = 2130903313;
- // aapt resource value: 0x7f01012a
- public const int srlHeaderMaxDragRate = 2130772266;
+ // aapt resource value: 0x7F030112
+ public const int srlHeaderMaxDragRate = 2130903314;
- // aapt resource value: 0x7f010132
- public const int srlHeaderTranslationViewId = 2130772274;
+ // aapt resource value: 0x7F030113
+ public const int srlHeaderTranslationViewId = 2130903315;
- // aapt resource value: 0x7f01012c
- public const int srlHeaderTriggerRate = 2130772268;
+ // aapt resource value: 0x7F030114
+ public const int srlHeaderTriggerRate = 2130903316;
- // aapt resource value: 0x7f010146
- public const int srlMaxRage = 2130772294;
+ // aapt resource value: 0x7F030115
+ public const int srlMaxRage = 2130903317;
- // aapt resource value: 0x7f010121
- public const int srlNormalColor = 2130772257;
+ // aapt resource value: 0x7F030116
+ public const int srlNormalColor = 2130903318;
- // aapt resource value: 0x7f010114
- public const int srlPrimaryColor = 2130772244;
+ // aapt resource value: 0x7F030117
+ public const int srlPrimaryColor = 2130903319;
- // aapt resource value: 0x7f010124
- public const int srlReboundDuration = 2130772260;
+ // aapt resource value: 0x7F030118
+ public const int srlReboundDuration = 2130903320;
- // aapt resource value: 0x7f010148
- public const int srlRefreshRage = 2130772296;
+ // aapt resource value: 0x7F030119
+ public const int srlRefreshRage = 2130903321;
- // aapt resource value: 0x7f010115
- public const int srlTextFailed = 2130772245;
+ // aapt resource value: 0x7F03011A
+ public const int srlTextFailed = 2130903322;
- // aapt resource value: 0x7f010116
- public const int srlTextFinish = 2130772246;
+ // aapt resource value: 0x7F03011B
+ public const int srlTextFinish = 2130903323;
- // aapt resource value: 0x7f010117
- public const int srlTextLoading = 2130772247;
+ // aapt resource value: 0x7F03011C
+ public const int srlTextLoading = 2130903324;
- // aapt resource value: 0x7f010118
- public const int srlTextNothing = 2130772248;
+ // aapt resource value: 0x7F03011D
+ public const int srlTextNothing = 2130903325;
- // aapt resource value: 0x7f010119
- public const int srlTextPulling = 2130772249;
+ // aapt resource value: 0x7F03011E
+ public const int srlTextPulling = 2130903326;
- // aapt resource value: 0x7f01011a
- public const int srlTextRefreshing = 2130772250;
+ // aapt resource value: 0x7F03011F
+ public const int srlTextRefreshing = 2130903327;
- // aapt resource value: 0x7f01011b
- public const int srlTextRelease = 2130772251;
+ // aapt resource value: 0x7F030120
+ public const int srlTextRelease = 2130903328;
- // aapt resource value: 0x7f01011c
- public const int srlTextSecondary = 2130772252;
+ // aapt resource value: 0x7F030121
+ public const int srlTextSecondary = 2130903329;
- // aapt resource value: 0x7f01011d
- public const int srlTextSizeTime = 2130772253;
+ // aapt resource value: 0x7F030122
+ public const int srlTextSizeTime = 2130903330;
- // aapt resource value: 0x7f01011e
- public const int srlTextSizeTitle = 2130772254;
+ // aapt resource value: 0x7F030123
+ public const int srlTextSizeTitle = 2130903331;
- // aapt resource value: 0x7f010122
- public const int srlTextTimeMarginTop = 2130772258;
+ // aapt resource value: 0x7F030124
+ public const int srlTextTimeMarginTop = 2130903332;
- // aapt resource value: 0x7f01011f
- public const int srlTextUpdate = 2130772255;
+ // aapt resource value: 0x7F030125
+ public const int srlTextUpdate = 2130903333;
- // aapt resource value: 0x7f010003
- public const int stackFromEnd = 2130771971;
+ // aapt resource value: 0x7F030126
+ public const int stackFromEnd = 2130903334;
- // aapt resource value: 0x7f0100ce
- public const int state_above_anchor = 2130772174;
+ // aapt resource value: 0x7F030127
+ public const int state_above_anchor = 2130903335;
- // aapt resource value: 0x7f0100cc
- public const int subMenuArrow = 2130772172;
+ // aapt resource value: 0x7F030128
+ public const int subMenuArrow = 2130903336;
- // aapt resource value: 0x7f0100dd
- public const int submitBackground = 2130772189;
+ // aapt resource value: 0x7F030129
+ public const int submitBackground = 2130903337;
- // aapt resource value: 0x7f01000f
- public const int subtitle = 2130771983;
+ // aapt resource value: 0x7F03012A
+ public const int subtitle = 2130903338;
- // aapt resource value: 0x7f0100ea
- public const int subtitleTextAppearance = 2130772202;
+ // aapt resource value: 0x7F03012B
+ public const int subtitleTextAppearance = 2130903339;
- // aapt resource value: 0x7f0100f9
- public const int subtitleTextColor = 2130772217;
+ // aapt resource value: 0x7F03012C
+ public const int subtitleTextColor = 2130903340;
- // aapt resource value: 0x7f010011
- public const int subtitleTextStyle = 2130771985;
+ // aapt resource value: 0x7F03012D
+ public const int subtitleTextStyle = 2130903341;
- // aapt resource value: 0x7f0100db
- public const int suggestionRowLayout = 2130772187;
+ // aapt resource value: 0x7F03012E
+ public const int suggestionRowLayout = 2130903342;
- // aapt resource value: 0x7f0100e5
- public const int switchMinWidth = 2130772197;
+ // aapt resource value: 0x7F03012F
+ public const int switchMinWidth = 2130903343;
- // aapt resource value: 0x7f0100e6
- public const int switchPadding = 2130772198;
+ // aapt resource value: 0x7F030130
+ public const int switchPadding = 2130903344;
- // aapt resource value: 0x7f0100ad
- public const int switchStyle = 2130772141;
+ // aapt resource value: 0x7F030131
+ public const int switchStyle = 2130903345;
- // aapt resource value: 0x7f0100e4
- public const int switchTextAppearance = 2130772196;
+ // aapt resource value: 0x7F030132
+ public const int switchTextAppearance = 2130903346;
- // aapt resource value: 0x7f010036
- public const int textAllCaps = 2130772022;
+ // aapt resource value: 0x7F030133
+ public const int textAllCaps = 2130903347;
- // aapt resource value: 0x7f010063
- public const int textAppearanceLargePopupMenu = 2130772067;
+ // aapt resource value: 0x7F030134
+ public const int textAppearanceLargePopupMenu = 2130903348;
- // aapt resource value: 0x7f010088
- public const int textAppearanceListItem = 2130772104;
+ // aapt resource value: 0x7F030135
+ public const int textAppearanceListItem = 2130903349;
- // aapt resource value: 0x7f010089
- public const int textAppearanceListItemSecondary = 2130772105;
+ // aapt resource value: 0x7F030136
+ public const int textAppearanceListItemSecondary = 2130903350;
- // aapt resource value: 0x7f01008a
- public const int textAppearanceListItemSmall = 2130772106;
+ // aapt resource value: 0x7F030137
+ public const int textAppearanceListItemSmall = 2130903351;
- // aapt resource value: 0x7f010065
- public const int textAppearancePopupMenuHeader = 2130772069;
+ // aapt resource value: 0x7F030138
+ public const int textAppearancePopupMenuHeader = 2130903352;
- // aapt resource value: 0x7f01007e
- public const int textAppearanceSearchResultSubtitle = 2130772094;
+ // aapt resource value: 0x7F030139
+ public const int textAppearanceSearchResultSubtitle = 2130903353;
- // aapt resource value: 0x7f01007d
- public const int textAppearanceSearchResultTitle = 2130772093;
+ // aapt resource value: 0x7F03013A
+ public const int textAppearanceSearchResultTitle = 2130903354;
- // aapt resource value: 0x7f010064
- public const int textAppearanceSmallPopupMenu = 2130772068;
+ // aapt resource value: 0x7F03013B
+ public const int textAppearanceSmallPopupMenu = 2130903355;
- // aapt resource value: 0x7f01009d
- public const int textColorAlertDialogListItem = 2130772125;
+ // aapt resource value: 0x7F03013C
+ public const int textColorAlertDialogListItem = 2130903356;
- // aapt resource value: 0x7f01007f
- public const int textColorSearchUrl = 2130772095;
+ // aapt resource value: 0x7F03013D
+ public const int textColorSearchUrl = 2130903357;
- // aapt resource value: 0x7f0100fc
- public const int theme = 2130772220;
+ // aapt resource value: 0x7F03013E
+ public const int theme = 2130903358;
- // aapt resource value: 0x7f0100bd
- public const int thickness = 2130772157;
+ // aapt resource value: 0x7F03013F
+ public const int thickness = 2130903359;
- // aapt resource value: 0x7f0100e3
- public const int thumbTextPadding = 2130772195;
+ // aapt resource value: 0x7F030140
+ public const int thumbTextPadding = 2130903360;
- // aapt resource value: 0x7f0100de
- public const int thumbTint = 2130772190;
+ // aapt resource value: 0x7F030141
+ public const int thumbTint = 2130903361;
- // aapt resource value: 0x7f0100df
- public const int thumbTintMode = 2130772191;
+ // aapt resource value: 0x7F030142
+ public const int thumbTintMode = 2130903362;
- // aapt resource value: 0x7f010033
- public const int tickMark = 2130772019;
+ // aapt resource value: 0x7F030143
+ public const int tickMark = 2130903363;
- // aapt resource value: 0x7f010034
- public const int tickMarkTint = 2130772020;
+ // aapt resource value: 0x7F030144
+ public const int tickMarkTint = 2130903364;
- // aapt resource value: 0x7f010035
- public const int tickMarkTintMode = 2130772021;
+ // aapt resource value: 0x7F030145
+ public const int tickMarkTintMode = 2130903365;
- // aapt resource value: 0x7f010031
- public const int tint = 2130772017;
+ // aapt resource value: 0x7F030146
+ public const int tint = 2130903366;
- // aapt resource value: 0x7f010032
- public const int tintMode = 2130772018;
+ // aapt resource value: 0x7F030147
+ public const int tintMode = 2130903367;
- // aapt resource value: 0x7f01000c
- public const int title = 2130771980;
+ // aapt resource value: 0x7F030148
+ public const int title = 2130903368;
- // aapt resource value: 0x7f0100eb
- public const int titleMargin = 2130772203;
+ // aapt resource value: 0x7F030149
+ public const int titleMargin = 2130903369;
- // aapt resource value: 0x7f0100ef
- public const int titleMarginBottom = 2130772207;
+ // aapt resource value: 0x7F03014A
+ public const int titleMarginBottom = 2130903370;
- // aapt resource value: 0x7f0100ed
- public const int titleMarginEnd = 2130772205;
+ // aapt resource value: 0x7F03014B
+ public const int titleMarginEnd = 2130903371;
- // aapt resource value: 0x7f0100ec
- public const int titleMarginStart = 2130772204;
+ // aapt resource value: 0x7F03014E
+ public const int titleMargins = 2130903374;
- // aapt resource value: 0x7f0100ee
- public const int titleMarginTop = 2130772206;
+ // aapt resource value: 0x7F03014C
+ public const int titleMarginStart = 2130903372;
- // aapt resource value: 0x7f0100f0
- public const int titleMargins = 2130772208;
+ // aapt resource value: 0x7F03014D
+ public const int titleMarginTop = 2130903373;
- // aapt resource value: 0x7f0100e9
- public const int titleTextAppearance = 2130772201;
+ // aapt resource value: 0x7F03014F
+ public const int titleTextAppearance = 2130903375;
- // aapt resource value: 0x7f0100f8
- public const int titleTextColor = 2130772216;
+ // aapt resource value: 0x7F030150
+ public const int titleTextColor = 2130903376;
- // aapt resource value: 0x7f010010
- public const int titleTextStyle = 2130771984;
+ // aapt resource value: 0x7F030151
+ public const int titleTextStyle = 2130903377;
- // aapt resource value: 0x7f010077
- public const int toolbarNavigationButtonStyle = 2130772087;
+ // aapt resource value: 0x7F030152
+ public const int toolbarNavigationButtonStyle = 2130903378;
- // aapt resource value: 0x7f010076
- public const int toolbarStyle = 2130772086;
+ // aapt resource value: 0x7F030153
+ public const int toolbarStyle = 2130903379;
- // aapt resource value: 0x7f0100b0
- public const int tooltipForegroundColor = 2130772144;
+ // aapt resource value: 0x7F030154
+ public const int tooltipForegroundColor = 2130903380;
- // aapt resource value: 0x7f0100af
- public const int tooltipFrameBackground = 2130772143;
+ // aapt resource value: 0x7F030155
+ public const int tooltipFrameBackground = 2130903381;
- // aapt resource value: 0x7f0100c8
- public const int tooltipText = 2130772168;
+ // aapt resource value: 0x7F030156
+ public const int tooltipText = 2130903382;
- // aapt resource value: 0x7f0100e0
- public const int track = 2130772192;
+ // aapt resource value: 0x7F030157
+ public const int track = 2130903383;
- // aapt resource value: 0x7f0100e1
- public const int trackTint = 2130772193;
+ // aapt resource value: 0x7F030158
+ public const int trackTint = 2130903384;
- // aapt resource value: 0x7f0100e2
- public const int trackTintMode = 2130772194;
+ // aapt resource value: 0x7F030159
+ public const int trackTintMode = 2130903385;
- // aapt resource value: 0x7f0100d9
- public const int voiceIcon = 2130772185;
+ // aapt resource value: 0x7F03015A
+ public const int voiceIcon = 2130903386;
- // aapt resource value: 0x7f010166
- public const int wave_bg_color = 2130772326;
+ // aapt resource value: 0x7F03015B
+ public const int wave_bg_color = 2130903387;
- // aapt resource value: 0x7f010167
- public const int wave_border_color = 2130772327;
+ // aapt resource value: 0x7F03015C
+ public const int wave_border_color = 2130903388;
- // aapt resource value: 0x7f010164
- public const int wave_color = 2130772324;
+ // aapt resource value: 0x7F03015D
+ public const int wave_color = 2130903389;
- // aapt resource value: 0x7f010169
- public const int wave_height = 2130772329;
+ // aapt resource value: 0x7F03015E
+ public const int wave_height = 2130903390;
- // aapt resource value: 0x7f010168
- public const int wave_width = 2130772328;
+ // aapt resource value: 0x7F03015F
+ public const int wave_width = 2130903391;
- // aapt resource value: 0x7f01016e
- public const int wheelview_dividerColor = 2130772334;
+ // aapt resource value: 0x7F030160
+ public const int wheelview_dividerColor = 2130903392;
- // aapt resource value: 0x7f01016a
- public const int wheelview_gravity = 2130772330;
+ // aapt resource value: 0x7F030161
+ public const int wheelview_gravity = 2130903393;
- // aapt resource value: 0x7f01016f
- public const int wheelview_lineSpacingMultiplier = 2130772335;
+ // aapt resource value: 0x7F030162
+ public const int wheelview_lineSpacingMultiplier = 2130903394;
- // aapt resource value: 0x7f01016d
- public const int wheelview_textColorCenter = 2130772333;
+ // aapt resource value: 0x7F030163
+ public const int wheelview_textColorCenter = 2130903395;
- // aapt resource value: 0x7f01016c
- public const int wheelview_textColorOut = 2130772332;
+ // aapt resource value: 0x7F030164
+ public const int wheelview_textColorOut = 2130903396;
- // aapt resource value: 0x7f01016b
- public const int wheelview_textSize = 2130772331;
+ // aapt resource value: 0x7F030165
+ public const int wheelview_textSize = 2130903397;
- // aapt resource value: 0x7f01003d
- public const int windowActionBar = 2130772029;
+ // aapt resource value: 0x7F030166
+ public const int windowActionBar = 2130903398;
- // aapt resource value: 0x7f01003f
- public const int windowActionBarOverlay = 2130772031;
+ // aapt resource value: 0x7F030167
+ public const int windowActionBarOverlay = 2130903399;
- // aapt resource value: 0x7f010040
- public const int windowActionModeOverlay = 2130772032;
+ // aapt resource value: 0x7F030168
+ public const int windowActionModeOverlay = 2130903400;
- // aapt resource value: 0x7f010044
- public const int windowFixedHeightMajor = 2130772036;
+ // aapt resource value: 0x7F030169
+ public const int windowFixedHeightMajor = 2130903401;
- // aapt resource value: 0x7f010042
- public const int windowFixedHeightMinor = 2130772034;
+ // aapt resource value: 0x7F03016A
+ public const int windowFixedHeightMinor = 2130903402;
- // aapt resource value: 0x7f010041
- public const int windowFixedWidthMajor = 2130772033;
+ // aapt resource value: 0x7F03016B
+ public const int windowFixedWidthMajor = 2130903403;
- // aapt resource value: 0x7f010043
- public const int windowFixedWidthMinor = 2130772035;
+ // aapt resource value: 0x7F03016C
+ public const int windowFixedWidthMinor = 2130903404;
- // aapt resource value: 0x7f010045
- public const int windowMinWidthMajor = 2130772037;
+ // aapt resource value: 0x7F03016D
+ public const int windowMinWidthMajor = 2130903405;
- // aapt resource value: 0x7f010046
- public const int windowMinWidthMinor = 2130772038;
+ // aapt resource value: 0x7F03016E
+ public const int windowMinWidthMinor = 2130903406;
- // aapt resource value: 0x7f01003e
- public const int windowNoTitle = 2130772030;
+ // aapt resource value: 0x7F03016F
+ public const int windowNoTitle = 2130903407;
static Attribute()
{
@@ -1396,20 +1396,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7f0b0000
- public const int abc_action_bar_embed_tabs = 2131427328;
+ // aapt resource value: 0x7F040000
+ public const int abc_action_bar_embed_tabs = 2130968576;
- // aapt resource value: 0x7f0b0001
- public const int abc_allow_stacked_button_bar = 2131427329;
+ // aapt resource value: 0x7F040001
+ public const int abc_allow_stacked_button_bar = 2130968577;
- // aapt resource value: 0x7f0b0002
- public const int abc_config_actionMenuItemAllCaps = 2131427330;
+ // aapt resource value: 0x7F040002
+ public const int abc_config_actionMenuItemAllCaps = 2130968578;
- // aapt resource value: 0x7f0b0003
- public const int abc_config_closeDialogWhenTouchOutside = 2131427331;
+ // aapt resource value: 0x7F040003
+ public const int abc_config_closeDialogWhenTouchOutside = 2130968579;
- // aapt resource value: 0x7f0b0004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131427332;
+ // aapt resource value: 0x7F040004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2130968580;
static Boolean()
{
@@ -1424,287 +1424,287 @@
public partial class Color
{
- // aapt resource value: 0x7f0c0048
- public const int abc_background_cache_hint_selector_material_dark = 2131492936;
+ // aapt resource value: 0x7F050000
+ public const int abc_background_cache_hint_selector_material_dark = 2131034112;
- // aapt resource value: 0x7f0c0049
- public const int abc_background_cache_hint_selector_material_light = 2131492937;
+ // aapt resource value: 0x7F050001
+ public const int abc_background_cache_hint_selector_material_light = 2131034113;
- // aapt resource value: 0x7f0c004a
- public const int abc_btn_colored_borderless_text_material = 2131492938;
+ // aapt resource value: 0x7F050002
+ public const int abc_btn_colored_borderless_text_material = 2131034114;
- // aapt resource value: 0x7f0c004b
- public const int abc_btn_colored_text_material = 2131492939;
+ // aapt resource value: 0x7F050003
+ public const int abc_btn_colored_text_material = 2131034115;
- // aapt resource value: 0x7f0c004c
- public const int abc_color_highlight_material = 2131492940;
+ // aapt resource value: 0x7F050004
+ public const int abc_color_highlight_material = 2131034116;
- // aapt resource value: 0x7f0c004d
- public const int abc_hint_foreground_material_dark = 2131492941;
+ // aapt resource value: 0x7F050005
+ public const int abc_hint_foreground_material_dark = 2131034117;
- // aapt resource value: 0x7f0c004e
- public const int abc_hint_foreground_material_light = 2131492942;
+ // aapt resource value: 0x7F050006
+ public const int abc_hint_foreground_material_light = 2131034118;
- // aapt resource value: 0x7f0c0000
- public const int abc_input_method_navigation_guard = 2131492864;
+ // aapt resource value: 0x7F050007
+ public const int abc_input_method_navigation_guard = 2131034119;
- // aapt resource value: 0x7f0c004f
- public const int abc_primary_text_disable_only_material_dark = 2131492943;
+ // aapt resource value: 0x7F050008
+ public const int abc_primary_text_disable_only_material_dark = 2131034120;
- // aapt resource value: 0x7f0c0050
- public const int abc_primary_text_disable_only_material_light = 2131492944;
+ // aapt resource value: 0x7F050009
+ public const int abc_primary_text_disable_only_material_light = 2131034121;
- // aapt resource value: 0x7f0c0051
- public const int abc_primary_text_material_dark = 2131492945;
+ // aapt resource value: 0x7F05000A
+ public const int abc_primary_text_material_dark = 2131034122;
- // aapt resource value: 0x7f0c0052
- public const int abc_primary_text_material_light = 2131492946;
+ // aapt resource value: 0x7F05000B
+ public const int abc_primary_text_material_light = 2131034123;
- // aapt resource value: 0x7f0c0053
- public const int abc_search_url_text = 2131492947;
+ // aapt resource value: 0x7F05000C
+ public const int abc_search_url_text = 2131034124;
- // aapt resource value: 0x7f0c0001
- public const int abc_search_url_text_normal = 2131492865;
+ // aapt resource value: 0x7F05000D
+ public const int abc_search_url_text_normal = 2131034125;
- // aapt resource value: 0x7f0c0002
- public const int abc_search_url_text_pressed = 2131492866;
+ // aapt resource value: 0x7F05000E
+ public const int abc_search_url_text_pressed = 2131034126;
- // aapt resource value: 0x7f0c0003
- public const int abc_search_url_text_selected = 2131492867;
+ // aapt resource value: 0x7F05000F
+ public const int abc_search_url_text_selected = 2131034127;
- // aapt resource value: 0x7f0c0054
- public const int abc_secondary_text_material_dark = 2131492948;
+ // aapt resource value: 0x7F050010
+ public const int abc_secondary_text_material_dark = 2131034128;
- // aapt resource value: 0x7f0c0055
- public const int abc_secondary_text_material_light = 2131492949;
+ // aapt resource value: 0x7F050011
+ public const int abc_secondary_text_material_light = 2131034129;
- // aapt resource value: 0x7f0c0056
- public const int abc_tint_btn_checkable = 2131492950;
+ // aapt resource value: 0x7F050012
+ public const int abc_tint_btn_checkable = 2131034130;
- // aapt resource value: 0x7f0c0057
- public const int abc_tint_default = 2131492951;
+ // aapt resource value: 0x7F050013
+ public const int abc_tint_default = 2131034131;
- // aapt resource value: 0x7f0c0058
- public const int abc_tint_edittext = 2131492952;
+ // aapt resource value: 0x7F050014
+ public const int abc_tint_edittext = 2131034132;
- // aapt resource value: 0x7f0c0059
- public const int abc_tint_seek_thumb = 2131492953;
+ // aapt resource value: 0x7F050015
+ public const int abc_tint_seek_thumb = 2131034133;
- // aapt resource value: 0x7f0c005a
- public const int abc_tint_spinner = 2131492954;
+ // aapt resource value: 0x7F050016
+ public const int abc_tint_spinner = 2131034134;
- // aapt resource value: 0x7f0c005b
- public const int abc_tint_switch_track = 2131492955;
+ // aapt resource value: 0x7F050017
+ public const int abc_tint_switch_track = 2131034135;
- // aapt resource value: 0x7f0c0004
- public const int accent_material_dark = 2131492868;
+ // aapt resource value: 0x7F050018
+ public const int accent_material_dark = 2131034136;
- // aapt resource value: 0x7f0c0005
- public const int accent_material_light = 2131492869;
+ // aapt resource value: 0x7F050019
+ public const int accent_material_light = 2131034137;
- // aapt resource value: 0x7f0c0006
- public const int background_floating_material_dark = 2131492870;
+ // aapt resource value: 0x7F05001A
+ public const int background_floating_material_dark = 2131034138;
- // aapt resource value: 0x7f0c0007
- public const int background_floating_material_light = 2131492871;
+ // aapt resource value: 0x7F05001B
+ public const int background_floating_material_light = 2131034139;
- // aapt resource value: 0x7f0c0008
- public const int background_material_dark = 2131492872;
+ // aapt resource value: 0x7F05001C
+ public const int background_material_dark = 2131034140;
- // aapt resource value: 0x7f0c0009
- public const int background_material_light = 2131492873;
+ // aapt resource value: 0x7F05001D
+ public const int background_material_light = 2131034141;
- // aapt resource value: 0x7f0c000a
- public const int bright_foreground_disabled_material_dark = 2131492874;
+ // aapt resource value: 0x7F05001E
+ public const int bright_foreground_disabled_material_dark = 2131034142;
- // aapt resource value: 0x7f0c000b
- public const int bright_foreground_disabled_material_light = 2131492875;
+ // aapt resource value: 0x7F05001F
+ public const int bright_foreground_disabled_material_light = 2131034143;
- // aapt resource value: 0x7f0c000c
- public const int bright_foreground_inverse_material_dark = 2131492876;
+ // aapt resource value: 0x7F050020
+ public const int bright_foreground_inverse_material_dark = 2131034144;
- // aapt resource value: 0x7f0c000d
- public const int bright_foreground_inverse_material_light = 2131492877;
+ // aapt resource value: 0x7F050021
+ public const int bright_foreground_inverse_material_light = 2131034145;
- // aapt resource value: 0x7f0c000e
- public const int bright_foreground_material_dark = 2131492878;
+ // aapt resource value: 0x7F050022
+ public const int bright_foreground_material_dark = 2131034146;
- // aapt resource value: 0x7f0c000f
- public const int bright_foreground_material_light = 2131492879;
+ // aapt resource value: 0x7F050023
+ public const int bright_foreground_material_light = 2131034147;
- // aapt resource value: 0x7f0c0010
- public const int button_material_dark = 2131492880;
+ // aapt resource value: 0x7F050024
+ public const int button_material_dark = 2131034148;
- // aapt resource value: 0x7f0c0011
- public const int button_material_light = 2131492881;
+ // aapt resource value: 0x7F050025
+ public const int button_material_light = 2131034149;
- // aapt resource value: 0x7f0c0012
- public const int dim_foreground_disabled_material_dark = 2131492882;
+ // aapt resource value: 0x7F050026
+ public const int dim_foreground_disabled_material_dark = 2131034150;
- // aapt resource value: 0x7f0c0013
- public const int dim_foreground_disabled_material_light = 2131492883;
+ // aapt resource value: 0x7F050027
+ public const int dim_foreground_disabled_material_light = 2131034151;
- // aapt resource value: 0x7f0c0014
- public const int dim_foreground_material_dark = 2131492884;
+ // aapt resource value: 0x7F050028
+ public const int dim_foreground_material_dark = 2131034152;
- // aapt resource value: 0x7f0c0015
- public const int dim_foreground_material_light = 2131492885;
+ // aapt resource value: 0x7F050029
+ public const int dim_foreground_material_light = 2131034153;
- // aapt resource value: 0x7f0c0016
- public const int error_color_material = 2131492886;
+ // aapt resource value: 0x7F05002A
+ public const int error_color_material = 2131034154;
- // aapt resource value: 0x7f0c0017
- public const int foreground_material_dark = 2131492887;
+ // aapt resource value: 0x7F05002B
+ public const int foreground_material_dark = 2131034155;
- // aapt resource value: 0x7f0c0018
- public const int foreground_material_light = 2131492888;
+ // aapt resource value: 0x7F05002C
+ public const int foreground_material_light = 2131034156;
- // aapt resource value: 0x7f0c0019
- public const int highlighted_text_material_dark = 2131492889;
+ // aapt resource value: 0x7F05002D
+ public const int highlighted_text_material_dark = 2131034157;
- // aapt resource value: 0x7f0c001a
- public const int highlighted_text_material_light = 2131492890;
+ // aapt resource value: 0x7F05002E
+ public const int highlighted_text_material_light = 2131034158;
- // aapt resource value: 0x7f0c001b
- public const int material_blue_grey_800 = 2131492891;
+ // aapt resource value: 0x7F05002F
+ public const int material_blue_grey_800 = 2131034159;
- // aapt resource value: 0x7f0c001c
- public const int material_blue_grey_900 = 2131492892;
+ // aapt resource value: 0x7F050030
+ public const int material_blue_grey_900 = 2131034160;
- // aapt resource value: 0x7f0c001d
- public const int material_blue_grey_950 = 2131492893;
+ // aapt resource value: 0x7F050031
+ public const int material_blue_grey_950 = 2131034161;
- // aapt resource value: 0x7f0c001e
- public const int material_deep_teal_200 = 2131492894;
+ // aapt resource value: 0x7F050032
+ public const int material_deep_teal_200 = 2131034162;
- // aapt resource value: 0x7f0c001f
- public const int material_deep_teal_500 = 2131492895;
+ // aapt resource value: 0x7F050033
+ public const int material_deep_teal_500 = 2131034163;
- // aapt resource value: 0x7f0c0020
- public const int material_grey_100 = 2131492896;
+ // aapt resource value: 0x7F050034
+ public const int material_grey_100 = 2131034164;
- // aapt resource value: 0x7f0c0021
- public const int material_grey_300 = 2131492897;
+ // aapt resource value: 0x7F050035
+ public const int material_grey_300 = 2131034165;
- // aapt resource value: 0x7f0c0022
- public const int material_grey_50 = 2131492898;
+ // aapt resource value: 0x7F050036
+ public const int material_grey_50 = 2131034166;
- // aapt resource value: 0x7f0c0023
- public const int material_grey_600 = 2131492899;
+ // aapt resource value: 0x7F050037
+ public const int material_grey_600 = 2131034167;
- // aapt resource value: 0x7f0c0024
- public const int material_grey_800 = 2131492900;
+ // aapt resource value: 0x7F050038
+ public const int material_grey_800 = 2131034168;
- // aapt resource value: 0x7f0c0025
- public const int material_grey_850 = 2131492901;
+ // aapt resource value: 0x7F050039
+ public const int material_grey_850 = 2131034169;
- // aapt resource value: 0x7f0c0026
- public const int material_grey_900 = 2131492902;
+ // aapt resource value: 0x7F05003A
+ public const int material_grey_900 = 2131034170;
- // aapt resource value: 0x7f0c003e
- public const int material_red_500 = 2131492926;
+ // aapt resource value: 0x7F05003B
+ public const int material_red_500 = 2131034171;
- // aapt resource value: 0x7f0c003c
- public const int notification_action_color_filter = 2131492924;
+ // aapt resource value: 0x7F05003C
+ public const int notification_action_color_filter = 2131034172;
- // aapt resource value: 0x7f0c003d
- public const int notification_icon_bg_color = 2131492925;
+ // aapt resource value: 0x7F05003D
+ public const int notification_icon_bg_color = 2131034173;
- // aapt resource value: 0x7f0c003b
- public const int notification_material_background_media_default_color = 2131492923;
+ // aapt resource value: 0x7F05003E
+ public const int notification_material_background_media_default_color = 2131034174;
- // aapt resource value: 0x7f0c003f
- public const int pickerview_bgColor_default = 2131492927;
+ // aapt resource value: 0x7F05003F
+ public const int pickerview_bgColor_default = 2131034175;
- // aapt resource value: 0x7f0c0040
- public const int pickerview_bgColor_overlay = 2131492928;
+ // aapt resource value: 0x7F050040
+ public const int pickerview_bgColor_overlay = 2131034176;
- // aapt resource value: 0x7f0c0041
- public const int pickerview_bg_topbar = 2131492929;
+ // aapt resource value: 0x7F050041
+ public const int pickerview_bg_topbar = 2131034177;
- // aapt resource value: 0x7f0c0042
- public const int pickerview_timebtn_nor = 2131492930;
+ // aapt resource value: 0x7F050042
+ public const int pickerview_timebtn_nor = 2131034178;
- // aapt resource value: 0x7f0c0043
- public const int pickerview_timebtn_pre = 2131492931;
+ // aapt resource value: 0x7F050043
+ public const int pickerview_timebtn_pre = 2131034179;
- // aapt resource value: 0x7f0c0044
- public const int pickerview_topbar_title = 2131492932;
+ // aapt resource value: 0x7F050044
+ public const int pickerview_topbar_title = 2131034180;
- // aapt resource value: 0x7f0c0045
- public const int pickerview_wheelview_textcolor_center = 2131492933;
+ // aapt resource value: 0x7F050045
+ public const int pickerview_wheelview_textcolor_center = 2131034181;
- // aapt resource value: 0x7f0c0046
- public const int pickerview_wheelview_textcolor_divider = 2131492934;
+ // aapt resource value: 0x7F050046
+ public const int pickerview_wheelview_textcolor_divider = 2131034182;
- // aapt resource value: 0x7f0c0047
- public const int pickerview_wheelview_textcolor_out = 2131492935;
+ // aapt resource value: 0x7F050047
+ public const int pickerview_wheelview_textcolor_out = 2131034183;
- // aapt resource value: 0x7f0c0027
- public const int primary_dark_material_dark = 2131492903;
+ // aapt resource value: 0x7F050048
+ public const int primary_dark_material_dark = 2131034184;
- // aapt resource value: 0x7f0c0028
- public const int primary_dark_material_light = 2131492904;
+ // aapt resource value: 0x7F050049
+ public const int primary_dark_material_light = 2131034185;
- // aapt resource value: 0x7f0c0029
- public const int primary_material_dark = 2131492905;
+ // aapt resource value: 0x7F05004A
+ public const int primary_material_dark = 2131034186;
- // aapt resource value: 0x7f0c002a
- public const int primary_material_light = 2131492906;
+ // aapt resource value: 0x7F05004B
+ public const int primary_material_light = 2131034187;
- // aapt resource value: 0x7f0c002b
- public const int primary_text_default_material_dark = 2131492907;
+ // aapt resource value: 0x7F05004C
+ public const int primary_text_default_material_dark = 2131034188;
- // aapt resource value: 0x7f0c002c
- public const int primary_text_default_material_light = 2131492908;
+ // aapt resource value: 0x7F05004D
+ public const int primary_text_default_material_light = 2131034189;
- // aapt resource value: 0x7f0c002d
- public const int primary_text_disabled_material_dark = 2131492909;
+ // aapt resource value: 0x7F05004E
+ public const int primary_text_disabled_material_dark = 2131034190;
- // aapt resource value: 0x7f0c002e
- public const int primary_text_disabled_material_light = 2131492910;
+ // aapt resource value: 0x7F05004F
+ public const int primary_text_disabled_material_light = 2131034191;
- // aapt resource value: 0x7f0c002f
- public const int ripple_material_dark = 2131492911;
+ // aapt resource value: 0x7F050050
+ public const int ripple_material_dark = 2131034192;
- // aapt resource value: 0x7f0c0030
- public const int ripple_material_light = 2131492912;
+ // aapt resource value: 0x7F050051
+ public const int ripple_material_light = 2131034193;
- // aapt resource value: 0x7f0c0031
- public const int secondary_text_default_material_dark = 2131492913;
+ // aapt resource value: 0x7F050052
+ public const int secondary_text_default_material_dark = 2131034194;
- // aapt resource value: 0x7f0c0032
- public const int secondary_text_default_material_light = 2131492914;
+ // aapt resource value: 0x7F050053
+ public const int secondary_text_default_material_light = 2131034195;
- // aapt resource value: 0x7f0c0033
- public const int secondary_text_disabled_material_dark = 2131492915;
+ // aapt resource value: 0x7F050054
+ public const int secondary_text_disabled_material_dark = 2131034196;
- // aapt resource value: 0x7f0c0034
- public const int secondary_text_disabled_material_light = 2131492916;
+ // aapt resource value: 0x7F050055
+ public const int secondary_text_disabled_material_light = 2131034197;
- // aapt resource value: 0x7f0c0035
- public const int switch_thumb_disabled_material_dark = 2131492917;
+ // aapt resource value: 0x7F050056
+ public const int switch_thumb_disabled_material_dark = 2131034198;
- // aapt resource value: 0x7f0c0036
- public const int switch_thumb_disabled_material_light = 2131492918;
+ // aapt resource value: 0x7F050057
+ public const int switch_thumb_disabled_material_light = 2131034199;
- // aapt resource value: 0x7f0c005c
- public const int switch_thumb_material_dark = 2131492956;
+ // aapt resource value: 0x7F050058
+ public const int switch_thumb_material_dark = 2131034200;
- // aapt resource value: 0x7f0c005d
- public const int switch_thumb_material_light = 2131492957;
+ // aapt resource value: 0x7F050059
+ public const int switch_thumb_material_light = 2131034201;
- // aapt resource value: 0x7f0c0037
- public const int switch_thumb_normal_material_dark = 2131492919;
+ // aapt resource value: 0x7F05005A
+ public const int switch_thumb_normal_material_dark = 2131034202;
- // aapt resource value: 0x7f0c0038
- public const int switch_thumb_normal_material_light = 2131492920;
+ // aapt resource value: 0x7F05005B
+ public const int switch_thumb_normal_material_light = 2131034203;
- // aapt resource value: 0x7f0c0039
- public const int tooltip_background_dark = 2131492921;
+ // aapt resource value: 0x7F05005C
+ public const int tooltip_background_dark = 2131034204;
- // aapt resource value: 0x7f0c003a
- public const int tooltip_background_light = 2131492922;
+ // aapt resource value: 0x7F05005D
+ public const int tooltip_background_light = 2131034205;
static Color()
{
@@ -1719,377 +1719,377 @@
public partial class Dimension
{
- // aapt resource value: 0x7f070012
- public const int abc_action_bar_content_inset_material = 2131165202;
+ // aapt resource value: 0x7F060000
+ public const int abc_action_bar_content_inset_material = 2131099648;
- // aapt resource value: 0x7f070013
- public const int abc_action_bar_content_inset_with_nav = 2131165203;
+ // aapt resource value: 0x7F060001
+ public const int abc_action_bar_content_inset_with_nav = 2131099649;
- // aapt resource value: 0x7f070007
- public const int abc_action_bar_default_height_material = 2131165191;
+ // aapt resource value: 0x7F060002
+ public const int abc_action_bar_default_height_material = 2131099650;
- // aapt resource value: 0x7f070014
- public const int abc_action_bar_default_padding_end_material = 2131165204;
+ // aapt resource value: 0x7F060003
+ public const int abc_action_bar_default_padding_end_material = 2131099651;
- // aapt resource value: 0x7f070015
- public const int abc_action_bar_default_padding_start_material = 2131165205;
+ // aapt resource value: 0x7F060004
+ public const int abc_action_bar_default_padding_start_material = 2131099652;
- // aapt resource value: 0x7f070017
- public const int abc_action_bar_elevation_material = 2131165207;
+ // aapt resource value: 0x7F060005
+ public const int abc_action_bar_elevation_material = 2131099653;
- // aapt resource value: 0x7f070018
- public const int abc_action_bar_icon_vertical_padding_material = 2131165208;
+ // aapt resource value: 0x7F060006
+ public const int abc_action_bar_icon_vertical_padding_material = 2131099654;
- // aapt resource value: 0x7f070019
- public const int abc_action_bar_overflow_padding_end_material = 2131165209;
+ // aapt resource value: 0x7F060007
+ public const int abc_action_bar_overflow_padding_end_material = 2131099655;
- // aapt resource value: 0x7f07001a
- public const int abc_action_bar_overflow_padding_start_material = 2131165210;
+ // aapt resource value: 0x7F060008
+ public const int abc_action_bar_overflow_padding_start_material = 2131099656;
- // aapt resource value: 0x7f070008
- public const int abc_action_bar_progress_bar_size = 2131165192;
+ // aapt resource value: 0x7F060009
+ public const int abc_action_bar_progress_bar_size = 2131099657;
- // aapt resource value: 0x7f07001b
- public const int abc_action_bar_stacked_max_height = 2131165211;
+ // aapt resource value: 0x7F06000A
+ public const int abc_action_bar_stacked_max_height = 2131099658;
- // aapt resource value: 0x7f07001c
- public const int abc_action_bar_stacked_tab_max_width = 2131165212;
+ // aapt resource value: 0x7F06000B
+ public const int abc_action_bar_stacked_tab_max_width = 2131099659;
- // aapt resource value: 0x7f07001d
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131165213;
+ // aapt resource value: 0x7F06000C
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131099660;
- // aapt resource value: 0x7f07001e
- public const int abc_action_bar_subtitle_top_margin_material = 2131165214;
+ // aapt resource value: 0x7F06000D
+ public const int abc_action_bar_subtitle_top_margin_material = 2131099661;
- // aapt resource value: 0x7f07001f
- public const int abc_action_button_min_height_material = 2131165215;
+ // aapt resource value: 0x7F06000E
+ public const int abc_action_button_min_height_material = 2131099662;
- // aapt resource value: 0x7f070020
- public const int abc_action_button_min_width_material = 2131165216;
+ // aapt resource value: 0x7F06000F
+ public const int abc_action_button_min_width_material = 2131099663;
- // aapt resource value: 0x7f070021
- public const int abc_action_button_min_width_overflow_material = 2131165217;
+ // aapt resource value: 0x7F060010
+ public const int abc_action_button_min_width_overflow_material = 2131099664;
- // aapt resource value: 0x7f070006
- public const int abc_alert_dialog_button_bar_height = 2131165190;
+ // aapt resource value: 0x7F060011
+ public const int abc_alert_dialog_button_bar_height = 2131099665;
- // aapt resource value: 0x7f070022
- public const int abc_button_inset_horizontal_material = 2131165218;
+ // aapt resource value: 0x7F060012
+ public const int abc_button_inset_horizontal_material = 2131099666;
- // aapt resource value: 0x7f070023
- public const int abc_button_inset_vertical_material = 2131165219;
+ // aapt resource value: 0x7F060013
+ public const int abc_button_inset_vertical_material = 2131099667;
- // aapt resource value: 0x7f070024
- public const int abc_button_padding_horizontal_material = 2131165220;
+ // aapt resource value: 0x7F060014
+ public const int abc_button_padding_horizontal_material = 2131099668;
- // aapt resource value: 0x7f070025
- public const int abc_button_padding_vertical_material = 2131165221;
+ // aapt resource value: 0x7F060015
+ public const int abc_button_padding_vertical_material = 2131099669;
- // aapt resource value: 0x7f070026
- public const int abc_cascading_menus_min_smallest_width = 2131165222;
+ // aapt resource value: 0x7F060016
+ public const int abc_cascading_menus_min_smallest_width = 2131099670;
- // aapt resource value: 0x7f07000b
- public const int abc_config_prefDialogWidth = 2131165195;
+ // aapt resource value: 0x7F060017
+ public const int abc_config_prefDialogWidth = 2131099671;
- // aapt resource value: 0x7f070027
- public const int abc_control_corner_material = 2131165223;
+ // aapt resource value: 0x7F060018
+ public const int abc_control_corner_material = 2131099672;
- // aapt resource value: 0x7f070028
- public const int abc_control_inset_material = 2131165224;
+ // aapt resource value: 0x7F060019
+ public const int abc_control_inset_material = 2131099673;
- // aapt resource value: 0x7f070029
- public const int abc_control_padding_material = 2131165225;
+ // aapt resource value: 0x7F06001A
+ public const int abc_control_padding_material = 2131099674;
- // aapt resource value: 0x7f07000c
- public const int abc_dialog_fixed_height_major = 2131165196;
+ // aapt resource value: 0x7F06001B
+ public const int abc_dialog_fixed_height_major = 2131099675;
- // aapt resource value: 0x7f07000d
- public const int abc_dialog_fixed_height_minor = 2131165197;
+ // aapt resource value: 0x7F06001C
+ public const int abc_dialog_fixed_height_minor = 2131099676;
- // aapt resource value: 0x7f07000e
- public const int abc_dialog_fixed_width_major = 2131165198;
+ // aapt resource value: 0x7F06001D
+ public const int abc_dialog_fixed_width_major = 2131099677;
- // aapt resource value: 0x7f07000f
- public const int abc_dialog_fixed_width_minor = 2131165199;
+ // aapt resource value: 0x7F06001E
+ public const int abc_dialog_fixed_width_minor = 2131099678;
- // aapt resource value: 0x7f07002a
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131165226;
+ // aapt resource value: 0x7F06001F
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131099679;
- // aapt resource value: 0x7f07002b
- public const int abc_dialog_list_padding_top_no_title = 2131165227;
+ // aapt resource value: 0x7F060020
+ public const int abc_dialog_list_padding_top_no_title = 2131099680;
- // aapt resource value: 0x7f070010
- public const int abc_dialog_min_width_major = 2131165200;
+ // aapt resource value: 0x7F060021
+ public const int abc_dialog_min_width_major = 2131099681;
- // aapt resource value: 0x7f070011
- public const int abc_dialog_min_width_minor = 2131165201;
+ // aapt resource value: 0x7F060022
+ public const int abc_dialog_min_width_minor = 2131099682;
- // aapt resource value: 0x7f07002c
- public const int abc_dialog_padding_material = 2131165228;
+ // aapt resource value: 0x7F060023
+ public const int abc_dialog_padding_material = 2131099683;
- // aapt resource value: 0x7f07002d
- public const int abc_dialog_padding_top_material = 2131165229;
+ // aapt resource value: 0x7F060024
+ public const int abc_dialog_padding_top_material = 2131099684;
- // aapt resource value: 0x7f07002e
- public const int abc_dialog_title_divider_material = 2131165230;
+ // aapt resource value: 0x7F060025
+ public const int abc_dialog_title_divider_material = 2131099685;
- // aapt resource value: 0x7f07002f
- public const int abc_disabled_alpha_material_dark = 2131165231;
+ // aapt resource value: 0x7F060026
+ public const int abc_disabled_alpha_material_dark = 2131099686;
- // aapt resource value: 0x7f070030
- public const int abc_disabled_alpha_material_light = 2131165232;
+ // aapt resource value: 0x7F060027
+ public const int abc_disabled_alpha_material_light = 2131099687;
- // aapt resource value: 0x7f070031
- public const int abc_dropdownitem_icon_width = 2131165233;
+ // aapt resource value: 0x7F060028
+ public const int abc_dropdownitem_icon_width = 2131099688;
- // aapt resource value: 0x7f070032
- public const int abc_dropdownitem_text_padding_left = 2131165234;
+ // aapt resource value: 0x7F060029
+ public const int abc_dropdownitem_text_padding_left = 2131099689;
- // aapt resource value: 0x7f070033
- public const int abc_dropdownitem_text_padding_right = 2131165235;
+ // aapt resource value: 0x7F06002A
+ public const int abc_dropdownitem_text_padding_right = 2131099690;
- // aapt resource value: 0x7f070034
- public const int abc_edit_text_inset_bottom_material = 2131165236;
+ // aapt resource value: 0x7F06002B
+ public const int abc_edit_text_inset_bottom_material = 2131099691;
- // aapt resource value: 0x7f070035
- public const int abc_edit_text_inset_horizontal_material = 2131165237;
+ // aapt resource value: 0x7F06002C
+ public const int abc_edit_text_inset_horizontal_material = 2131099692;
- // aapt resource value: 0x7f070036
- public const int abc_edit_text_inset_top_material = 2131165238;
+ // aapt resource value: 0x7F06002D
+ public const int abc_edit_text_inset_top_material = 2131099693;
- // aapt resource value: 0x7f070037
- public const int abc_floating_window_z = 2131165239;
+ // aapt resource value: 0x7F06002E
+ public const int abc_floating_window_z = 2131099694;
- // aapt resource value: 0x7f070038
- public const int abc_list_item_padding_horizontal_material = 2131165240;
+ // aapt resource value: 0x7F06002F
+ public const int abc_list_item_padding_horizontal_material = 2131099695;
- // aapt resource value: 0x7f070039
- public const int abc_panel_menu_list_width = 2131165241;
+ // aapt resource value: 0x7F060030
+ public const int abc_panel_menu_list_width = 2131099696;
- // aapt resource value: 0x7f07003a
- public const int abc_progress_bar_height_material = 2131165242;
+ // aapt resource value: 0x7F060031
+ public const int abc_progress_bar_height_material = 2131099697;
- // aapt resource value: 0x7f07003b
- public const int abc_search_view_preferred_height = 2131165243;
+ // aapt resource value: 0x7F060032
+ public const int abc_search_view_preferred_height = 2131099698;
- // aapt resource value: 0x7f07003c
- public const int abc_search_view_preferred_width = 2131165244;
+ // aapt resource value: 0x7F060033
+ public const int abc_search_view_preferred_width = 2131099699;
- // aapt resource value: 0x7f07003d
- public const int abc_seekbar_track_background_height_material = 2131165245;
+ // aapt resource value: 0x7F060034
+ public const int abc_seekbar_track_background_height_material = 2131099700;
- // aapt resource value: 0x7f07003e
- public const int abc_seekbar_track_progress_height_material = 2131165246;
+ // aapt resource value: 0x7F060035
+ public const int abc_seekbar_track_progress_height_material = 2131099701;
- // aapt resource value: 0x7f07003f
- public const int abc_select_dialog_padding_start_material = 2131165247;
+ // aapt resource value: 0x7F060036
+ public const int abc_select_dialog_padding_start_material = 2131099702;
- // aapt resource value: 0x7f070016
- public const int abc_switch_padding = 2131165206;
+ // aapt resource value: 0x7F060037
+ public const int abc_switch_padding = 2131099703;
- // aapt resource value: 0x7f070040
- public const int abc_text_size_body_1_material = 2131165248;
+ // aapt resource value: 0x7F060038
+ public const int abc_text_size_body_1_material = 2131099704;
- // aapt resource value: 0x7f070041
- public const int abc_text_size_body_2_material = 2131165249;
+ // aapt resource value: 0x7F060039
+ public const int abc_text_size_body_2_material = 2131099705;
- // aapt resource value: 0x7f070042
- public const int abc_text_size_button_material = 2131165250;
+ // aapt resource value: 0x7F06003A
+ public const int abc_text_size_button_material = 2131099706;
- // aapt resource value: 0x7f070043
- public const int abc_text_size_caption_material = 2131165251;
+ // aapt resource value: 0x7F06003B
+ public const int abc_text_size_caption_material = 2131099707;
- // aapt resource value: 0x7f070044
- public const int abc_text_size_display_1_material = 2131165252;
+ // aapt resource value: 0x7F06003C
+ public const int abc_text_size_display_1_material = 2131099708;
- // aapt resource value: 0x7f070045
- public const int abc_text_size_display_2_material = 2131165253;
+ // aapt resource value: 0x7F06003D
+ public const int abc_text_size_display_2_material = 2131099709;
- // aapt resource value: 0x7f070046
- public const int abc_text_size_display_3_material = 2131165254;
+ // aapt resource value: 0x7F06003E
+ public const int abc_text_size_display_3_material = 2131099710;
- // aapt resource value: 0x7f070047
- public const int abc_text_size_display_4_material = 2131165255;
+ // aapt resource value: 0x7F06003F
+ public const int abc_text_size_display_4_material = 2131099711;
- // aapt resource value: 0x7f070048
- public const int abc_text_size_headline_material = 2131165256;
+ // aapt resource value: 0x7F060040
+ public const int abc_text_size_headline_material = 2131099712;
- // aapt resource value: 0x7f070049
- public const int abc_text_size_large_material = 2131165257;
+ // aapt resource value: 0x7F060041
+ public const int abc_text_size_large_material = 2131099713;
- // aapt resource value: 0x7f07004a
- public const int abc_text_size_medium_material = 2131165258;
+ // aapt resource value: 0x7F060042
+ public const int abc_text_size_medium_material = 2131099714;
- // aapt resource value: 0x7f07004b
- public const int abc_text_size_menu_header_material = 2131165259;
+ // aapt resource value: 0x7F060043
+ public const int abc_text_size_menu_header_material = 2131099715;
- // aapt resource value: 0x7f07004c
- public const int abc_text_size_menu_material = 2131165260;
+ // aapt resource value: 0x7F060044
+ public const int abc_text_size_menu_material = 2131099716;
- // aapt resource value: 0x7f07004d
- public const int abc_text_size_small_material = 2131165261;
+ // aapt resource value: 0x7F060045
+ public const int abc_text_size_small_material = 2131099717;
- // aapt resource value: 0x7f07004e
- public const int abc_text_size_subhead_material = 2131165262;
+ // aapt resource value: 0x7F060046
+ public const int abc_text_size_subhead_material = 2131099718;
- // aapt resource value: 0x7f070009
- public const int abc_text_size_subtitle_material_toolbar = 2131165193;
+ // aapt resource value: 0x7F060047
+ public const int abc_text_size_subtitle_material_toolbar = 2131099719;
- // aapt resource value: 0x7f07004f
- public const int abc_text_size_title_material = 2131165263;
+ // aapt resource value: 0x7F060048
+ public const int abc_text_size_title_material = 2131099720;
- // aapt resource value: 0x7f07000a
- public const int abc_text_size_title_material_toolbar = 2131165194;
+ // aapt resource value: 0x7F060049
+ public const int abc_text_size_title_material_toolbar = 2131099721;
- // aapt resource value: 0x7f070065
- public const int compat_button_inset_horizontal_material = 2131165285;
+ // aapt resource value: 0x7F06004A
+ public const int compat_button_inset_horizontal_material = 2131099722;
- // aapt resource value: 0x7f070066
- public const int compat_button_inset_vertical_material = 2131165286;
+ // aapt resource value: 0x7F06004B
+ public const int compat_button_inset_vertical_material = 2131099723;
- // aapt resource value: 0x7f070067
- public const int compat_button_padding_horizontal_material = 2131165287;
+ // aapt resource value: 0x7F06004C
+ public const int compat_button_padding_horizontal_material = 2131099724;
- // aapt resource value: 0x7f070068
- public const int compat_button_padding_vertical_material = 2131165288;
+ // aapt resource value: 0x7F06004D
+ public const int compat_button_padding_vertical_material = 2131099725;
- // aapt resource value: 0x7f070069
- public const int compat_control_corner_material = 2131165289;
+ // aapt resource value: 0x7F06004E
+ public const int compat_control_corner_material = 2131099726;
- // aapt resource value: 0x7f070050
- public const int disabled_alpha_material_dark = 2131165264;
+ // aapt resource value: 0x7F06004F
+ public const int disabled_alpha_material_dark = 2131099727;
- // aapt resource value: 0x7f070051
- public const int disabled_alpha_material_light = 2131165265;
+ // aapt resource value: 0x7F060050
+ public const int disabled_alpha_material_light = 2131099728;
- // aapt resource value: 0x7f070000
- public const int fastscroll_default_thickness = 2131165184;
+ // aapt resource value: 0x7F060051
+ public const int fastscroll_default_thickness = 2131099729;
- // aapt resource value: 0x7f070001
- public const int fastscroll_margin = 2131165185;
+ // aapt resource value: 0x7F060052
+ public const int fastscroll_margin = 2131099730;
- // aapt resource value: 0x7f070002
- public const int fastscroll_minimum_range = 2131165186;
+ // aapt resource value: 0x7F060053
+ public const int fastscroll_minimum_range = 2131099731;
- // aapt resource value: 0x7f070076
- public const int fingerprint_icon_size = 2131165302;
+ // aapt resource value: 0x7F060054
+ public const int fingerprint_icon_size = 2131099732;
- // aapt resource value: 0x7f070075
- public const int fingerprint_status_layout_margin_vertical = 2131165301;
+ // aapt resource value: 0x7F060055
+ public const int fingerprint_status_layout_margin_vertical = 2131099733;
- // aapt resource value: 0x7f070052
- public const int highlight_alpha_material_colored = 2131165266;
+ // aapt resource value: 0x7F060056
+ public const int highlight_alpha_material_colored = 2131099734;
- // aapt resource value: 0x7f070053
- public const int highlight_alpha_material_dark = 2131165267;
+ // aapt resource value: 0x7F060057
+ public const int highlight_alpha_material_dark = 2131099735;
- // aapt resource value: 0x7f070054
- public const int highlight_alpha_material_light = 2131165268;
+ // aapt resource value: 0x7F060058
+ public const int highlight_alpha_material_light = 2131099736;
- // aapt resource value: 0x7f070055
- public const int hint_alpha_material_dark = 2131165269;
+ // aapt resource value: 0x7F060059
+ public const int hint_alpha_material_dark = 2131099737;
- // aapt resource value: 0x7f070056
- public const int hint_alpha_material_light = 2131165270;
+ // aapt resource value: 0x7F06005A
+ public const int hint_alpha_material_light = 2131099738;
- // aapt resource value: 0x7f070057
- public const int hint_pressed_alpha_material_dark = 2131165271;
+ // aapt resource value: 0x7F06005B
+ public const int hint_pressed_alpha_material_dark = 2131099739;
- // aapt resource value: 0x7f070058
- public const int hint_pressed_alpha_material_light = 2131165272;
+ // aapt resource value: 0x7F06005C
+ public const int hint_pressed_alpha_material_light = 2131099740;
- // aapt resource value: 0x7f070003
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131165187;
+ // aapt resource value: 0x7F06005D
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131099741;
- // aapt resource value: 0x7f070004
- public const int item_touch_helper_swipe_escape_max_velocity = 2131165188;
+ // aapt resource value: 0x7F06005E
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131099742;
- // aapt resource value: 0x7f070005
- public const int item_touch_helper_swipe_escape_velocity = 2131165189;
+ // aapt resource value: 0x7F06005F
+ public const int item_touch_helper_swipe_escape_velocity = 2131099743;
- // aapt resource value: 0x7f07006a
- public const int notification_action_icon_size = 2131165290;
+ // aapt resource value: 0x7F060060
+ public const int notification_action_icon_size = 2131099744;
- // aapt resource value: 0x7f07006b
- public const int notification_action_text_size = 2131165291;
+ // aapt resource value: 0x7F060061
+ public const int notification_action_text_size = 2131099745;
- // aapt resource value: 0x7f07006c
- public const int notification_big_circle_margin = 2131165292;
+ // aapt resource value: 0x7F060062
+ public const int notification_big_circle_margin = 2131099746;
- // aapt resource value: 0x7f070062
- public const int notification_content_margin_start = 2131165282;
+ // aapt resource value: 0x7F060063
+ public const int notification_content_margin_start = 2131099747;
- // aapt resource value: 0x7f07006d
- public const int notification_large_icon_height = 2131165293;
+ // aapt resource value: 0x7F060064
+ public const int notification_large_icon_height = 2131099748;
- // aapt resource value: 0x7f07006e
- public const int notification_large_icon_width = 2131165294;
+ // aapt resource value: 0x7F060065
+ public const int notification_large_icon_width = 2131099749;
- // aapt resource value: 0x7f070063
- public const int notification_main_column_padding_top = 2131165283;
+ // aapt resource value: 0x7F060066
+ public const int notification_main_column_padding_top = 2131099750;
- // aapt resource value: 0x7f070064
- public const int notification_media_narrow_margin = 2131165284;
+ // aapt resource value: 0x7F060067
+ public const int notification_media_narrow_margin = 2131099751;
- // aapt resource value: 0x7f07006f
- public const int notification_right_icon_size = 2131165295;
+ // aapt resource value: 0x7F060068
+ public const int notification_right_icon_size = 2131099752;
- // aapt resource value: 0x7f070061
- public const int notification_right_side_padding_top = 2131165281;
+ // aapt resource value: 0x7F060069
+ public const int notification_right_side_padding_top = 2131099753;
- // aapt resource value: 0x7f070070
- public const int notification_small_icon_background_padding = 2131165296;
+ // aapt resource value: 0x7F06006A
+ public const int notification_small_icon_background_padding = 2131099754;
- // aapt resource value: 0x7f070071
- public const int notification_small_icon_size_as_large = 2131165297;
+ // aapt resource value: 0x7F06006B
+ public const int notification_small_icon_size_as_large = 2131099755;
- // aapt resource value: 0x7f070072
- public const int notification_subtext_size = 2131165298;
+ // aapt resource value: 0x7F06006C
+ public const int notification_subtext_size = 2131099756;
- // aapt resource value: 0x7f070073
- public const int notification_top_pad = 2131165299;
+ // aapt resource value: 0x7F06006D
+ public const int notification_top_pad = 2131099757;
- // aapt resource value: 0x7f070074
- public const int notification_top_pad_large_text = 2131165300;
+ // aapt resource value: 0x7F06006E
+ public const int notification_top_pad_large_text = 2131099758;
- // aapt resource value: 0x7f070077
- public const int pickerview_textsize = 2131165303;
+ // aapt resource value: 0x7F06006F
+ public const int pickerview_textsize = 2131099759;
- // aapt resource value: 0x7f070078
- public const int pickerview_topbar_btn_textsize = 2131165304;
+ // aapt resource value: 0x7F060070
+ public const int pickerview_topbar_btn_textsize = 2131099760;
- // aapt resource value: 0x7f070079
- public const int pickerview_topbar_height = 2131165305;
+ // aapt resource value: 0x7F060071
+ public const int pickerview_topbar_height = 2131099761;
- // aapt resource value: 0x7f07007a
- public const int pickerview_topbar_padding = 2131165306;
+ // aapt resource value: 0x7F060072
+ public const int pickerview_topbar_padding = 2131099762;
- // aapt resource value: 0x7f07007b
- public const int pickerview_topbar_title_textsize = 2131165307;
+ // aapt resource value: 0x7F060073
+ public const int pickerview_topbar_title_textsize = 2131099763;
- // aapt resource value: 0x7f070059
- public const int tooltip_corner_radius = 2131165273;
+ // aapt resource value: 0x7F060074
+ public const int tooltip_corner_radius = 2131099764;
- // aapt resource value: 0x7f07005a
- public const int tooltip_horizontal_padding = 2131165274;
+ // aapt resource value: 0x7F060075
+ public const int tooltip_horizontal_padding = 2131099765;
- // aapt resource value: 0x7f07005b
- public const int tooltip_margin = 2131165275;
+ // aapt resource value: 0x7F060076
+ public const int tooltip_margin = 2131099766;
- // aapt resource value: 0x7f07005c
- public const int tooltip_precise_anchor_extra_offset = 2131165276;
+ // aapt resource value: 0x7F060077
+ public const int tooltip_precise_anchor_extra_offset = 2131099767;
- // aapt resource value: 0x7f07005d
- public const int tooltip_precise_anchor_threshold = 2131165277;
+ // aapt resource value: 0x7F060078
+ public const int tooltip_precise_anchor_threshold = 2131099768;
- // aapt resource value: 0x7f07005e
- public const int tooltip_vertical_padding = 2131165278;
+ // aapt resource value: 0x7F060079
+ public const int tooltip_vertical_padding = 2131099769;
- // aapt resource value: 0x7f07005f
- public const int tooltip_y_offset_non_touch = 2131165279;
+ // aapt resource value: 0x7F06007A
+ public const int tooltip_y_offset_non_touch = 2131099770;
- // aapt resource value: 0x7f070060
- public const int tooltip_y_offset_touch = 2131165280;
+ // aapt resource value: 0x7F06007B
+ public const int tooltip_y_offset_touch = 2131099771;
static Dimension()
{
@@ -2104,416 +2104,416 @@
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+ // aapt resource value: 0x7F070000
+ public const int abc_ab_share_pack_mtrl_alpha = 2131165184;
- // aapt resource value: 0x7f020001
- public const int abc_action_bar_item_background_material = 2130837505;
+ // aapt resource value: 0x7F070001
+ public const int abc_action_bar_item_background_material = 2131165185;
- // aapt resource value: 0x7f020002
- public const int abc_btn_borderless_material = 2130837506;
+ // aapt resource value: 0x7F070002
+ public const int abc_btn_borderless_material = 2131165186;
- // aapt resource value: 0x7f020003
- public const int abc_btn_check_material = 2130837507;
+ // aapt resource value: 0x7F070003
+ public const int abc_btn_check_material = 2131165187;
- // aapt resource value: 0x7f020004
- public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+ // aapt resource value: 0x7F070004
+ public const int abc_btn_check_to_on_mtrl_000 = 2131165188;
- // aapt resource value: 0x7f020005
- public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+ // aapt resource value: 0x7F070005
+ public const int abc_btn_check_to_on_mtrl_015 = 2131165189;
- // aapt resource value: 0x7f020006
- public const int abc_btn_colored_material = 2130837510;
+ // aapt resource value: 0x7F070006
+ public const int abc_btn_colored_material = 2131165190;
- // aapt resource value: 0x7f020007
- public const int abc_btn_default_mtrl_shape = 2130837511;
+ // aapt resource value: 0x7F070007
+ public const int abc_btn_default_mtrl_shape = 2131165191;
- // aapt resource value: 0x7f020008
- public const int abc_btn_radio_material = 2130837512;
+ // aapt resource value: 0x7F070008
+ public const int abc_btn_radio_material = 2131165192;
- // aapt resource value: 0x7f020009
- public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+ // aapt resource value: 0x7F070009
+ public const int abc_btn_radio_to_on_mtrl_000 = 2131165193;
- // aapt resource value: 0x7f02000a
- public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+ // aapt resource value: 0x7F07000A
+ public const int abc_btn_radio_to_on_mtrl_015 = 2131165194;
- // aapt resource value: 0x7f02000b
- public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+ // aapt resource value: 0x7F07000B
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2131165195;
- // aapt resource value: 0x7f02000c
- public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+ // aapt resource value: 0x7F07000C
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2131165196;
- // aapt resource value: 0x7f02000d
- public const int abc_cab_background_internal_bg = 2130837517;
+ // aapt resource value: 0x7F07000D
+ public const int abc_cab_background_internal_bg = 2131165197;
- // aapt resource value: 0x7f02000e
- public const int abc_cab_background_top_material = 2130837518;
+ // aapt resource value: 0x7F07000E
+ public const int abc_cab_background_top_material = 2131165198;
- // aapt resource value: 0x7f02000f
- public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+ // aapt resource value: 0x7F07000F
+ public const int abc_cab_background_top_mtrl_alpha = 2131165199;
- // aapt resource value: 0x7f020010
- public const int abc_control_background_material = 2130837520;
+ // aapt resource value: 0x7F070010
+ public const int abc_control_background_material = 2131165200;
- // aapt resource value: 0x7f020011
- public const int abc_dialog_material_background = 2130837521;
+ // aapt resource value: 0x7F070011
+ public const int abc_dialog_material_background = 2131165201;
- // aapt resource value: 0x7f020012
- public const int abc_edit_text_material = 2130837522;
+ // aapt resource value: 0x7F070012
+ public const int abc_edit_text_material = 2131165202;
- // aapt resource value: 0x7f020013
- public const int abc_ic_ab_back_material = 2130837523;
+ // aapt resource value: 0x7F070013
+ public const int abc_ic_ab_back_material = 2131165203;
- // aapt resource value: 0x7f020014
- public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+ // aapt resource value: 0x7F070014
+ public const int abc_ic_arrow_drop_right_black_24dp = 2131165204;
- // aapt resource value: 0x7f020015
- public const int abc_ic_clear_material = 2130837525;
+ // aapt resource value: 0x7F070015
+ public const int abc_ic_clear_material = 2131165205;
- // aapt resource value: 0x7f020016
- public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+ // aapt resource value: 0x7F070016
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2131165206;
- // aapt resource value: 0x7f020017
- public const int abc_ic_go_search_api_material = 2130837527;
+ // aapt resource value: 0x7F070017
+ public const int abc_ic_go_search_api_material = 2131165207;
- // aapt resource value: 0x7f020018
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+ // aapt resource value: 0x7F070018
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2131165208;
- // aapt resource value: 0x7f020019
- public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+ // aapt resource value: 0x7F070019
+ public const int abc_ic_menu_cut_mtrl_alpha = 2131165209;
- // aapt resource value: 0x7f02001a
- public const int abc_ic_menu_overflow_material = 2130837530;
+ // aapt resource value: 0x7F07001A
+ public const int abc_ic_menu_overflow_material = 2131165210;
- // aapt resource value: 0x7f02001b
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+ // aapt resource value: 0x7F07001B
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2131165211;
- // aapt resource value: 0x7f02001c
- public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+ // aapt resource value: 0x7F07001C
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2131165212;
- // aapt resource value: 0x7f02001d
- public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+ // aapt resource value: 0x7F07001D
+ public const int abc_ic_menu_share_mtrl_alpha = 2131165213;
- // aapt resource value: 0x7f02001e
- public const int abc_ic_search_api_material = 2130837534;
+ // aapt resource value: 0x7F07001E
+ public const int abc_ic_search_api_material = 2131165214;
- // aapt resource value: 0x7f02001f
- public const int abc_ic_star_black_16dp = 2130837535;
+ // aapt resource value: 0x7F07001F
+ public const int abc_ic_star_black_16dp = 2131165215;
- // aapt resource value: 0x7f020020
- public const int abc_ic_star_black_36dp = 2130837536;
+ // aapt resource value: 0x7F070020
+ public const int abc_ic_star_black_36dp = 2131165216;
- // aapt resource value: 0x7f020021
- public const int abc_ic_star_black_48dp = 2130837537;
+ // aapt resource value: 0x7F070021
+ public const int abc_ic_star_black_48dp = 2131165217;
- // aapt resource value: 0x7f020022
- public const int abc_ic_star_half_black_16dp = 2130837538;
+ // aapt resource value: 0x7F070022
+ public const int abc_ic_star_half_black_16dp = 2131165218;
- // aapt resource value: 0x7f020023
- public const int abc_ic_star_half_black_36dp = 2130837539;
+ // aapt resource value: 0x7F070023
+ public const int abc_ic_star_half_black_36dp = 2131165219;
- // aapt resource value: 0x7f020024
- public const int abc_ic_star_half_black_48dp = 2130837540;
+ // aapt resource value: 0x7F070024
+ public const int abc_ic_star_half_black_48dp = 2131165220;
- // aapt resource value: 0x7f020025
- public const int abc_ic_voice_search_api_material = 2130837541;
+ // aapt resource value: 0x7F070025
+ public const int abc_ic_voice_search_api_material = 2131165221;
- // aapt resource value: 0x7f020026
- public const int abc_item_background_holo_dark = 2130837542;
+ // aapt resource value: 0x7F070026
+ public const int abc_item_background_holo_dark = 2131165222;
- // aapt resource value: 0x7f020027
- public const int abc_item_background_holo_light = 2130837543;
+ // aapt resource value: 0x7F070027
+ public const int abc_item_background_holo_light = 2131165223;
- // aapt resource value: 0x7f020028
- public const int abc_list_divider_mtrl_alpha = 2130837544;
+ // aapt resource value: 0x7F070028
+ public const int abc_list_divider_mtrl_alpha = 2131165224;
- // aapt resource value: 0x7f020029
- public const int abc_list_focused_holo = 2130837545;
+ // aapt resource value: 0x7F070029
+ public const int abc_list_focused_holo = 2131165225;
- // aapt resource value: 0x7f02002a
- public const int abc_list_longpressed_holo = 2130837546;
+ // aapt resource value: 0x7F07002A
+ public const int abc_list_longpressed_holo = 2131165226;
- // aapt resource value: 0x7f02002b
- public const int abc_list_pressed_holo_dark = 2130837547;
+ // aapt resource value: 0x7F07002B
+ public const int abc_list_pressed_holo_dark = 2131165227;
- // aapt resource value: 0x7f02002c
- public const int abc_list_pressed_holo_light = 2130837548;
+ // aapt resource value: 0x7F07002C
+ public const int abc_list_pressed_holo_light = 2131165228;
- // aapt resource value: 0x7f02002d
- public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+ // aapt resource value: 0x7F07002D
+ public const int abc_list_selector_background_transition_holo_dark = 2131165229;
- // aapt resource value: 0x7f02002e
- public const int abc_list_selector_background_transition_holo_light = 2130837550;
+ // aapt resource value: 0x7F07002E
+ public const int abc_list_selector_background_transition_holo_light = 2131165230;
- // aapt resource value: 0x7f02002f
- public const int abc_list_selector_disabled_holo_dark = 2130837551;
+ // aapt resource value: 0x7F07002F
+ public const int abc_list_selector_disabled_holo_dark = 2131165231;
- // aapt resource value: 0x7f020030
- public const int abc_list_selector_disabled_holo_light = 2130837552;
+ // aapt resource value: 0x7F070030
+ public const int abc_list_selector_disabled_holo_light = 2131165232;
- // aapt resource value: 0x7f020031
- public const int abc_list_selector_holo_dark = 2130837553;
+ // aapt resource value: 0x7F070031
+ public const int abc_list_selector_holo_dark = 2131165233;
- // aapt resource value: 0x7f020032
- public const int abc_list_selector_holo_light = 2130837554;
+ // aapt resource value: 0x7F070032
+ public const int abc_list_selector_holo_light = 2131165234;
- // aapt resource value: 0x7f020033
- public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+ // aapt resource value: 0x7F070033
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2131165235;
- // aapt resource value: 0x7f020034
- public const int abc_popup_background_mtrl_mult = 2130837556;
+ // aapt resource value: 0x7F070034
+ public const int abc_popup_background_mtrl_mult = 2131165236;
- // aapt resource value: 0x7f020035
- public const int abc_ratingbar_indicator_material = 2130837557;
+ // aapt resource value: 0x7F070035
+ public const int abc_ratingbar_indicator_material = 2131165237;
- // aapt resource value: 0x7f020036
- public const int abc_ratingbar_material = 2130837558;
+ // aapt resource value: 0x7F070036
+ public const int abc_ratingbar_material = 2131165238;
- // aapt resource value: 0x7f020037
- public const int abc_ratingbar_small_material = 2130837559;
+ // aapt resource value: 0x7F070037
+ public const int abc_ratingbar_small_material = 2131165239;
- // aapt resource value: 0x7f020038
- public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+ // aapt resource value: 0x7F070038
+ public const int abc_scrubber_control_off_mtrl_alpha = 2131165240;
- // aapt resource value: 0x7f020039
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+ // aapt resource value: 0x7F070039
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131165241;
- // aapt resource value: 0x7f02003a
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+ // aapt resource value: 0x7F07003A
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131165242;
- // aapt resource value: 0x7f02003b
- public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+ // aapt resource value: 0x7F07003B
+ public const int abc_scrubber_primary_mtrl_alpha = 2131165243;
- // aapt resource value: 0x7f02003c
- public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+ // aapt resource value: 0x7F07003C
+ public const int abc_scrubber_track_mtrl_alpha = 2131165244;
- // aapt resource value: 0x7f02003d
- public const int abc_seekbar_thumb_material = 2130837565;
+ // aapt resource value: 0x7F07003D
+ public const int abc_seekbar_thumb_material = 2131165245;
- // aapt resource value: 0x7f02003e
- public const int abc_seekbar_tick_mark_material = 2130837566;
+ // aapt resource value: 0x7F07003E
+ public const int abc_seekbar_tick_mark_material = 2131165246;
- // aapt resource value: 0x7f02003f
- public const int abc_seekbar_track_material = 2130837567;
+ // aapt resource value: 0x7F07003F
+ public const int abc_seekbar_track_material = 2131165247;
- // aapt resource value: 0x7f020040
- public const int abc_spinner_mtrl_am_alpha = 2130837568;
+ // aapt resource value: 0x7F070040
+ public const int abc_spinner_mtrl_am_alpha = 2131165248;
- // aapt resource value: 0x7f020041
- public const int abc_spinner_textfield_background_material = 2130837569;
+ // aapt resource value: 0x7F070041
+ public const int abc_spinner_textfield_background_material = 2131165249;
- // aapt resource value: 0x7f020042
- public const int abc_switch_thumb_material = 2130837570;
+ // aapt resource value: 0x7F070042
+ public const int abc_switch_thumb_material = 2131165250;
- // aapt resource value: 0x7f020043
- public const int abc_switch_track_mtrl_alpha = 2130837571;
+ // aapt resource value: 0x7F070043
+ public const int abc_switch_track_mtrl_alpha = 2131165251;
- // aapt resource value: 0x7f020044
- public const int abc_tab_indicator_material = 2130837572;
+ // aapt resource value: 0x7F070044
+ public const int abc_tab_indicator_material = 2131165252;
- // aapt resource value: 0x7f020045
- public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+ // aapt resource value: 0x7F070045
+ public const int abc_tab_indicator_mtrl_alpha = 2131165253;
- // aapt resource value: 0x7f020046
- public const int abc_text_cursor_material = 2130837574;
+ // aapt resource value: 0x7F07004D
+ public const int abc_textfield_activated_mtrl_alpha = 2131165261;
- // aapt resource value: 0x7f020047
- public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+ // aapt resource value: 0x7F07004E
+ public const int abc_textfield_default_mtrl_alpha = 2131165262;
- // aapt resource value: 0x7f020048
- public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+ // aapt resource value: 0x7F07004F
+ public const int abc_textfield_search_activated_mtrl_alpha = 2131165263;
- // aapt resource value: 0x7f020049
- public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+ // aapt resource value: 0x7F070050
+ public const int abc_textfield_search_default_mtrl_alpha = 2131165264;
- // aapt resource value: 0x7f02004a
- public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+ // aapt resource value: 0x7F070051
+ public const int abc_textfield_search_material = 2131165265;
- // aapt resource value: 0x7f02004b
- public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
+ // aapt resource value: 0x7F070046
+ public const int abc_text_cursor_material = 2131165254;
- // aapt resource value: 0x7f02004c
- public const int abc_text_select_handle_right_mtrl_light = 2130837580;
+ // aapt resource value: 0x7F070047
+ public const int abc_text_select_handle_left_mtrl_dark = 2131165255;
- // aapt resource value: 0x7f02004d
- public const int abc_textfield_activated_mtrl_alpha = 2130837581;
+ // aapt resource value: 0x7F070048
+ public const int abc_text_select_handle_left_mtrl_light = 2131165256;
- // aapt resource value: 0x7f02004e
- public const int abc_textfield_default_mtrl_alpha = 2130837582;
+ // aapt resource value: 0x7F070049
+ public const int abc_text_select_handle_middle_mtrl_dark = 2131165257;
- // aapt resource value: 0x7f02004f
- public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
+ // aapt resource value: 0x7F07004A
+ public const int abc_text_select_handle_middle_mtrl_light = 2131165258;
- // aapt resource value: 0x7f020050
- public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
+ // aapt resource value: 0x7F07004B
+ public const int abc_text_select_handle_right_mtrl_dark = 2131165259;
- // aapt resource value: 0x7f020051
- public const int abc_textfield_search_material = 2130837585;
+ // aapt resource value: 0x7F07004C
+ public const int abc_text_select_handle_right_mtrl_light = 2131165260;
- // aapt resource value: 0x7f020052
- public const int abc_vector_test = 2130837586;
+ // aapt resource value: 0x7F070052
+ public const int abc_vector_test = 2131165266;
- // aapt resource value: 0x7f020053
- public const int fingerprint_draw_off = 2130837587;
+ // aapt resource value: 0x7F070053
+ public const int fingerprint_draw_off = 2131165267;
- // aapt resource value: 0x7f020054
- public const int fingerprint_draw_off_animation = 2130837588;
+ // aapt resource value: 0x7F070054
+ public const int fingerprint_draw_off_animation = 2131165268;
- // aapt resource value: 0x7f020055
- public const int fingerprint_draw_on = 2130837589;
+ // aapt resource value: 0x7F070055
+ public const int fingerprint_draw_on = 2131165269;
- // aapt resource value: 0x7f020056
- public const int fingerprint_draw_on_animation = 2130837590;
+ // aapt resource value: 0x7F070056
+ public const int fingerprint_draw_on_animation = 2131165270;
- // aapt resource value: 0x7f020057
- public const int fingerprint_error = 2130837591;
+ // aapt resource value: 0x7F070057
+ public const int fingerprint_error = 2131165271;
- // aapt resource value: 0x7f020058
- public const int fingerprint_error_off = 2130837592;
+ // aapt resource value: 0x7F070058
+ public const int fingerprint_error_off = 2131165272;
- // aapt resource value: 0x7f020059
- public const int fingerprint_error_off_animation = 2130837593;
+ // aapt resource value: 0x7F070059
+ public const int fingerprint_error_off_animation = 2131165273;
- // aapt resource value: 0x7f02005a
- public const int fingerprint_error_on = 2130837594;
+ // aapt resource value: 0x7F07005A
+ public const int fingerprint_error_on = 2131165274;
- // aapt resource value: 0x7f02005b
- public const int fingerprint_error_on_animation = 2130837595;
+ // aapt resource value: 0x7F07005B
+ public const int fingerprint_error_on_animation = 2131165275;
- // aapt resource value: 0x7f02005c
- public const int fingerprint_error_state_to_fp = 2130837596;
+ // aapt resource value: 0x7F07005C
+ public const int fingerprint_error_state_to_fp = 2131165276;
- // aapt resource value: 0x7f02005d
- public const int fingerprint_error_state_to_fp_animation = 2130837597;
+ // aapt resource value: 0x7F07005D
+ public const int fingerprint_error_state_to_fp_animation = 2131165277;
- // aapt resource value: 0x7f02005e
- public const int fingerprint_fingerprint = 2130837598;
+ // aapt resource value: 0x7F07005E
+ public const int fingerprint_fingerprint = 2131165278;
- // aapt resource value: 0x7f02005f
- public const int fingerprint_fp_to_error_state = 2130837599;
+ // aapt resource value: 0x7F07005F
+ public const int fingerprint_fp_to_error_state = 2131165279;
- // aapt resource value: 0x7f020060
- public const int fingerprint_fp_to_error_state_animation = 2130837600;
+ // aapt resource value: 0x7F070060
+ public const int fingerprint_fp_to_error_state_animation = 2131165280;
- // aapt resource value: 0x7f020061
- public const int gd_btn_shape_app_b = 2130837601;
+ // aapt resource value: 0x7F070061
+ public const int gd_btn_shape_app_b = 2131165281;
- // aapt resource value: 0x7f020062
- public const int gd_btn_shape_app_g = 2130837602;
+ // aapt resource value: 0x7F070062
+ public const int gd_btn_shape_app_g = 2131165282;
- // aapt resource value: 0x7f020063
- public const int gd_btn_shape_app_w = 2130837603;
+ // aapt resource value: 0x7F070063
+ public const int gd_btn_shape_app_w = 2131165283;
- // aapt resource value: 0x7f020064
- public const int gd_btn_shape_shadow_w = 2130837604;
+ // aapt resource value: 0x7F070064
+ public const int gd_btn_shape_shadow_w = 2131165284;
- // aapt resource value: 0x7f020065
- public const int gd_click_effect_select = 2130837605;
+ // aapt resource value: 0x7F070065
+ public const int gd_click_effect_select = 2131165285;
- // aapt resource value: 0x7f020066
- public const int ic_gdmap_add = 2130837606;
+ // aapt resource value: 0x7F070078
+ public const int Icon = 2131165304;
- // aapt resource value: 0x7f020067
- public const int ic_gdmap_back = 2130837607;
+ // aapt resource value: 0x7F070066
+ public const int ic_gdmap_add = 2131165286;
- // aapt resource value: 0x7f020068
- public const int ic_gdmap_delete = 2130837608;
+ // aapt resource value: 0x7F070067
+ public const int ic_gdmap_back = 2131165287;
- // aapt resource value: 0x7f020069
- public const int ic_gdmap_home = 2130837609;
+ // aapt resource value: 0x7F070068
+ public const int ic_gdmap_delete = 2131165288;
- // aapt resource value: 0x7f02006a
- public const int ic_gdmap_mylocation = 2130837610;
+ // aapt resource value: 0x7F070069
+ public const int ic_gdmap_home = 2131165289;
- // aapt resource value: 0x7f02006b
- public const int ic_gdmap_now = 2130837611;
+ // aapt resource value: 0x7F07006A
+ public const int ic_gdmap_mylocation = 2131165290;
- // aapt resource value: 0x7f02006c
- public const int ic_gdmap_search = 2130837612;
+ // aapt resource value: 0x7F07006B
+ public const int ic_gdmap_now = 2131165291;
- // aapt resource value: 0x7f02006d
- public const int ic_gdmap_zoom_out = 2130837613;
+ // aapt resource value: 0x7F07006C
+ public const int ic_gdmap_search = 2131165292;
- // aapt resource value: 0x7f02006e
- public const int ic_gps_point = 2130837614;
+ // aapt resource value: 0x7F07006D
+ public const int ic_gdmap_zoom_out = 2131165293;
- // aapt resource value: 0x7f02006f
- public const int ic_wd_arc_scale_bg = 2130837615;
+ // aapt resource value: 0x7F07006E
+ public const int ic_gps_point = 2131165294;
- // aapt resource value: 0x7f020070
- public const int ic_wd_curtain_bg_top = 2130837616;
+ // aapt resource value: 0x7F07006F
+ public const int ic_wd_arc_scale_bg = 2131165295;
- // aapt resource value: 0x7f020071
- public const int ic_wd_curtain_h_bg = 2130837617;
+ // aapt resource value: 0x7F070070
+ public const int ic_wd_curtain_bg_top = 2131165296;
- // aapt resource value: 0x7f020072
- public const int ic_wd_curtain_h_open = 2130837618;
+ // aapt resource value: 0x7F070071
+ public const int ic_wd_curtain_h_bg = 2131165297;
- // aapt resource value: 0x7f020073
- public const int ic_wd_curtain_h_progress = 2130837619;
+ // aapt resource value: 0x7F070072
+ public const int ic_wd_curtain_h_open = 2131165298;
- // aapt resource value: 0x7f020074
- public const int ic_wd_curtain_h_top = 2130837620;
+ // aapt resource value: 0x7F070073
+ public const int ic_wd_curtain_h_progress = 2131165299;
- // aapt resource value: 0x7f020075
- public const int ic_wd_curtain_open = 2130837621;
+ // aapt resource value: 0x7F070074
+ public const int ic_wd_curtain_h_top = 2131165300;
- // aapt resource value: 0x7f020076
- public const int ic_wd_curtain_roll_bg = 2130837622;
+ // aapt resource value: 0x7F070075
+ public const int ic_wd_curtain_open = 2131165301;
- // aapt resource value: 0x7f020077
- public const int ic_wd_curtain_roll_progress = 2130837623;
+ // aapt resource value: 0x7F070076
+ public const int ic_wd_curtain_roll_bg = 2131165302;
- // aapt resource value: 0x7f020078
- public const int Icon = 2130837624;
+ // aapt resource value: 0x7F070077
+ public const int ic_wd_curtain_roll_progress = 2131165303;
- // aapt resource value: 0x7f020079
- public const int Loading = 2130837625;
+ // aapt resource value: 0x7F070079
+ public const int Loading = 2131165305;
- // aapt resource value: 0x7f02007a
- public const int notification_action_background = 2130837626;
+ // aapt resource value: 0x7F07007A
+ public const int notification_action_background = 2131165306;
- // aapt resource value: 0x7f02007b
- public const int notification_bg = 2130837627;
+ // aapt resource value: 0x7F07007B
+ public const int notification_bg = 2131165307;
- // aapt resource value: 0x7f02007c
- public const int notification_bg_low = 2130837628;
+ // aapt resource value: 0x7F07007C
+ public const int notification_bg_low = 2131165308;
- // aapt resource value: 0x7f02007d
- public const int notification_bg_low_normal = 2130837629;
+ // aapt resource value: 0x7F07007D
+ public const int notification_bg_low_normal = 2131165309;
- // aapt resource value: 0x7f02007e
- public const int notification_bg_low_pressed = 2130837630;
+ // aapt resource value: 0x7F07007E
+ public const int notification_bg_low_pressed = 2131165310;
- // aapt resource value: 0x7f02007f
- public const int notification_bg_normal = 2130837631;
+ // aapt resource value: 0x7F07007F
+ public const int notification_bg_normal = 2131165311;
- // aapt resource value: 0x7f020080
- public const int notification_bg_normal_pressed = 2130837632;
+ // aapt resource value: 0x7F070080
+ public const int notification_bg_normal_pressed = 2131165312;
- // aapt resource value: 0x7f020081
- public const int notification_icon_background = 2130837633;
+ // aapt resource value: 0x7F070081
+ public const int notification_icon_background = 2131165313;
- // aapt resource value: 0x7f020087
- public const int notification_template_icon_bg = 2130837639;
+ // aapt resource value: 0x7F070082
+ public const int notification_template_icon_bg = 2131165314;
- // aapt resource value: 0x7f020088
- public const int notification_template_icon_low_bg = 2130837640;
+ // aapt resource value: 0x7F070083
+ public const int notification_template_icon_low_bg = 2131165315;
- // aapt resource value: 0x7f020082
- public const int notification_tile_bg = 2130837634;
+ // aapt resource value: 0x7F070084
+ public const int notification_tile_bg = 2131165316;
- // aapt resource value: 0x7f020083
- public const int notify_panel_notification_icon_bg = 2130837635;
+ // aapt resource value: 0x7F070085
+ public const int notify_panel_notification_icon_bg = 2131165317;
- // aapt resource value: 0x7f020084
- public const int selector_pickerview_btn = 2130837636;
+ // aapt resource value: 0x7F070086
+ public const int selector_pickerview_btn = 2131165318;
- // aapt resource value: 0x7f020085
- public const int tooltip_frame_dark = 2130837637;
+ // aapt resource value: 0x7F070087
+ public const int tooltip_frame_dark = 2131165319;
- // aapt resource value: 0x7f020086
- public const int tooltip_frame_light = 2130837638;
+ // aapt resource value: 0x7F070088
+ public const int tooltip_frame_light = 2131165320;
static Drawable()
{
@@ -2528,539 +2528,539 @@
public partial class Id
{
- // aapt resource value: 0x7f080024
- public const int ALT = 2131230756;
+ // aapt resource value: 0x7F08000E
+ public const int action0 = 2131230734;
- // aapt resource value: 0x7f080025
- public const int CTRL = 2131230757;
+ // aapt resource value: 0x7F080020
+ public const int actions = 2131230752;
- // aapt resource value: 0x7f08003a
- public const int FILL = 2131230778;
+ // aapt resource value: 0x7F08000F
+ public const int action_bar = 2131230735;
- // aapt resource value: 0x7f08003b
- public const int FILL_STROKE = 2131230779;
+ // aapt resource value: 0x7F080010
+ public const int action_bar_activity_content = 2131230736;
- // aapt resource value: 0x7f080026
- public const int FUNCTION = 2131230758;
+ // aapt resource value: 0x7F080011
+ public const int action_bar_container = 2131230737;
- // aapt resource value: 0x7f080035
- public const int FixedBehind = 2131230773;
+ // aapt resource value: 0x7F080012
+ public const int action_bar_root = 2131230738;
- // aapt resource value: 0x7f080036
- public const int FixedFront = 2131230774;
+ // aapt resource value: 0x7F080013
+ public const int action_bar_spinner = 2131230739;
- // aapt resource value: 0x7f080027
- public const int META = 2131230759;
+ // aapt resource value: 0x7F080014
+ public const int action_bar_subtitle = 2131230740;
- // aapt resource value: 0x7f080037
- public const int MatchLayout = 2131230775;
+ // aapt resource value: 0x7F080015
+ public const int action_bar_title = 2131230741;
- // aapt resource value: 0x7f080028
- public const int SHIFT = 2131230760;
+ // aapt resource value: 0x7F080016
+ public const int action_container = 2131230742;
- // aapt resource value: 0x7f08003c
- public const int STROKE = 2131230780;
+ // aapt resource value: 0x7F080017
+ public const int action_context_bar = 2131230743;
- // aapt resource value: 0x7f080029
- public const int SYM = 2131230761;
+ // aapt resource value: 0x7F080018
+ public const int action_divider = 2131230744;
- // aapt resource value: 0x7f080038
- public const int Scale = 2131230776;
+ // aapt resource value: 0x7F080019
+ public const int action_image = 2131230745;
- // aapt resource value: 0x7f080039
- public const int Translate = 2131230777;
+ // aapt resource value: 0x7F08001A
+ public const int action_menu_divider = 2131230746;
- // aapt resource value: 0x7f08009b
- public const int action0 = 2131230875;
+ // aapt resource value: 0x7F08001B
+ public const int action_menu_presenter = 2131230747;
- // aapt resource value: 0x7f080062
- public const int action_bar = 2131230818;
+ // aapt resource value: 0x7F08001C
+ public const int action_mode_bar = 2131230748;
- // aapt resource value: 0x7f080001
- public const int action_bar_activity_content = 2131230721;
+ // aapt resource value: 0x7F08001D
+ public const int action_mode_bar_stub = 2131230749;
- // aapt resource value: 0x7f080061
- public const int action_bar_container = 2131230817;
+ // aapt resource value: 0x7F08001E
+ public const int action_mode_close_button = 2131230750;
- // aapt resource value: 0x7f08005d
- public const int action_bar_root = 2131230813;
+ // aapt resource value: 0x7F08001F
+ public const int action_text = 2131230751;
- // aapt resource value: 0x7f080002
- public const int action_bar_spinner = 2131230722;
+ // aapt resource value: 0x7F080021
+ public const int activity_chooser_view_content = 2131230753;
- // aapt resource value: 0x7f080041
- public const int action_bar_subtitle = 2131230785;
+ // aapt resource value: 0x7F080022
+ public const int add = 2131230754;
- // aapt resource value: 0x7f080040
- public const int action_bar_title = 2131230784;
+ // aapt resource value: 0x7F080023
+ public const int alertTitle = 2131230755;
- // aapt resource value: 0x7f080098
- public const int action_container = 2131230872;
+ // aapt resource value: 0x7F080000
+ public const int ALT = 2131230720;
- // aapt resource value: 0x7f080063
- public const int action_context_bar = 2131230819;
+ // aapt resource value: 0x7F080024
+ public const int always = 2131230756;
- // aapt resource value: 0x7f08009f
- public const int action_divider = 2131230879;
+ // aapt resource value: 0x7F080025
+ public const int async = 2131230757;
- // aapt resource value: 0x7f080099
- public const int action_image = 2131230873;
+ // aapt resource value: 0x7F080026
+ public const int beginning = 2131230758;
- // aapt resource value: 0x7f080003
- public const int action_menu_divider = 2131230723;
+ // aapt resource value: 0x7F080027
+ public const int blocking = 2131230759;
- // aapt resource value: 0x7f080004
- public const int action_menu_presenter = 2131230724;
+ // aapt resource value: 0x7F080028
+ public const int bottom = 2131230760;
- // aapt resource value: 0x7f08005f
- public const int action_mode_bar = 2131230815;
+ // aapt resource value: 0x7F080029
+ public const int btnCancel = 2131230761;
- // aapt resource value: 0x7f08005e
- public const int action_mode_bar_stub = 2131230814;
+ // aapt resource value: 0x7F08002A
+ public const int btnSubmit = 2131230762;
- // aapt resource value: 0x7f080042
- public const int action_mode_close_button = 2131230786;
+ // aapt resource value: 0x7F08002B
+ public const int buttonPanel = 2131230763;
- // aapt resource value: 0x7f08009a
- public const int action_text = 2131230874;
+ // aapt resource value: 0x7F08002C
+ public const int cancel_action = 2131230764;
- // aapt resource value: 0x7f0800a8
- public const int actions = 2131230888;
+ // aapt resource value: 0x7F08002D
+ public const int center = 2131230765;
- // aapt resource value: 0x7f080043
- public const int activity_chooser_view_content = 2131230787;
+ // aapt resource value: 0x7F08002E
+ public const int checkbox = 2131230766;
- // aapt resource value: 0x7f08001e
- public const int add = 2131230750;
+ // aapt resource value: 0x7F08002F
+ public const int chronometer = 2131230767;
- // aapt resource value: 0x7f080056
- public const int alertTitle = 2131230806;
+ // aapt resource value: 0x7F080030
+ public const int collapseActionView = 2131230768;
- // aapt resource value: 0x7f08002a
- public const int always = 2131230762;
+ // aapt resource value: 0x7F080031
+ public const int contentFrame = 2131230769;
- // aapt resource value: 0x7f080031
- public const int async = 2131230769;
+ // aapt resource value: 0x7F080032
+ public const int contentPanel = 2131230770;
- // aapt resource value: 0x7f080021
- public const int beginning = 2131230753;
+ // aapt resource value: 0x7F080033
+ public const int content_container = 2131230771;
- // aapt resource value: 0x7f080032
- public const int blocking = 2131230770;
+ // aapt resource value: 0x7F080001
+ public const int CTRL = 2131230721;
- // aapt resource value: 0x7f08002f
- public const int bottom = 2131230767;
+ // aapt resource value: 0x7F080034
+ public const int custom = 2131230772;
- // aapt resource value: 0x7f080083
- public const int btnCancel = 2131230851;
+ // aapt resource value: 0x7F080035
+ public const int customPanel = 2131230773;
- // aapt resource value: 0x7f080085
- public const int btnSubmit = 2131230853;
+ // aapt resource value: 0x7F080036
+ public const int day = 2131230774;
- // aapt resource value: 0x7f080049
- public const int buttonPanel = 2131230793;
+ // aapt resource value: 0x7F080037
+ public const int decor_content_parent = 2131230775;
- // aapt resource value: 0x7f08009c
- public const int cancel_action = 2131230876;
+ // aapt resource value: 0x7F080038
+ public const int default_activity_button = 2131230776;
- // aapt resource value: 0x7f08003d
- public const int center = 2131230781;
+ // aapt resource value: 0x7F080039
+ public const int description = 2131230777;
- // aapt resource value: 0x7f080059
- public const int checkbox = 2131230809;
+ // aapt resource value: 0x7F08003A
+ public const int disableHome = 2131230778;
- // aapt resource value: 0x7f0800a4
- public const int chronometer = 2131230884;
+ // aapt resource value: 0x7F08003B
+ public const int edit_query = 2131230779;
- // aapt resource value: 0x7f08002b
- public const int collapseActionView = 2131230763;
+ // aapt resource value: 0x7F08003C
+ public const int end = 2131230780;
- // aapt resource value: 0x7f0800b1
- public const int contentFrame = 2131230897;
+ // aapt resource value: 0x7F08003D
+ public const int end_padder = 2131230781;
- // aapt resource value: 0x7f08004c
- public const int contentPanel = 2131230796;
+ // aapt resource value: 0x7F08003F
+ public const int expanded_menu = 2131230783;
- // aapt resource value: 0x7f080087
- public const int content_container = 2131230855;
+ // aapt resource value: 0x7F08003E
+ public const int expand_activities_button = 2131230782;
- // aapt resource value: 0x7f080053
- public const int custom = 2131230803;
+ // aapt resource value: 0x7F080002
+ public const int FILL = 2131230722;
- // aapt resource value: 0x7f080052
- public const int customPanel = 2131230802;
+ // aapt resource value: 0x7F080003
+ public const int FILL_STROKE = 2131230723;
- // aapt resource value: 0x7f080093
- public const int day = 2131230867;
+ // aapt resource value: 0x7F080040
+ public const int fingerprint_icon = 2131230784;
- // aapt resource value: 0x7f080060
- public const int decor_content_parent = 2131230816;
+ // aapt resource value: 0x7F080005
+ public const int FixedBehind = 2131230725;
- // aapt resource value: 0x7f080046
- public const int default_activity_button = 2131230790;
+ // aapt resource value: 0x7F080006
+ public const int FixedFront = 2131230726;
- // aapt resource value: 0x7f080072
- public const int description = 2131230834;
+ // aapt resource value: 0x7F080041
+ public const int forever = 2131230785;
- // aapt resource value: 0x7f080012
- public const int disableHome = 2131230738;
+ // aapt resource value: 0x7F080004
+ public const int FUNCTION = 2131230724;
- // aapt resource value: 0x7f080064
- public const int edit_query = 2131230820;
+ // aapt resource value: 0x7F080042
+ public const int gd_btn_back = 2131230786;
- // aapt resource value: 0x7f080022
- public const int end = 2131230754;
+ // aapt resource value: 0x7F080043
+ public const int gd_btn_myLocation = 2131230787;
- // aapt resource value: 0x7f0800aa
- public const int end_padder = 2131230890;
+ // aapt resource value: 0x7F080044
+ public const int gd_btn_save = 2131230788;
- // aapt resource value: 0x7f080044
- public const int expand_activities_button = 2131230788;
+ // aapt resource value: 0x7F080045
+ public const int gd_img_search_delete = 2131230789;
- // aapt resource value: 0x7f080058
- public const int expanded_menu = 2131230808;
+ // aapt resource value: 0x7F080046
+ public const int gd_ll_myhome = 2131230790;
- // aapt resource value: 0x7f080073
- public const int fingerprint_icon = 2131230835;
+ // aapt resource value: 0x7F080047
+ public const int gd_ll_search = 2131230791;
- // aapt resource value: 0x7f080033
- public const int forever = 2131230771;
+ // aapt resource value: 0x7F080048
+ public const int gd_mapView = 2131230792;
- // aapt resource value: 0x7f080078
- public const int gd_btn_back = 2131230840;
+ // aapt resource value: 0x7F080049
+ public const int gd_rl_topview = 2131230793;
- // aapt resource value: 0x7f080081
- public const int gd_btn_myLocation = 2131230849;
+ // aapt resource value: 0x7F08004A
+ public const int gd_tv_activity_title = 2131230794;
- // aapt resource value: 0x7f080080
- public const int gd_btn_save = 2131230848;
+ // aapt resource value: 0x7F08004B
+ public const int gd_tv_radius = 2131230795;
- // aapt resource value: 0x7f08007d
- public const int gd_img_search_delete = 2131230845;
+ // aapt resource value: 0x7F08004C
+ public const int gd_tv_search_title = 2131230796;
- // aapt resource value: 0x7f08007f
- public const int gd_ll_myhome = 2131230847;
+ // aapt resource value: 0x7F08004D
+ public const int hdl_gallery_rootView = 2131230797;
- // aapt resource value: 0x7f08007b
- public const int gd_ll_search = 2131230843;
+ // aapt resource value: 0x7F08004E
+ public const int hdl_gallery_viewPager = 2131230798;
- // aapt resource value: 0x7f08007a
- public const int gd_mapView = 2131230842;
+ // aapt resource value: 0x7F08004F
+ public const int hdl_options1 = 2131230799;
- // aapt resource value: 0x7f080077
- public const int gd_rl_topview = 2131230839;
+ // aapt resource value: 0x7F080050
+ public const int hdl_options2 = 2131230800;
- // aapt resource value: 0x7f080079
- public const int gd_tv_activity_title = 2131230841;
+ // aapt resource value: 0x7F080051
+ public const int hdl_options3 = 2131230801;
- // aapt resource value: 0x7f08007e
- public const int gd_tv_radius = 2131230846;
+ // aapt resource value: 0x7F080052
+ public const int hdl_pickerview_ll = 2131230802;
- // aapt resource value: 0x7f08007c
- public const int gd_tv_search_title = 2131230844;
+ // aapt resource value: 0x7F080053
+ public const int home = 2131230803;
- // aapt resource value: 0x7f080075
- public const int hdl_gallery_rootView = 2131230837;
+ // aapt resource value: 0x7F080054
+ public const int homeAsUp = 2131230804;
- // aapt resource value: 0x7f080076
- public const int hdl_gallery_viewPager = 2131230838;
+ // aapt resource value: 0x7F080055
+ public const int hour = 2131230805;
- // aapt resource value: 0x7f080089
- public const int hdl_options1 = 2131230857;
+ // aapt resource value: 0x7F080056
+ public const int icon = 2131230806;
- // aapt resource value: 0x7f08008a
- public const int hdl_options2 = 2131230858;
+ // aapt resource value: 0x7F080057
+ public const int icon_group = 2131230807;
- // aapt resource value: 0x7f08008b
- public const int hdl_options3 = 2131230859;
+ // aapt resource value: 0x7F080058
+ public const int ifRoom = 2131230808;
- // aapt resource value: 0x7f080088
- public const int hdl_pickerview_ll = 2131230856;
+ // aapt resource value: 0x7F080059
+ public const int image = 2131230809;
- // aapt resource value: 0x7f080005
- public const int home = 2131230725;
+ // aapt resource value: 0x7F08005A
+ public const int info = 2131230810;
- // aapt resource value: 0x7f080013
- public const int homeAsUp = 2131230739;
+ // aapt resource value: 0x7F08005B
+ public const int italic = 2131230811;
- // aapt resource value: 0x7f080094
- public const int hour = 2131230868;
+ // aapt resource value: 0x7F08005C
+ public const int item_touch_helper_previous_elevation = 2131230812;
- // aapt resource value: 0x7f080048
- public const int icon = 2131230792;
+ // aapt resource value: 0x7F08005D
+ public const int left = 2131230813;
- // aapt resource value: 0x7f0800a9
- public const int icon_group = 2131230889;
+ // aapt resource value: 0x7F08005E
+ public const int line1 = 2131230814;
- // aapt resource value: 0x7f08002c
- public const int ifRoom = 2131230764;
+ // aapt resource value: 0x7F08005F
+ public const int line3 = 2131230815;
- // aapt resource value: 0x7f080045
- public const int image = 2131230789;
+ // aapt resource value: 0x7F080060
+ public const int listMode = 2131230816;
- // aapt resource value: 0x7f0800a5
- public const int info = 2131230885;
+ // aapt resource value: 0x7F080061
+ public const int list_item = 2131230817;
- // aapt resource value: 0x7f080034
- public const int italic = 2131230772;
+ // aapt resource value: 0x7F080008
+ public const int MatchLayout = 2131230728;
- // aapt resource value: 0x7f080000
- public const int item_touch_helper_previous_elevation = 2131230720;
+ // aapt resource value: 0x7F080062
+ public const int media_actions = 2131230818;
- // aapt resource value: 0x7f08003e
- public const int left = 2131230782;
+ // aapt resource value: 0x7F080063
+ public const int message = 2131230819;
- // aapt resource value: 0x7f08000a
- public const int line1 = 2131230730;
+ // aapt resource value: 0x7F080007
+ public const int META = 2131230727;
- // aapt resource value: 0x7f08000b
- public const int line3 = 2131230731;
+ // aapt resource value: 0x7F080064
+ public const int middle = 2131230820;
- // aapt resource value: 0x7f08000f
- public const int listMode = 2131230735;
+ // aapt resource value: 0x7F080065
+ public const int min = 2131230821;
- // aapt resource value: 0x7f080047
- public const int list_item = 2131230791;
+ // aapt resource value: 0x7F080066
+ public const int month = 2131230822;
- // aapt resource value: 0x7f08009e
- public const int media_actions = 2131230878;
+ // aapt resource value: 0x7F080067
+ public const int multiply = 2131230823;
- // aapt resource value: 0x7f0800b0
- public const int message = 2131230896;
+ // aapt resource value: 0x7F080068
+ public const int myButton = 2131230824;
- // aapt resource value: 0x7f080023
- public const int middle = 2131230755;
+ // aapt resource value: 0x7F080069
+ public const int never = 2131230825;
- // aapt resource value: 0x7f080095
- public const int min = 2131230869;
+ // aapt resource value: 0x7F08006A
+ public const int none = 2131230826;
- // aapt resource value: 0x7f080092
- public const int month = 2131230866;
+ // aapt resource value: 0x7F08006B
+ public const int normal = 2131230827;
- // aapt resource value: 0x7f080019
- public const int multiply = 2131230745;
+ // aapt resource value: 0x7F08006C
+ public const int notification_background = 2131230828;
- // aapt resource value: 0x7f080097
- public const int myButton = 2131230871;
+ // aapt resource value: 0x7F08006D
+ public const int notification_main_column = 2131230829;
- // aapt resource value: 0x7f08002d
- public const int never = 2131230765;
+ // aapt resource value: 0x7F08006E
+ public const int notification_main_column_container = 2131230830;
- // aapt resource value: 0x7f080014
- public const int none = 2131230740;
+ // aapt resource value: 0x7F08006F
+ public const int options1 = 2131230831;
- // aapt resource value: 0x7f080010
- public const int normal = 2131230736;
+ // aapt resource value: 0x7F080070
+ public const int options2 = 2131230832;
- // aapt resource value: 0x7f0800a7
- public const int notification_background = 2131230887;
+ // aapt resource value: 0x7F080071
+ public const int options3 = 2131230833;
- // aapt resource value: 0x7f0800a1
- public const int notification_main_column = 2131230881;
+ // aapt resource value: 0x7F080072
+ public const int optionspicker = 2131230834;
- // aapt resource value: 0x7f0800a0
- public const int notification_main_column_container = 2131230880;
+ // aapt resource value: 0x7F080073
+ public const int outmost_container = 2131230835;
- // aapt resource value: 0x7f08008d
- public const int options1 = 2131230861;
+ // aapt resource value: 0x7F080074
+ public const int parentPanel = 2131230836;
- // aapt resource value: 0x7f08008e
- public const int options2 = 2131230862;
+ // aapt resource value: 0x7F080075
+ public const int progress_circular = 2131230837;
- // aapt resource value: 0x7f08008f
- public const int options3 = 2131230863;
+ // aapt resource value: 0x7F080076
+ public const int progress_horizontal = 2131230838;
- // aapt resource value: 0x7f08008c
- public const int optionspicker = 2131230860;
+ // aapt resource value: 0x7F080077
+ public const int radio = 2131230839;
- // aapt resource value: 0x7f080086
- public const int outmost_container = 2131230854;
+ // aapt resource value: 0x7F080078
+ public const int right = 2131230840;
- // aapt resource value: 0x7f08004b
- public const int parentPanel = 2131230795;
+ // aapt resource value: 0x7F080079
+ public const int right_icon = 2131230841;
- // aapt resource value: 0x7f080006
- public const int progress_circular = 2131230726;
+ // aapt resource value: 0x7F08007A
+ public const int right_side = 2131230842;
- // aapt resource value: 0x7f080007
- public const int progress_horizontal = 2131230727;
+ // aapt resource value: 0x7F08007B
+ public const int rv_topbar = 2131230843;
- // aapt resource value: 0x7f08005b
- public const int radio = 2131230811;
+ // aapt resource value: 0x7F08000C
+ public const int Scale = 2131230732;
- // aapt resource value: 0x7f08003f
- public const int right = 2131230783;
+ // aapt resource value: 0x7F08007C
+ public const int screen = 2131230844;
- // aapt resource value: 0x7f0800a6
- public const int right_icon = 2131230886;
+ // aapt resource value: 0x7F08007D
+ public const int scrollIndicatorDown = 2131230845;
- // aapt resource value: 0x7f0800a2
- public const int right_side = 2131230882;
+ // aapt resource value: 0x7F08007E
+ public const int scrollIndicatorUp = 2131230846;
- // aapt resource value: 0x7f080082
- public const int rv_topbar = 2131230850;
+ // aapt resource value: 0x7F08007F
+ public const int scrollView = 2131230847;
- // aapt resource value: 0x7f08001a
- public const int screen = 2131230746;
+ // aapt resource value: 0x7F080080
+ public const int search_badge = 2131230848;
- // aapt resource value: 0x7f080051
- public const int scrollIndicatorDown = 2131230801;
+ // aapt resource value: 0x7F080081
+ public const int search_bar = 2131230849;
- // aapt resource value: 0x7f08004d
- public const int scrollIndicatorUp = 2131230797;
+ // aapt resource value: 0x7F080082
+ public const int search_button = 2131230850;
- // aapt resource value: 0x7f08004e
- public const int scrollView = 2131230798;
+ // aapt resource value: 0x7F080083
+ public const int search_close_btn = 2131230851;
- // aapt resource value: 0x7f080066
- public const int search_badge = 2131230822;
+ // aapt resource value: 0x7F080084
+ public const int search_edit_frame = 2131230852;
- // aapt resource value: 0x7f080065
- public const int search_bar = 2131230821;
+ // aapt resource value: 0x7F080085
+ public const int search_go_btn = 2131230853;
- // aapt resource value: 0x7f080067
- public const int search_button = 2131230823;
+ // aapt resource value: 0x7F080086
+ public const int search_mag_icon = 2131230854;
- // aapt resource value: 0x7f08006c
- public const int search_close_btn = 2131230828;
+ // aapt resource value: 0x7F080087
+ public const int search_plate = 2131230855;
- // aapt resource value: 0x7f080068
- public const int search_edit_frame = 2131230824;
+ // aapt resource value: 0x7F080088
+ public const int search_src_text = 2131230856;
- // aapt resource value: 0x7f08006e
- public const int search_go_btn = 2131230830;
+ // aapt resource value: 0x7F080089
+ public const int search_voice_btn = 2131230857;
- // aapt resource value: 0x7f080069
- public const int search_mag_icon = 2131230825;
+ // aapt resource value: 0x7F08008A
+ public const int second = 2131230858;
- // aapt resource value: 0x7f08006a
- public const int search_plate = 2131230826;
+ // aapt resource value: 0x7F08008B
+ public const int select_dialog_listview = 2131230859;
- // aapt resource value: 0x7f08006b
- public const int search_src_text = 2131230827;
+ // aapt resource value: 0x7F080009
+ public const int SHIFT = 2131230729;
- // aapt resource value: 0x7f08006f
- public const int search_voice_btn = 2131230831;
+ // aapt resource value: 0x7F08008C
+ public const int shortcut = 2131230860;
- // aapt resource value: 0x7f080096
- public const int second = 2131230870;
+ // aapt resource value: 0x7F08008D
+ public const int showCustom = 2131230861;
- // aapt resource value: 0x7f080070
- public const int select_dialog_listview = 2131230832;
+ // aapt resource value: 0x7F08008E
+ public const int showHome = 2131230862;
- // aapt resource value: 0x7f08005a
- public const int shortcut = 2131230810;
+ // aapt resource value: 0x7F08008F
+ public const int showTitle = 2131230863;
- // aapt resource value: 0x7f080015
- public const int showCustom = 2131230741;
+ // aapt resource value: 0x7F080090
+ public const int spacer = 2131230864;
- // aapt resource value: 0x7f080016
- public const int showHome = 2131230742;
+ // aapt resource value: 0x7F080091
+ public const int split_action_bar = 2131230865;
- // aapt resource value: 0x7f080017
- public const int showTitle = 2131230743;
+ // aapt resource value: 0x7F080092
+ public const int src_atop = 2131230866;
- // aapt resource value: 0x7f08004a
- public const int spacer = 2131230794;
+ // aapt resource value: 0x7F080093
+ public const int src_in = 2131230867;
- // aapt resource value: 0x7f080008
- public const int split_action_bar = 2131230728;
+ // aapt resource value: 0x7F080094
+ public const int src_over = 2131230868;
- // aapt resource value: 0x7f08001b
- public const int src_atop = 2131230747;
+ // aapt resource value: 0x7F080095
+ public const int srl_classics_arrow = 2131230869;
- // aapt resource value: 0x7f08001c
- public const int src_in = 2131230748;
+ // aapt resource value: 0x7F080096
+ public const int srl_classics_center = 2131230870;
- // aapt resource value: 0x7f08001d
- public const int src_over = 2131230749;
+ // aapt resource value: 0x7F080097
+ public const int srl_classics_progress = 2131230871;
- // aapt resource value: 0x7f0800ab
- public const int srl_classics_arrow = 2131230891;
+ // aapt resource value: 0x7F080098
+ public const int srl_classics_title = 2131230872;
- // aapt resource value: 0x7f0800ae
- public const int srl_classics_center = 2131230894;
+ // aapt resource value: 0x7F080099
+ public const int srl_classics_update = 2131230873;
- // aapt resource value: 0x7f0800ad
- public const int srl_classics_progress = 2131230893;
+ // aapt resource value: 0x7F08009A
+ public const int status = 2131230874;
- // aapt resource value: 0x7f0800ac
- public const int srl_classics_title = 2131230892;
+ // aapt resource value: 0x7F08009B
+ public const int status_bar_latest_event_content = 2131230875;
- // aapt resource value: 0x7f0800af
- public const int srl_classics_update = 2131230895;
+ // aapt resource value: 0x7F08000A
+ public const int STROKE = 2131230730;
- // aapt resource value: 0x7f080074
- public const int status = 2131230836;
+ // aapt resource value: 0x7F08009C
+ public const int submenuarrow = 2131230876;
- // aapt resource value: 0x7f08009d
- public const int status_bar_latest_event_content = 2131230877;
+ // aapt resource value: 0x7F08009D
+ public const int submit_area = 2131230877;
- // aapt resource value: 0x7f08005c
- public const int submenuarrow = 2131230812;
+ // aapt resource value: 0x7F08009E
+ public const int subtitle = 2131230878;
- // aapt resource value: 0x7f08006d
- public const int submit_area = 2131230829;
+ // aapt resource value: 0x7F08000B
+ public const int SYM = 2131230731;
- // aapt resource value: 0x7f080071
- public const int subtitle = 2131230833;
+ // aapt resource value: 0x7F08009F
+ public const int tabMode = 2131230879;
- // aapt resource value: 0x7f080011
- public const int tabMode = 2131230737;
+ // aapt resource value: 0x7F0800A0
+ public const int text = 2131230880;
- // aapt resource value: 0x7f08000c
- public const int text = 2131230732;
+ // aapt resource value: 0x7F0800A1
+ public const int text2 = 2131230881;
- // aapt resource value: 0x7f08000d
- public const int text2 = 2131230733;
+ // aapt resource value: 0x7F0800A2
+ public const int textSpacerNoButtons = 2131230882;
- // aapt resource value: 0x7f080050
- public const int textSpacerNoButtons = 2131230800;
+ // aapt resource value: 0x7F0800A3
+ public const int textSpacerNoTitle = 2131230883;
- // aapt resource value: 0x7f08004f
- public const int textSpacerNoTitle = 2131230799;
+ // aapt resource value: 0x7F0800A4
+ public const int time = 2131230884;
- // aapt resource value: 0x7f0800a3
- public const int time = 2131230883;
+ // aapt resource value: 0x7F0800A5
+ public const int timepicker = 2131230885;
- // aapt resource value: 0x7f080090
- public const int timepicker = 2131230864;
+ // aapt resource value: 0x7F0800A6
+ public const int title = 2131230886;
- // aapt resource value: 0x7f08000e
- public const int title = 2131230734;
+ // aapt resource value: 0x7F0800A7
+ public const int titleDividerNoCustom = 2131230887;
- // aapt resource value: 0x7f080057
- public const int titleDividerNoCustom = 2131230807;
+ // aapt resource value: 0x7F0800A8
+ public const int title_template = 2131230888;
- // aapt resource value: 0x7f080055
- public const int title_template = 2131230805;
+ // aapt resource value: 0x7F0800A9
+ public const int top = 2131230889;
- // aapt resource value: 0x7f080030
- public const int top = 2131230768;
+ // aapt resource value: 0x7F0800AA
+ public const int topPanel = 2131230890;
- // aapt resource value: 0x7f080054
- public const int topPanel = 2131230804;
+ // aapt resource value: 0x7F08000D
+ public const int Translate = 2131230733;
- // aapt resource value: 0x7f080084
- public const int tvTitle = 2131230852;
+ // aapt resource value: 0x7F0800AB
+ public const int tvTitle = 2131230891;
- // aapt resource value: 0x7f08001f
- public const int uniform = 2131230751;
+ // aapt resource value: 0x7F0800AC
+ public const int uniform = 2131230892;
- // aapt resource value: 0x7f080009
- public const int up = 2131230729;
+ // aapt resource value: 0x7F0800AD
+ public const int up = 2131230893;
- // aapt resource value: 0x7f080018
- public const int useLogo = 2131230744;
+ // aapt resource value: 0x7F0800AE
+ public const int useLogo = 2131230894;
- // aapt resource value: 0x7f08002e
- public const int withText = 2131230766;
+ // aapt resource value: 0x7F0800AF
+ public const int withText = 2131230895;
- // aapt resource value: 0x7f080020
- public const int wrap_content = 2131230752;
+ // aapt resource value: 0x7F0800B0
+ public const int wrap_content = 2131230896;
- // aapt resource value: 0x7f080091
- public const int year = 2131230865;
+ // aapt resource value: 0x7F0800B1
+ public const int year = 2131230897;
static Id()
{
@@ -3075,23 +3075,23 @@
public partial class Integer
{
- // aapt resource value: 0x7f0d0000
- public const int abc_config_activityDefaultDur = 2131558400;
+ // aapt resource value: 0x7F090000
+ public const int abc_config_activityDefaultDur = 2131296256;
- // aapt resource value: 0x7f0d0001
- public const int abc_config_activityShortDur = 2131558401;
+ // aapt resource value: 0x7F090001
+ public const int abc_config_activityShortDur = 2131296257;
- // aapt resource value: 0x7f0d0005
- public const int animation_default_duration = 2131558405;
+ // aapt resource value: 0x7F090002
+ public const int animation_default_duration = 2131296258;
- // aapt resource value: 0x7f0d0002
- public const int cancel_button_image_alpha = 2131558402;
+ // aapt resource value: 0x7F090003
+ public const int cancel_button_image_alpha = 2131296259;
- // aapt resource value: 0x7f0d0003
- public const int config_tooltipAnimTime = 2131558403;
+ // aapt resource value: 0x7F090004
+ public const int config_tooltipAnimTime = 2131296260;
- // aapt resource value: 0x7f0d0004
- public const int status_bar_notification_info_maxnum = 2131558404;
+ // aapt resource value: 0x7F090005
+ public const int status_bar_notification_info_maxnum = 2131296261;
static Integer()
{
@@ -3106,191 +3106,191 @@
public partial class Layout
{
- // aapt resource value: 0x7f040000
- public const int abc_action_bar_title_item = 2130968576;
+ // aapt resource value: 0x7F0A0000
+ public const int abc_action_bar_title_item = 2131361792;
- // aapt resource value: 0x7f040001
- public const int abc_action_bar_up_container = 2130968577;
+ // aapt resource value: 0x7F0A0001
+ public const int abc_action_bar_up_container = 2131361793;
- // aapt resource value: 0x7f040002
- public const int abc_action_bar_view_list_nav_layout = 2130968578;
+ // aapt resource value: 0x7F0A0002
+ public const int abc_action_bar_view_list_nav_layout = 2131361794;
- // aapt resource value: 0x7f040003
- public const int abc_action_menu_item_layout = 2130968579;
+ // aapt resource value: 0x7F0A0003
+ public const int abc_action_menu_item_layout = 2131361795;
- // aapt resource value: 0x7f040004
- public const int abc_action_menu_layout = 2130968580;
+ // aapt resource value: 0x7F0A0004
+ public const int abc_action_menu_layout = 2131361796;
- // aapt resource value: 0x7f040005
- public const int abc_action_mode_bar = 2130968581;
+ // aapt resource value: 0x7F0A0005
+ public const int abc_action_mode_bar = 2131361797;
- // aapt resource value: 0x7f040006
- public const int abc_action_mode_close_item_material = 2130968582;
+ // aapt resource value: 0x7F0A0006
+ public const int abc_action_mode_close_item_material = 2131361798;
- // aapt resource value: 0x7f040007
- public const int abc_activity_chooser_view = 2130968583;
+ // aapt resource value: 0x7F0A0007
+ public const int abc_activity_chooser_view = 2131361799;
- // aapt resource value: 0x7f040008
- public const int abc_activity_chooser_view_list_item = 2130968584;
+ // aapt resource value: 0x7F0A0008
+ public const int abc_activity_chooser_view_list_item = 2131361800;
- // aapt resource value: 0x7f040009
- public const int abc_alert_dialog_button_bar_material = 2130968585;
+ // aapt resource value: 0x7F0A0009
+ public const int abc_alert_dialog_button_bar_material = 2131361801;
- // aapt resource value: 0x7f04000a
- public const int abc_alert_dialog_material = 2130968586;
+ // aapt resource value: 0x7F0A000A
+ public const int abc_alert_dialog_material = 2131361802;
- // aapt resource value: 0x7f04000b
- public const int abc_alert_dialog_title_material = 2130968587;
+ // aapt resource value: 0x7F0A000B
+ public const int abc_alert_dialog_title_material = 2131361803;
- // aapt resource value: 0x7f04000c
- public const int abc_dialog_title_material = 2130968588;
+ // aapt resource value: 0x7F0A000C
+ public const int abc_dialog_title_material = 2131361804;
- // aapt resource value: 0x7f04000d
- public const int abc_expanded_menu_layout = 2130968589;
+ // aapt resource value: 0x7F0A000D
+ public const int abc_expanded_menu_layout = 2131361805;
- // aapt resource value: 0x7f04000e
- public const int abc_list_menu_item_checkbox = 2130968590;
+ // aapt resource value: 0x7F0A000E
+ public const int abc_list_menu_item_checkbox = 2131361806;
- // aapt resource value: 0x7f04000f
- public const int abc_list_menu_item_icon = 2130968591;
+ // aapt resource value: 0x7F0A000F
+ public const int abc_list_menu_item_icon = 2131361807;
- // aapt resource value: 0x7f040010
- public const int abc_list_menu_item_layout = 2130968592;
+ // aapt resource value: 0x7F0A0010
+ public const int abc_list_menu_item_layout = 2131361808;
- // aapt resource value: 0x7f040011
- public const int abc_list_menu_item_radio = 2130968593;
+ // aapt resource value: 0x7F0A0011
+ public const int abc_list_menu_item_radio = 2131361809;
- // aapt resource value: 0x7f040012
- public const int abc_popup_menu_header_item_layout = 2130968594;
+ // aapt resource value: 0x7F0A0012
+ public const int abc_popup_menu_header_item_layout = 2131361810;
- // aapt resource value: 0x7f040013
- public const int abc_popup_menu_item_layout = 2130968595;
+ // aapt resource value: 0x7F0A0013
+ public const int abc_popup_menu_item_layout = 2131361811;
- // aapt resource value: 0x7f040014
- public const int abc_screen_content_include = 2130968596;
+ // aapt resource value: 0x7F0A0014
+ public const int abc_screen_content_include = 2131361812;
- // aapt resource value: 0x7f040015
- public const int abc_screen_simple = 2130968597;
+ // aapt resource value: 0x7F0A0015
+ public const int abc_screen_simple = 2131361813;
- // aapt resource value: 0x7f040016
- public const int abc_screen_simple_overlay_action_mode = 2130968598;
+ // aapt resource value: 0x7F0A0016
+ public const int abc_screen_simple_overlay_action_mode = 2131361814;
- // aapt resource value: 0x7f040017
- public const int abc_screen_toolbar = 2130968599;
+ // aapt resource value: 0x7F0A0017
+ public const int abc_screen_toolbar = 2131361815;
- // aapt resource value: 0x7f040018
- public const int abc_search_dropdown_item_icons_2line = 2130968600;
+ // aapt resource value: 0x7F0A0018
+ public const int abc_search_dropdown_item_icons_2line = 2131361816;
- // aapt resource value: 0x7f040019
- public const int abc_search_view = 2130968601;
+ // aapt resource value: 0x7F0A0019
+ public const int abc_search_view = 2131361817;
- // aapt resource value: 0x7f04001a
- public const int abc_select_dialog_material = 2130968602;
+ // aapt resource value: 0x7F0A001A
+ public const int abc_select_dialog_material = 2131361818;
- // aapt resource value: 0x7f04001b
- public const int biometric_prompt_dialog_content = 2130968603;
+ // aapt resource value: 0x7F0A001B
+ public const int biometric_prompt_dialog_content = 2131361819;
- // aapt resource value: 0x7f04001c
- public const int hdl_gallery_banner_view_layout = 2130968604;
+ // aapt resource value: 0x7F0A001C
+ public const int hdl_gallery_banner_view_layout = 2131361820;
- // aapt resource value: 0x7f04001d
- public const int hdl_widget_activity_crop_image = 2130968605;
+ // aapt resource value: 0x7F0A001D
+ public const int hdl_widget_activity_crop_image = 2131361821;
- // aapt resource value: 0x7f04001e
- public const int hdl_widget_activity_geofence_round = 2130968606;
+ // aapt resource value: 0x7F0A001E
+ public const int hdl_widget_activity_geofence_round = 2131361822;
- // aapt resource value: 0x7f04001f
- public const int hdl_widget_air_button = 2130968607;
+ // aapt resource value: 0x7F0A001F
+ public const int hdl_widget_air_button = 2131361823;
- // aapt resource value: 0x7f040020
- public const int hdl_widget_include_pickerview_topbar = 2130968608;
+ // aapt resource value: 0x7F0A0020
+ public const int hdl_widget_include_pickerview_topbar = 2131361824;
- // aapt resource value: 0x7f040021
- public const int hdl_widget_layout_basepickerview = 2130968609;
+ // aapt resource value: 0x7F0A0021
+ public const int hdl_widget_layout_basepickerview = 2131361825;
- // aapt resource value: 0x7f040022
- public const int hdl_widget_pickerview = 2130968610;
+ // aapt resource value: 0x7F0A0022
+ public const int hdl_widget_pickerview = 2131361826;
- // aapt resource value: 0x7f040023
- public const int hdl_widget_pickerview_options = 2130968611;
+ // aapt resource value: 0x7F0A0023
+ public const int hdl_widget_pickerview_options = 2131361827;
- // aapt resource value: 0x7f040024
- public const int hdl_widget_pickerview_time = 2130968612;
+ // aapt resource value: 0x7F0A0024
+ public const int hdl_widget_pickerview_time = 2131361828;
- // aapt resource value: 0x7f040025
- public const int Main = 2130968613;
+ // aapt resource value: 0x7F0A0025
+ public const int Main = 2131361829;
- // aapt resource value: 0x7f040026
- public const int notification_action = 2130968614;
+ // aapt resource value: 0x7F0A0026
+ public const int notification_action = 2131361830;
- // aapt resource value: 0x7f040027
- public const int notification_action_tombstone = 2130968615;
+ // aapt resource value: 0x7F0A0027
+ public const int notification_action_tombstone = 2131361831;
- // aapt resource value: 0x7f040028
- public const int notification_media_action = 2130968616;
+ // aapt resource value: 0x7F0A0028
+ public const int notification_media_action = 2131361832;
- // aapt resource value: 0x7f040029
- public const int notification_media_cancel_action = 2130968617;
+ // aapt resource value: 0x7F0A0029
+ public const int notification_media_cancel_action = 2131361833;
- // aapt resource value: 0x7f04002a
- public const int notification_template_big_media = 2130968618;
+ // aapt resource value: 0x7F0A002A
+ public const int notification_template_big_media = 2131361834;
- // aapt resource value: 0x7f04002b
- public const int notification_template_big_media_custom = 2130968619;
+ // aapt resource value: 0x7F0A002B
+ public const int notification_template_big_media_custom = 2131361835;
- // aapt resource value: 0x7f04002c
- public const int notification_template_big_media_narrow = 2130968620;
+ // aapt resource value: 0x7F0A002C
+ public const int notification_template_big_media_narrow = 2131361836;
- // aapt resource value: 0x7f04002d
- public const int notification_template_big_media_narrow_custom = 2130968621;
+ // aapt resource value: 0x7F0A002D
+ public const int notification_template_big_media_narrow_custom = 2131361837;
- // aapt resource value: 0x7f04002e
- public const int notification_template_custom_big = 2130968622;
+ // aapt resource value: 0x7F0A002E
+ public const int notification_template_custom_big = 2131361838;
- // aapt resource value: 0x7f04002f
- public const int notification_template_icon_group = 2130968623;
+ // aapt resource value: 0x7F0A002F
+ public const int notification_template_icon_group = 2131361839;
- // aapt resource value: 0x7f040030
- public const int notification_template_lines_media = 2130968624;
+ // aapt resource value: 0x7F0A0030
+ public const int notification_template_lines_media = 2131361840;
- // aapt resource value: 0x7f040031
- public const int notification_template_media = 2130968625;
+ // aapt resource value: 0x7F0A0031
+ public const int notification_template_media = 2131361841;
- // aapt resource value: 0x7f040032
- public const int notification_template_media_custom = 2130968626;
+ // aapt resource value: 0x7F0A0032
+ public const int notification_template_media_custom = 2131361842;
- // aapt resource value: 0x7f040033
- public const int notification_template_part_chronometer = 2130968627;
+ // aapt resource value: 0x7F0A0033
+ public const int notification_template_part_chronometer = 2131361843;
- // aapt resource value: 0x7f040034
- public const int notification_template_part_time = 2130968628;
+ // aapt resource value: 0x7F0A0034
+ public const int notification_template_part_time = 2131361844;
- // aapt resource value: 0x7f040035
- public const int select_dialog_item_material = 2130968629;
+ // aapt resource value: 0x7F0A0035
+ public const int select_dialog_item_material = 2131361845;
- // aapt resource value: 0x7f040036
- public const int select_dialog_multichoice_material = 2130968630;
+ // aapt resource value: 0x7F0A0036
+ public const int select_dialog_multichoice_material = 2131361846;
- // aapt resource value: 0x7f040037
- public const int select_dialog_singlechoice_material = 2130968631;
+ // aapt resource value: 0x7F0A0037
+ public const int select_dialog_singlechoice_material = 2131361847;
- // aapt resource value: 0x7f040038
- public const int srl_classics_footer = 2130968632;
+ // aapt resource value: 0x7F0A0038
+ public const int srl_classics_footer = 2131361848;
- // aapt resource value: 0x7f040039
- public const int srl_classics_header = 2130968633;
+ // aapt resource value: 0x7F0A0039
+ public const int srl_classics_header = 2131361849;
- // aapt resource value: 0x7f04003a
- public const int support_simple_spinner_dropdown_item = 2130968634;
+ // aapt resource value: 0x7F0A003A
+ public const int support_simple_spinner_dropdown_item = 2131361850;
- // aapt resource value: 0x7f04003b
- public const int tooltip = 2130968635;
+ // aapt resource value: 0x7F0A003B
+ public const int tooltip = 2131361851;
- // aapt resource value: 0x7f04003c
- public const int zxingscanneractivitylayout = 2130968636;
+ // aapt resource value: 0x7F0A003C
+ public const int zxingscanneractivitylayout = 2131361852;
- // aapt resource value: 0x7f04003d
- public const int zxingscannerfragmentlayout = 2130968637;
+ // aapt resource value: 0x7F0A003D
+ public const int zxingscannerfragmentlayout = 2131361853;
static Layout()
{
@@ -3305,8 +3305,8 @@
public partial class Mipmap
{
- // aapt resource value: 0x7f030000
- public const int Icon = 2130903040;
+ // aapt resource value: 0x7F0B0000
+ public const int Icon = 2131427328;
static Mipmap()
{
@@ -3321,218 +3321,218 @@
public partial class String
{
- // aapt resource value: 0x7f090000
- public const int abc_action_bar_home_description = 2131296256;
+ // aapt resource value: 0x7F0C0000
+ public const int abc_action_bar_home_description = 2131492864;
- // aapt resource value: 0x7f090001
- public const int abc_action_bar_home_description_format = 2131296257;
+ // aapt resource value: 0x7F0C0001
+ public const int abc_action_bar_home_description_format = 2131492865;
- // aapt resource value: 0x7f090002
- public const int abc_action_bar_home_subtitle_description_format = 2131296258;
+ // aapt resource value: 0x7F0C0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131492866;
- // aapt resource value: 0x7f090003
- public const int abc_action_bar_up_description = 2131296259;
+ // aapt resource value: 0x7F0C0003
+ public const int abc_action_bar_up_description = 2131492867;
- // aapt resource value: 0x7f090004
- public const int abc_action_menu_overflow_description = 2131296260;
+ // aapt resource value: 0x7F0C0004
+ public const int abc_action_menu_overflow_description = 2131492868;
- // aapt resource value: 0x7f090005
- public const int abc_action_mode_done = 2131296261;
+ // aapt resource value: 0x7F0C0005
+ public const int abc_action_mode_done = 2131492869;
- // aapt resource value: 0x7f090006
- public const int abc_activity_chooser_view_see_all = 2131296262;
+ // aapt resource value: 0x7F0C0007
+ public const int abc_activitychooserview_choose_application = 2131492871;
- // aapt resource value: 0x7f090007
- public const int abc_activitychooserview_choose_application = 2131296263;
+ // aapt resource value: 0x7F0C0006
+ public const int abc_activity_chooser_view_see_all = 2131492870;
- // aapt resource value: 0x7f090008
- public const int abc_capital_off = 2131296264;
+ // aapt resource value: 0x7F0C0008
+ public const int abc_capital_off = 2131492872;
- // aapt resource value: 0x7f090009
- public const int abc_capital_on = 2131296265;
+ // aapt resource value: 0x7F0C0009
+ public const int abc_capital_on = 2131492873;
- // aapt resource value: 0x7f090015
- public const int abc_font_family_body_1_material = 2131296277;
+ // aapt resource value: 0x7F0C000A
+ public const int abc_font_family_body_1_material = 2131492874;
- // aapt resource value: 0x7f090016
- public const int abc_font_family_body_2_material = 2131296278;
+ // aapt resource value: 0x7F0C000B
+ public const int abc_font_family_body_2_material = 2131492875;
- // aapt resource value: 0x7f090017
- public const int abc_font_family_button_material = 2131296279;
+ // aapt resource value: 0x7F0C000C
+ public const int abc_font_family_button_material = 2131492876;
- // aapt resource value: 0x7f090018
- public const int abc_font_family_caption_material = 2131296280;
+ // aapt resource value: 0x7F0C000D
+ public const int abc_font_family_caption_material = 2131492877;
- // aapt resource value: 0x7f090019
- public const int abc_font_family_display_1_material = 2131296281;
+ // aapt resource value: 0x7F0C000E
+ public const int abc_font_family_display_1_material = 2131492878;
- // aapt resource value: 0x7f09001a
- public const int abc_font_family_display_2_material = 2131296282;
+ // aapt resource value: 0x7F0C000F
+ public const int abc_font_family_display_2_material = 2131492879;
- // aapt resource value: 0x7f09001b
- public const int abc_font_family_display_3_material = 2131296283;
+ // aapt resource value: 0x7F0C0010
+ public const int abc_font_family_display_3_material = 2131492880;
- // aapt resource value: 0x7f09001c
- public const int abc_font_family_display_4_material = 2131296284;
+ // aapt resource value: 0x7F0C0011
+ public const int abc_font_family_display_4_material = 2131492881;
- // aapt resource value: 0x7f09001d
- public const int abc_font_family_headline_material = 2131296285;
+ // aapt resource value: 0x7F0C0012
+ public const int abc_font_family_headline_material = 2131492882;
- // aapt resource value: 0x7f09001e
- public const int abc_font_family_menu_material = 2131296286;
+ // aapt resource value: 0x7F0C0013
+ public const int abc_font_family_menu_material = 2131492883;
- // aapt resource value: 0x7f09001f
- public const int abc_font_family_subhead_material = 2131296287;
+ // aapt resource value: 0x7F0C0014
+ public const int abc_font_family_subhead_material = 2131492884;
- // aapt resource value: 0x7f090020
- public const int abc_font_family_title_material = 2131296288;
+ // aapt resource value: 0x7F0C0015
+ public const int abc_font_family_title_material = 2131492885;
- // aapt resource value: 0x7f09000a
- public const int abc_search_hint = 2131296266;
+ // aapt resource value: 0x7F0C0017
+ public const int abc_searchview_description_clear = 2131492887;
- // aapt resource value: 0x7f09000b
- public const int abc_searchview_description_clear = 2131296267;
+ // aapt resource value: 0x7F0C0018
+ public const int abc_searchview_description_query = 2131492888;
- // aapt resource value: 0x7f09000c
- public const int abc_searchview_description_query = 2131296268;
+ // aapt resource value: 0x7F0C0019
+ public const int abc_searchview_description_search = 2131492889;
- // aapt resource value: 0x7f09000d
- public const int abc_searchview_description_search = 2131296269;
+ // aapt resource value: 0x7F0C001A
+ public const int abc_searchview_description_submit = 2131492890;
- // aapt resource value: 0x7f09000e
- public const int abc_searchview_description_submit = 2131296270;
+ // aapt resource value: 0x7F0C001B
+ public const int abc_searchview_description_voice = 2131492891;
- // aapt resource value: 0x7f09000f
- public const int abc_searchview_description_voice = 2131296271;
+ // aapt resource value: 0x7F0C0016
+ public const int abc_search_hint = 2131492886;
- // aapt resource value: 0x7f090010
- public const int abc_shareactionprovider_share_with = 2131296272;
+ // aapt resource value: 0x7F0C001C
+ public const int abc_shareactionprovider_share_with = 2131492892;
- // aapt resource value: 0x7f090011
- public const int abc_shareactionprovider_share_with_application = 2131296273;
+ // aapt resource value: 0x7F0C001D
+ public const int abc_shareactionprovider_share_with_application = 2131492893;
- // aapt resource value: 0x7f090012
- public const int abc_toolbar_collapse_description = 2131296274;
+ // aapt resource value: 0x7F0C001E
+ public const int abc_toolbar_collapse_description = 2131492894;
- // aapt resource value: 0x7f090034
- public const int app_name = 2131296308;
+ // aapt resource value: 0x7F0C001F
+ public const int app_name = 2131492895;
- // aapt resource value: 0x7f090035
- public const int gd_activity_title = 2131296309;
+ // aapt resource value: 0x7F0C0020
+ public const int gd_activity_title = 2131492896;
- // aapt resource value: 0x7f090036
- public const int gd_cancel = 2131296310;
+ // aapt resource value: 0x7F0C0021
+ public const int gd_cancel = 2131492897;
- // aapt resource value: 0x7f090037
- public const int gd_myhome = 2131296311;
+ // aapt resource value: 0x7F0C0022
+ public const int gd_myhome = 2131492898;
- // aapt resource value: 0x7f090038
- public const int gd_notifyMsg = 2131296312;
+ // aapt resource value: 0x7F0C0023
+ public const int gd_notifyMsg = 2131492899;
- // aapt resource value: 0x7f090039
- public const int gd_notifyTitle = 2131296313;
+ // aapt resource value: 0x7F0C0024
+ public const int gd_notifyTitle = 2131492900;
- // aapt resource value: 0x7f09003a
- public const int gd_save = 2131296314;
+ // aapt resource value: 0x7F0C0025
+ public const int gd_save = 2131492901;
- // aapt resource value: 0x7f09003b
- public const int gd_search_tip = 2131296315;
+ // aapt resource value: 0x7F0C0026
+ public const int gd_search_tip = 2131492902;
- // aapt resource value: 0x7f09003c
- public const int gd_select_distance = 2131296316;
+ // aapt resource value: 0x7F0C0027
+ public const int gd_select_distance = 2131492903;
- // aapt resource value: 0x7f09003d
- public const int gd_setting = 2131296317;
+ // aapt resource value: 0x7F0C0028
+ public const int gd_setting = 2131492904;
- // aapt resource value: 0x7f090046
- public const int hello = 2131296326;
+ // aapt resource value: 0x7F0C0029
+ public const int hello = 2131492905;
- // aapt resource value: 0x7f090021
- public const int not_recognized_fingerprint_hint = 2131296289;
+ // aapt resource value: 0x7F0C002A
+ public const int not_recognized_fingerprint_hint = 2131492906;
- // aapt resource value: 0x7f09003e
- public const int pickerview_cancel = 2131296318;
+ // aapt resource value: 0x7F0C002B
+ public const int pickerview_cancel = 2131492907;
- // aapt resource value: 0x7f09003f
- public const int pickerview_day = 2131296319;
+ // aapt resource value: 0x7F0C002C
+ public const int pickerview_day = 2131492908;
- // aapt resource value: 0x7f090040
- public const int pickerview_hours = 2131296320;
+ // aapt resource value: 0x7F0C002D
+ public const int pickerview_hours = 2131492909;
- // aapt resource value: 0x7f090041
- public const int pickerview_minutes = 2131296321;
+ // aapt resource value: 0x7F0C002E
+ public const int pickerview_minutes = 2131492910;
- // aapt resource value: 0x7f090042
- public const int pickerview_month = 2131296322;
+ // aapt resource value: 0x7F0C002F
+ public const int pickerview_month = 2131492911;
- // aapt resource value: 0x7f090043
- public const int pickerview_seconds = 2131296323;
+ // aapt resource value: 0x7F0C0030
+ public const int pickerview_seconds = 2131492912;
- // aapt resource value: 0x7f090044
- public const int pickerview_submit = 2131296324;
+ // aapt resource value: 0x7F0C0031
+ public const int pickerview_submit = 2131492913;
- // aapt resource value: 0x7f090045
- public const int pickerview_year = 2131296325;
+ // aapt resource value: 0x7F0C0032
+ public const int pickerview_year = 2131492914;
- // aapt resource value: 0x7f090013
- public const int search_menu_title = 2131296275;
+ // aapt resource value: 0x7F0C0033
+ public const int search_menu_title = 2131492915;
- // aapt resource value: 0x7f090023
- public const int srl_component_falsify = 2131296291;
+ // aapt resource value: 0x7F0C0034
+ public const int srl_component_falsify = 2131492916;
- // aapt resource value: 0x7f090024
- public const int srl_content_empty = 2131296292;
+ // aapt resource value: 0x7F0C0035
+ public const int srl_content_empty = 2131492917;
- // aapt resource value: 0x7f090025
- public const int srl_footer_failed = 2131296293;
+ // aapt resource value: 0x7F0C0036
+ public const int srl_footer_failed = 2131492918;
- // aapt resource value: 0x7f090026
- public const int srl_footer_finish = 2131296294;
+ // aapt resource value: 0x7F0C0037
+ public const int srl_footer_finish = 2131492919;
- // aapt resource value: 0x7f090027
- public const int srl_footer_loading = 2131296295;
+ // aapt resource value: 0x7F0C0038
+ public const int srl_footer_loading = 2131492920;
- // aapt resource value: 0x7f090028
- public const int srl_footer_nothing = 2131296296;
+ // aapt resource value: 0x7F0C0039
+ public const int srl_footer_nothing = 2131492921;
- // aapt resource value: 0x7f090029
- public const int srl_footer_pulling = 2131296297;
+ // aapt resource value: 0x7F0C003A
+ public const int srl_footer_pulling = 2131492922;
- // aapt resource value: 0x7f09002a
- public const int srl_footer_refreshing = 2131296298;
+ // aapt resource value: 0x7F0C003B
+ public const int srl_footer_refreshing = 2131492923;
- // aapt resource value: 0x7f09002b
- public const int srl_footer_release = 2131296299;
+ // aapt resource value: 0x7F0C003C
+ public const int srl_footer_release = 2131492924;
- // aapt resource value: 0x7f09002c
- public const int srl_header_failed = 2131296300;
+ // aapt resource value: 0x7F0C003D
+ public const int srl_header_failed = 2131492925;
- // aapt resource value: 0x7f09002d
- public const int srl_header_finish = 2131296301;
+ // aapt resource value: 0x7F0C003E
+ public const int srl_header_finish = 2131492926;
- // aapt resource value: 0x7f09002e
- public const int srl_header_loading = 2131296302;
+ // aapt resource value: 0x7F0C003F
+ public const int srl_header_loading = 2131492927;
- // aapt resource value: 0x7f09002f
- public const int srl_header_pulling = 2131296303;
+ // aapt resource value: 0x7F0C0040
+ public const int srl_header_pulling = 2131492928;
- // aapt resource value: 0x7f090030
- public const int srl_header_refreshing = 2131296304;
+ // aapt resource value: 0x7F0C0041
+ public const int srl_header_refreshing = 2131492929;
- // aapt resource value: 0x7f090031
- public const int srl_header_release = 2131296305;
+ // aapt resource value: 0x7F0C0042
+ public const int srl_header_release = 2131492930;
- // aapt resource value: 0x7f090032
- public const int srl_header_secondary = 2131296306;
+ // aapt resource value: 0x7F0C0043
+ public const int srl_header_secondary = 2131492931;
- // aapt resource value: 0x7f090033
- public const int srl_header_update = 2131296307;
+ // aapt resource value: 0x7F0C0044
+ public const int srl_header_update = 2131492932;
- // aapt resource value: 0x7f090014
- public const int status_bar_notification_info_overflow = 2131296276;
+ // aapt resource value: 0x7F0C0045
+ public const int status_bar_notification_info_overflow = 2131492933;
- // aapt resource value: 0x7f090022
- public const int touch_fingerprint_sensor_hint = 2131296290;
+ // aapt resource value: 0x7F0C0046
+ public const int touch_fingerprint_sensor_hint = 2131492934;
static String()
{
@@ -3547,1115 +3547,1115 @@
public partial class Style
{
- // aapt resource value: 0x7f0a009d
- public const int AlertDialog_AppCompat = 2131361949;
+ // aapt resource value: 0x7F0D0000
+ public const int AlertDialog_AppCompat = 2131558400;
- // aapt resource value: 0x7f0a009e
- public const int AlertDialog_AppCompat_Light = 2131361950;
+ // aapt resource value: 0x7F0D0001
+ public const int AlertDialog_AppCompat_Light = 2131558401;
- // aapt resource value: 0x7f0a009f
- public const int Animation_AppCompat_Dialog = 2131361951;
+ // aapt resource value: 0x7F0D0002
+ public const int Animation_AppCompat_Dialog = 2131558402;
- // aapt resource value: 0x7f0a00a0
- public const int Animation_AppCompat_DropDownUp = 2131361952;
+ // aapt resource value: 0x7F0D0003
+ public const int Animation_AppCompat_DropDownUp = 2131558403;
- // aapt resource value: 0x7f0a00a1
- public const int Animation_AppCompat_Tooltip = 2131361953;
+ // aapt resource value: 0x7F0D0004
+ public const int Animation_AppCompat_Tooltip = 2131558404;
- // aapt resource value: 0x7f0a00a2
- public const int Base_AlertDialog_AppCompat = 2131361954;
+ // aapt resource value: 0x7F0D0005
+ public const int Base_AlertDialog_AppCompat = 2131558405;
- // aapt resource value: 0x7f0a00a3
- public const int Base_AlertDialog_AppCompat_Light = 2131361955;
+ // aapt resource value: 0x7F0D0006
+ public const int Base_AlertDialog_AppCompat_Light = 2131558406;
- // aapt resource value: 0x7f0a00a4
- public const int Base_Animation_AppCompat_Dialog = 2131361956;
+ // aapt resource value: 0x7F0D0007
+ public const int Base_Animation_AppCompat_Dialog = 2131558407;
- // aapt resource value: 0x7f0a00a5
- public const int Base_Animation_AppCompat_DropDownUp = 2131361957;
+ // aapt resource value: 0x7F0D0008
+ public const int Base_Animation_AppCompat_DropDownUp = 2131558408;
- // aapt resource value: 0x7f0a00a6
- public const int Base_Animation_AppCompat_Tooltip = 2131361958;
+ // aapt resource value: 0x7F0D0009
+ public const int Base_Animation_AppCompat_Tooltip = 2131558409;
- // aapt resource value: 0x7f0a00a7
- public const int Base_DialogWindowTitle_AppCompat = 2131361959;
+ // aapt resource value: 0x7F0D000B
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131558411;
- // aapt resource value: 0x7f0a00a8
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131361960;
+ // aapt resource value: 0x7F0D000A
+ public const int Base_DialogWindowTitle_AppCompat = 2131558410;
- // aapt resource value: 0x7f0a0039
- public const int Base_TextAppearance_AppCompat = 2131361849;
+ // aapt resource value: 0x7F0D000C
+ public const int Base_TextAppearance_AppCompat = 2131558412;
- // aapt resource value: 0x7f0a003a
- public const int Base_TextAppearance_AppCompat_Body1 = 2131361850;
+ // aapt resource value: 0x7F0D000D
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131558413;
- // aapt resource value: 0x7f0a003b
- public const int Base_TextAppearance_AppCompat_Body2 = 2131361851;
+ // aapt resource value: 0x7F0D000E
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131558414;
- // aapt resource value: 0x7f0a0027
- public const int Base_TextAppearance_AppCompat_Button = 2131361831;
+ // aapt resource value: 0x7F0D000F
+ public const int Base_TextAppearance_AppCompat_Button = 2131558415;
- // aapt resource value: 0x7f0a003c
- public const int Base_TextAppearance_AppCompat_Caption = 2131361852;
+ // aapt resource value: 0x7F0D0010
+ public const int Base_TextAppearance_AppCompat_Caption = 2131558416;
- // aapt resource value: 0x7f0a003d
- public const int Base_TextAppearance_AppCompat_Display1 = 2131361853;
+ // aapt resource value: 0x7F0D0011
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131558417;
- // aapt resource value: 0x7f0a003e
- public const int Base_TextAppearance_AppCompat_Display2 = 2131361854;
+ // aapt resource value: 0x7F0D0012
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131558418;
- // aapt resource value: 0x7f0a003f
- public const int Base_TextAppearance_AppCompat_Display3 = 2131361855;
+ // aapt resource value: 0x7F0D0013
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131558419;
- // aapt resource value: 0x7f0a0040
- public const int Base_TextAppearance_AppCompat_Display4 = 2131361856;
+ // aapt resource value: 0x7F0D0014
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131558420;
- // aapt resource value: 0x7f0a0041
- public const int Base_TextAppearance_AppCompat_Headline = 2131361857;
+ // aapt resource value: 0x7F0D0015
+ public const int Base_TextAppearance_AppCompat_Headline = 2131558421;
- // aapt resource value: 0x7f0a000b
- public const int Base_TextAppearance_AppCompat_Inverse = 2131361803;
+ // aapt resource value: 0x7F0D0016
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131558422;
- // aapt resource value: 0x7f0a0042
- public const int Base_TextAppearance_AppCompat_Large = 2131361858;
+ // aapt resource value: 0x7F0D0017
+ public const int Base_TextAppearance_AppCompat_Large = 2131558423;
- // aapt resource value: 0x7f0a000c
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131361804;
+ // aapt resource value: 0x7F0D0018
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131558424;
- // aapt resource value: 0x7f0a0043
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131361859;
+ // aapt resource value: 0x7F0D0019
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131558425;
- // aapt resource value: 0x7f0a0044
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131361860;
+ // aapt resource value: 0x7F0D001A
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131558426;
- // aapt resource value: 0x7f0a0045
- public const int Base_TextAppearance_AppCompat_Medium = 2131361861;
+ // aapt resource value: 0x7F0D001B
+ public const int Base_TextAppearance_AppCompat_Medium = 2131558427;
- // aapt resource value: 0x7f0a000d
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131361805;
+ // aapt resource value: 0x7F0D001C
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131558428;
- // aapt resource value: 0x7f0a0046
- public const int Base_TextAppearance_AppCompat_Menu = 2131361862;
+ // aapt resource value: 0x7F0D001D
+ public const int Base_TextAppearance_AppCompat_Menu = 2131558429;
- // aapt resource value: 0x7f0a00a9
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131361961;
+ // aapt resource value: 0x7F0D001E
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131558430;
- // aapt resource value: 0x7f0a0047
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131361863;
+ // aapt resource value: 0x7F0D001F
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131558431;
- // aapt resource value: 0x7f0a0048
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131361864;
+ // aapt resource value: 0x7F0D0020
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131558432;
- // aapt resource value: 0x7f0a0049
- public const int Base_TextAppearance_AppCompat_Small = 2131361865;
+ // aapt resource value: 0x7F0D0021
+ public const int Base_TextAppearance_AppCompat_Small = 2131558433;
- // aapt resource value: 0x7f0a000e
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131361806;
+ // aapt resource value: 0x7F0D0022
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131558434;
- // aapt resource value: 0x7f0a004a
- public const int Base_TextAppearance_AppCompat_Subhead = 2131361866;
+ // aapt resource value: 0x7F0D0023
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131558435;
- // aapt resource value: 0x7f0a000f
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131361807;
+ // aapt resource value: 0x7F0D0024
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131558436;
- // aapt resource value: 0x7f0a004b
- public const int Base_TextAppearance_AppCompat_Title = 2131361867;
+ // aapt resource value: 0x7F0D0025
+ public const int Base_TextAppearance_AppCompat_Title = 2131558437;
- // aapt resource value: 0x7f0a0010
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131361808;
+ // aapt resource value: 0x7F0D0026
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131558438;
- // aapt resource value: 0x7f0a00aa
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131361962;
+ // aapt resource value: 0x7F0D0027
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131558439;
- // aapt resource value: 0x7f0a008e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131361934;
+ // aapt resource value: 0x7F0D0028
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131558440;
- // aapt resource value: 0x7f0a004c
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131361868;
+ // aapt resource value: 0x7F0D0029
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131558441;
- // aapt resource value: 0x7f0a004d
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131361869;
+ // aapt resource value: 0x7F0D002A
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131558442;
- // aapt resource value: 0x7f0a004e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131361870;
+ // aapt resource value: 0x7F0D002B
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131558443;
- // aapt resource value: 0x7f0a004f
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131361871;
+ // aapt resource value: 0x7F0D002C
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131558444;
- // aapt resource value: 0x7f0a0050
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131361872;
+ // aapt resource value: 0x7F0D002D
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131558445;
- // aapt resource value: 0x7f0a0051
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131361873;
+ // aapt resource value: 0x7F0D002E
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131558446;
- // aapt resource value: 0x7f0a0052
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131361874;
+ // aapt resource value: 0x7F0D002F
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131558447;
- // aapt resource value: 0x7f0a0095
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131361941;
+ // aapt resource value: 0x7F0D0030
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131558448;
- // aapt resource value: 0x7f0a0096
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131361942;
+ // aapt resource value: 0x7F0D0031
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131558449;
- // aapt resource value: 0x7f0a008f
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131361935;
+ // aapt resource value: 0x7F0D0032
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131558450;
- // aapt resource value: 0x7f0a00ab
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131361963;
+ // aapt resource value: 0x7F0D0033
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131558451;
- // aapt resource value: 0x7f0a0053
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131361875;
+ // aapt resource value: 0x7F0D0034
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131558452;
- // aapt resource value: 0x7f0a0054
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131361876;
+ // aapt resource value: 0x7F0D0035
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131558453;
- // aapt resource value: 0x7f0a0055
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131361877;
+ // aapt resource value: 0x7F0D0036
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131558454;
- // aapt resource value: 0x7f0a0056
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131361878;
+ // aapt resource value: 0x7F0D0037
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131558455;
- // aapt resource value: 0x7f0a0057
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131361879;
+ // aapt resource value: 0x7F0D0038
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131558456;
- // aapt resource value: 0x7f0a00ac
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131361964;
+ // aapt resource value: 0x7F0D0039
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131558457;
- // aapt resource value: 0x7f0a0058
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131361880;
+ // aapt resource value: 0x7F0D003A
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131558458;
- // aapt resource value: 0x7f0a0059
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131361881;
+ // aapt resource value: 0x7F0D003B
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131558459;
- // aapt resource value: 0x7f0a005a
- public const int Base_Theme_AppCompat = 2131361882;
+ // aapt resource value: 0x7F0D004A
+ public const int Base_ThemeOverlay_AppCompat = 2131558474;
- // aapt resource value: 0x7f0a00ad
- public const int Base_Theme_AppCompat_CompactMenu = 2131361965;
+ // aapt resource value: 0x7F0D004B
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131558475;
- // aapt resource value: 0x7f0a0011
- public const int Base_Theme_AppCompat_Dialog = 2131361809;
+ // aapt resource value: 0x7F0D004C
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131558476;
- // aapt resource value: 0x7f0a0012
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131361810;
+ // aapt resource value: 0x7F0D004D
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131558477;
- // aapt resource value: 0x7f0a00ae
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131361966;
+ // aapt resource value: 0x7F0D004E
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131558478;
- // aapt resource value: 0x7f0a0013
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131361811;
+ // aapt resource value: 0x7F0D004F
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131558479;
- // aapt resource value: 0x7f0a0001
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131361793;
+ // aapt resource value: 0x7F0D0050
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131558480;
- // aapt resource value: 0x7f0a005b
- public const int Base_Theme_AppCompat_Light = 2131361883;
+ // aapt resource value: 0x7F0D003C
+ public const int Base_Theme_AppCompat = 2131558460;
- // aapt resource value: 0x7f0a00af
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131361967;
+ // aapt resource value: 0x7F0D003D
+ public const int Base_Theme_AppCompat_CompactMenu = 2131558461;
- // aapt resource value: 0x7f0a0014
- public const int Base_Theme_AppCompat_Light_Dialog = 2131361812;
+ // aapt resource value: 0x7F0D003E
+ public const int Base_Theme_AppCompat_Dialog = 2131558462;
- // aapt resource value: 0x7f0a0015
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131361813;
+ // aapt resource value: 0x7F0D0042
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131558466;
- // aapt resource value: 0x7f0a00b0
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131361968;
+ // aapt resource value: 0x7F0D003F
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131558463;
- // aapt resource value: 0x7f0a0016
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131361814;
+ // aapt resource value: 0x7F0D0040
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131558464;
- // aapt resource value: 0x7f0a0002
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131361794;
+ // aapt resource value: 0x7F0D0041
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131558465;
- // aapt resource value: 0x7f0a00b1
- public const int Base_ThemeOverlay_AppCompat = 2131361969;
+ // aapt resource value: 0x7F0D0043
+ public const int Base_Theme_AppCompat_Light = 2131558467;
- // aapt resource value: 0x7f0a00b2
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131361970;
+ // aapt resource value: 0x7F0D0044
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131558468;
- // aapt resource value: 0x7f0a00b3
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131361971;
+ // aapt resource value: 0x7F0D0045
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131558469;
- // aapt resource value: 0x7f0a00b4
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131361972;
+ // aapt resource value: 0x7F0D0049
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131558473;
- // aapt resource value: 0x7f0a0017
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131361815;
+ // aapt resource value: 0x7F0D0046
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131558470;
- // aapt resource value: 0x7f0a0018
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131361816;
+ // aapt resource value: 0x7F0D0047
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131558471;
- // aapt resource value: 0x7f0a00b5
- public const int Base_ThemeOverlay_AppCompat_Light = 2131361973;
+ // aapt resource value: 0x7F0D0048
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131558472;
- // aapt resource value: 0x7f0a0019
- public const int Base_V11_Theme_AppCompat_Dialog = 2131361817;
+ // aapt resource value: 0x7F0D0053
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131558483;
- // aapt resource value: 0x7f0a001a
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131361818;
+ // aapt resource value: 0x7F0D0051
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131558481;
- // aapt resource value: 0x7f0a001b
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131361819;
+ // aapt resource value: 0x7F0D0052
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131558482;
- // aapt resource value: 0x7f0a0023
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131361827;
+ // aapt resource value: 0x7F0D0054
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131558484;
- // aapt resource value: 0x7f0a0024
- public const int Base_V12_Widget_AppCompat_EditText = 2131361828;
+ // aapt resource value: 0x7F0D0055
+ public const int Base_V12_Widget_AppCompat_EditText = 2131558485;
- // aapt resource value: 0x7f0a005c
- public const int Base_V21_Theme_AppCompat = 2131361884;
+ // aapt resource value: 0x7F0D005A
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131558490;
- // aapt resource value: 0x7f0a005d
- public const int Base_V21_Theme_AppCompat_Dialog = 2131361885;
+ // aapt resource value: 0x7F0D0056
+ public const int Base_V21_Theme_AppCompat = 2131558486;
- // aapt resource value: 0x7f0a005e
- public const int Base_V21_Theme_AppCompat_Light = 2131361886;
+ // aapt resource value: 0x7F0D0057
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131558487;
- // aapt resource value: 0x7f0a005f
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131361887;
+ // aapt resource value: 0x7F0D0058
+ public const int Base_V21_Theme_AppCompat_Light = 2131558488;
- // aapt resource value: 0x7f0a0060
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131361888;
+ // aapt resource value: 0x7F0D0059
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131558489;
- // aapt resource value: 0x7f0a008c
- public const int Base_V22_Theme_AppCompat = 2131361932;
+ // aapt resource value: 0x7F0D005B
+ public const int Base_V22_Theme_AppCompat = 2131558491;
- // aapt resource value: 0x7f0a008d
- public const int Base_V22_Theme_AppCompat_Light = 2131361933;
+ // aapt resource value: 0x7F0D005C
+ public const int Base_V22_Theme_AppCompat_Light = 2131558492;
- // aapt resource value: 0x7f0a0090
- public const int Base_V23_Theme_AppCompat = 2131361936;
+ // aapt resource value: 0x7F0D005D
+ public const int Base_V23_Theme_AppCompat = 2131558493;
- // aapt resource value: 0x7f0a0091
- public const int Base_V23_Theme_AppCompat_Light = 2131361937;
+ // aapt resource value: 0x7F0D005E
+ public const int Base_V23_Theme_AppCompat_Light = 2131558494;
- // aapt resource value: 0x7f0a0099
- public const int Base_V26_Theme_AppCompat = 2131361945;
+ // aapt resource value: 0x7F0D005F
+ public const int Base_V26_Theme_AppCompat = 2131558495;
- // aapt resource value: 0x7f0a009a
- public const int Base_V26_Theme_AppCompat_Light = 2131361946;
+ // aapt resource value: 0x7F0D0060
+ public const int Base_V26_Theme_AppCompat_Light = 2131558496;
- // aapt resource value: 0x7f0a009b
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131361947;
+ // aapt resource value: 0x7F0D0061
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131558497;
- // aapt resource value: 0x7f0a00b6
- public const int Base_V7_Theme_AppCompat = 2131361974;
+ // aapt resource value: 0x7F0D0066
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131558502;
- // aapt resource value: 0x7f0a00b7
- public const int Base_V7_Theme_AppCompat_Dialog = 2131361975;
+ // aapt resource value: 0x7F0D0062
+ public const int Base_V7_Theme_AppCompat = 2131558498;
- // aapt resource value: 0x7f0a00b8
- public const int Base_V7_Theme_AppCompat_Light = 2131361976;
+ // aapt resource value: 0x7F0D0063
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131558499;
- // aapt resource value: 0x7f0a00b9
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131361977;
+ // aapt resource value: 0x7F0D0064
+ public const int Base_V7_Theme_AppCompat_Light = 2131558500;
- // aapt resource value: 0x7f0a00ba
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131361978;
+ // aapt resource value: 0x7F0D0065
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131558501;
- // aapt resource value: 0x7f0a00bb
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131361979;
+ // aapt resource value: 0x7F0D0067
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131558503;
- // aapt resource value: 0x7f0a00bc
- public const int Base_V7_Widget_AppCompat_EditText = 2131361980;
+ // aapt resource value: 0x7F0D0068
+ public const int Base_V7_Widget_AppCompat_EditText = 2131558504;
- // aapt resource value: 0x7f0a00bd
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131361981;
+ // aapt resource value: 0x7F0D0069
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131558505;
- // aapt resource value: 0x7f0a00be
- public const int Base_Widget_AppCompat_ActionBar = 2131361982;
+ // aapt resource value: 0x7F0D006A
+ public const int Base_Widget_AppCompat_ActionBar = 2131558506;
- // aapt resource value: 0x7f0a00bf
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131361983;
+ // aapt resource value: 0x7F0D006B
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131558507;
- // aapt resource value: 0x7f0a00c0
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131361984;
+ // aapt resource value: 0x7F0D006C
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131558508;
- // aapt resource value: 0x7f0a0061
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131361889;
+ // aapt resource value: 0x7F0D006D
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131558509;
- // aapt resource value: 0x7f0a0062
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131361890;
+ // aapt resource value: 0x7F0D006E
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131558510;
- // aapt resource value: 0x7f0a0063
- public const int Base_Widget_AppCompat_ActionButton = 2131361891;
+ // aapt resource value: 0x7F0D006F
+ public const int Base_Widget_AppCompat_ActionButton = 2131558511;
- // aapt resource value: 0x7f0a0064
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131361892;
+ // aapt resource value: 0x7F0D0070
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131558512;
- // aapt resource value: 0x7f0a0065
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131361893;
+ // aapt resource value: 0x7F0D0071
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131558513;
- // aapt resource value: 0x7f0a00c1
- public const int Base_Widget_AppCompat_ActionMode = 2131361985;
+ // aapt resource value: 0x7F0D0072
+ public const int Base_Widget_AppCompat_ActionMode = 2131558514;
- // aapt resource value: 0x7f0a00c2
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131361986;
+ // aapt resource value: 0x7F0D0073
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131558515;
- // aapt resource value: 0x7f0a0025
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131361829;
+ // aapt resource value: 0x7F0D0074
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131558516;
- // aapt resource value: 0x7f0a0066
- public const int Base_Widget_AppCompat_Button = 2131361894;
+ // aapt resource value: 0x7F0D0075
+ public const int Base_Widget_AppCompat_Button = 2131558517;
- // aapt resource value: 0x7f0a0067
- public const int Base_Widget_AppCompat_Button_Borderless = 2131361895;
+ // aapt resource value: 0x7F0D007B
+ public const int Base_Widget_AppCompat_ButtonBar = 2131558523;
- // aapt resource value: 0x7f0a0068
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131361896;
+ // aapt resource value: 0x7F0D007C
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131558524;
- // aapt resource value: 0x7f0a00c3
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131361987;
+ // aapt resource value: 0x7F0D0076
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131558518;
- // aapt resource value: 0x7f0a0092
- public const int Base_Widget_AppCompat_Button_Colored = 2131361938;
+ // aapt resource value: 0x7F0D0077
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131558519;
- // aapt resource value: 0x7f0a0069
- public const int Base_Widget_AppCompat_Button_Small = 2131361897;
+ // aapt resource value: 0x7F0D0078
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131558520;
- // aapt resource value: 0x7f0a006a
- public const int Base_Widget_AppCompat_ButtonBar = 2131361898;
+ // aapt resource value: 0x7F0D0079
+ public const int Base_Widget_AppCompat_Button_Colored = 2131558521;
- // aapt resource value: 0x7f0a00c4
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131361988;
+ // aapt resource value: 0x7F0D007A
+ public const int Base_Widget_AppCompat_Button_Small = 2131558522;
- // aapt resource value: 0x7f0a006b
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131361899;
+ // aapt resource value: 0x7F0D007D
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131558525;
- // aapt resource value: 0x7f0a006c
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131361900;
+ // aapt resource value: 0x7F0D007E
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131558526;
- // aapt resource value: 0x7f0a00c5
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131361989;
+ // aapt resource value: 0x7F0D007F
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131558527;
- // aapt resource value: 0x7f0a0000
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131361792;
+ // aapt resource value: 0x7F0D0080
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131558528;
- // aapt resource value: 0x7f0a00c6
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131361990;
+ // aapt resource value: 0x7F0D0081
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131558529;
- // aapt resource value: 0x7f0a006d
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131361901;
+ // aapt resource value: 0x7F0D0082
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131558530;
- // aapt resource value: 0x7f0a0026
- public const int Base_Widget_AppCompat_EditText = 2131361830;
+ // aapt resource value: 0x7F0D0083
+ public const int Base_Widget_AppCompat_EditText = 2131558531;
- // aapt resource value: 0x7f0a006e
- public const int Base_Widget_AppCompat_ImageButton = 2131361902;
+ // aapt resource value: 0x7F0D0084
+ public const int Base_Widget_AppCompat_ImageButton = 2131558532;
- // aapt resource value: 0x7f0a00c7
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131361991;
+ // aapt resource value: 0x7F0D0085
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131558533;
- // aapt resource value: 0x7f0a00c8
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131361992;
+ // aapt resource value: 0x7F0D0086
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131558534;
- // aapt resource value: 0x7f0a00c9
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131361993;
+ // aapt resource value: 0x7F0D0087
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131558535;
- // aapt resource value: 0x7f0a006f
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131361903;
+ // aapt resource value: 0x7F0D0088
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131558536;
- // aapt resource value: 0x7f0a0070
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131361904;
+ // aapt resource value: 0x7F0D0089
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131558537;
- // aapt resource value: 0x7f0a0071
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131361905;
+ // aapt resource value: 0x7F0D008A
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131558538;
- // aapt resource value: 0x7f0a0072
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131361906;
+ // aapt resource value: 0x7F0D008B
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131558539;
- // aapt resource value: 0x7f0a0073
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131361907;
+ // aapt resource value: 0x7F0D008C
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131558540;
- // aapt resource value: 0x7f0a00ca
- public const int Base_Widget_AppCompat_ListMenuView = 2131361994;
+ // aapt resource value: 0x7F0D008D
+ public const int Base_Widget_AppCompat_ListMenuView = 2131558541;
- // aapt resource value: 0x7f0a0074
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131361908;
+ // aapt resource value: 0x7F0D008E
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131558542;
- // aapt resource value: 0x7f0a0075
- public const int Base_Widget_AppCompat_ListView = 2131361909;
+ // aapt resource value: 0x7F0D008F
+ public const int Base_Widget_AppCompat_ListView = 2131558543;
- // aapt resource value: 0x7f0a0076
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131361910;
+ // aapt resource value: 0x7F0D0090
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131558544;
- // aapt resource value: 0x7f0a0077
- public const int Base_Widget_AppCompat_ListView_Menu = 2131361911;
+ // aapt resource value: 0x7F0D0091
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131558545;
- // aapt resource value: 0x7f0a0078
- public const int Base_Widget_AppCompat_PopupMenu = 2131361912;
+ // aapt resource value: 0x7F0D0092
+ public const int Base_Widget_AppCompat_PopupMenu = 2131558546;
- // aapt resource value: 0x7f0a0079
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131361913;
+ // aapt resource value: 0x7F0D0093
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131558547;
- // aapt resource value: 0x7f0a00cb
- public const int Base_Widget_AppCompat_PopupWindow = 2131361995;
+ // aapt resource value: 0x7F0D0094
+ public const int Base_Widget_AppCompat_PopupWindow = 2131558548;
- // aapt resource value: 0x7f0a001c
- public const int Base_Widget_AppCompat_ProgressBar = 2131361820;
+ // aapt resource value: 0x7F0D0095
+ public const int Base_Widget_AppCompat_ProgressBar = 2131558549;
- // aapt resource value: 0x7f0a001d
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131361821;
+ // aapt resource value: 0x7F0D0096
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131558550;
- // aapt resource value: 0x7f0a007a
- public const int Base_Widget_AppCompat_RatingBar = 2131361914;
+ // aapt resource value: 0x7F0D0097
+ public const int Base_Widget_AppCompat_RatingBar = 2131558551;
- // aapt resource value: 0x7f0a0093
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131361939;
+ // aapt resource value: 0x7F0D0098
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131558552;
- // aapt resource value: 0x7f0a0094
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131361940;
+ // aapt resource value: 0x7F0D0099
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131558553;
- // aapt resource value: 0x7f0a00cc
- public const int Base_Widget_AppCompat_SearchView = 2131361996;
+ // aapt resource value: 0x7F0D009A
+ public const int Base_Widget_AppCompat_SearchView = 2131558554;
- // aapt resource value: 0x7f0a00cd
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131361997;
+ // aapt resource value: 0x7F0D009B
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131558555;
- // aapt resource value: 0x7f0a007b
- public const int Base_Widget_AppCompat_SeekBar = 2131361915;
+ // aapt resource value: 0x7F0D009C
+ public const int Base_Widget_AppCompat_SeekBar = 2131558556;
- // aapt resource value: 0x7f0a00ce
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131361998;
+ // aapt resource value: 0x7F0D009D
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131558557;
- // aapt resource value: 0x7f0a007c
- public const int Base_Widget_AppCompat_Spinner = 2131361916;
+ // aapt resource value: 0x7F0D009E
+ public const int Base_Widget_AppCompat_Spinner = 2131558558;
- // aapt resource value: 0x7f0a0003
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131361795;
+ // aapt resource value: 0x7F0D009F
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131558559;
- // aapt resource value: 0x7f0a007d
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131361917;
+ // aapt resource value: 0x7F0D00A0
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131558560;
- // aapt resource value: 0x7f0a009c
- public const int Base_Widget_AppCompat_Toolbar = 2131361948;
+ // aapt resource value: 0x7F0D00A1
+ public const int Base_Widget_AppCompat_Toolbar = 2131558561;
- // aapt resource value: 0x7f0a007e
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131361918;
+ // aapt resource value: 0x7F0D00A2
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131558562;
- // aapt resource value: 0x7f0a016c
- public const int BottomSheetDialogAnimation = 2131362156;
+ // aapt resource value: 0x7F0D00A3
+ public const int BottomSheetDialogAnimation = 2131558563;
- // aapt resource value: 0x7f0a0171
- public const int MyTheme = 2131362161;
+ // aapt resource value: 0x7F0D016F
+ public const int custom_dialog2 = 2131558767;
- // aapt resource value: 0x7f0a001e
- public const int Platform_AppCompat = 2131361822;
+ // aapt resource value: 0x7F0D00A4
+ public const int MyTheme = 2131558564;
- // aapt resource value: 0x7f0a001f
- public const int Platform_AppCompat_Light = 2131361823;
+ // aapt resource value: 0x7F0D0170
+ public const int picker_view_scale_anim = 2131558768;
- // aapt resource value: 0x7f0a007f
- public const int Platform_ThemeOverlay_AppCompat = 2131361919;
+ // aapt resource value: 0x7F0D0171
+ public const int picker_view_slide_anim = 2131558769;
- // aapt resource value: 0x7f0a0080
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131361920;
+ // aapt resource value: 0x7F0D00A5
+ public const int Platform_AppCompat = 2131558565;
- // aapt resource value: 0x7f0a0081
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131361921;
+ // aapt resource value: 0x7F0D00A6
+ public const int Platform_AppCompat_Light = 2131558566;
- // aapt resource value: 0x7f0a0020
- public const int Platform_V11_AppCompat = 2131361824;
+ // aapt resource value: 0x7F0D00A7
+ public const int Platform_ThemeOverlay_AppCompat = 2131558567;
- // aapt resource value: 0x7f0a0021
- public const int Platform_V11_AppCompat_Light = 2131361825;
+ // aapt resource value: 0x7F0D00A8
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131558568;
- // aapt resource value: 0x7f0a0028
- public const int Platform_V14_AppCompat = 2131361832;
+ // aapt resource value: 0x7F0D00A9
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131558569;
- // aapt resource value: 0x7f0a0029
- public const int Platform_V14_AppCompat_Light = 2131361833;
+ // aapt resource value: 0x7F0D00AA
+ public const int Platform_V11_AppCompat = 2131558570;
- // aapt resource value: 0x7f0a0082
- public const int Platform_V21_AppCompat = 2131361922;
+ // aapt resource value: 0x7F0D00AB
+ public const int Platform_V11_AppCompat_Light = 2131558571;
- // aapt resource value: 0x7f0a0083
- public const int Platform_V21_AppCompat_Light = 2131361923;
+ // aapt resource value: 0x7F0D00AC
+ public const int Platform_V14_AppCompat = 2131558572;
- // aapt resource value: 0x7f0a0097
- public const int Platform_V25_AppCompat = 2131361943;
+ // aapt resource value: 0x7F0D00AD
+ public const int Platform_V14_AppCompat_Light = 2131558573;
- // aapt resource value: 0x7f0a0098
- public const int Platform_V25_AppCompat_Light = 2131361944;
+ // aapt resource value: 0x7F0D00AE
+ public const int Platform_V21_AppCompat = 2131558574;
- // aapt resource value: 0x7f0a0022
- public const int Platform_Widget_AppCompat_Spinner = 2131361826;
+ // aapt resource value: 0x7F0D00AF
+ public const int Platform_V21_AppCompat_Light = 2131558575;
- // aapt resource value: 0x7f0a002b
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131361835;
+ // aapt resource value: 0x7F0D00B0
+ public const int Platform_V25_AppCompat = 2131558576;
- // aapt resource value: 0x7f0a002c
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131361836;
+ // aapt resource value: 0x7F0D00B1
+ public const int Platform_V25_AppCompat_Light = 2131558577;
- // aapt resource value: 0x7f0a002d
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131361837;
+ // aapt resource value: 0x7F0D00B2
+ public const int Platform_Widget_AppCompat_Spinner = 2131558578;
- // aapt resource value: 0x7f0a002e
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131361838;
+ // aapt resource value: 0x7F0D00B3
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131558579;
- // aapt resource value: 0x7f0a002f
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131361839;
+ // aapt resource value: 0x7F0D00B4
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131558580;
- // aapt resource value: 0x7f0a0030
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131361840;
+ // aapt resource value: 0x7F0D00B5
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131558581;
- // aapt resource value: 0x7f0a0031
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131361841;
+ // aapt resource value: 0x7F0D00B6
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131558582;
- // aapt resource value: 0x7f0a0032
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131361842;
+ // aapt resource value: 0x7F0D00B7
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131558583;
- // aapt resource value: 0x7f0a0033
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131361843;
+ // aapt resource value: 0x7F0D00B8
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131558584;
- // aapt resource value: 0x7f0a0034
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131361844;
+ // aapt resource value: 0x7F0D00BE
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131558590;
- // aapt resource value: 0x7f0a0035
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131361845;
+ // aapt resource value: 0x7F0D00B9
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131558585;
- // aapt resource value: 0x7f0a0036
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131361846;
+ // aapt resource value: 0x7F0D00BA
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131558586;
- // aapt resource value: 0x7f0a0037
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131361847;
+ // aapt resource value: 0x7F0D00BB
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131558587;
- // aapt resource value: 0x7f0a0038
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131361848;
+ // aapt resource value: 0x7F0D00BC
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131558588;
- // aapt resource value: 0x7f0a00cf
- public const int TextAppearance_AppCompat = 2131361999;
+ // aapt resource value: 0x7F0D00BD
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131558589;
- // aapt resource value: 0x7f0a00d0
- public const int TextAppearance_AppCompat_Body1 = 2131362000;
+ // aapt resource value: 0x7F0D00BF
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131558591;
- // aapt resource value: 0x7f0a00d1
- public const int TextAppearance_AppCompat_Body2 = 2131362001;
+ // aapt resource value: 0x7F0D00C0
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131558592;
- // aapt resource value: 0x7f0a00d2
- public const int TextAppearance_AppCompat_Button = 2131362002;
+ // aapt resource value: 0x7F0D00C1
+ public const int TextAppearance_AppCompat = 2131558593;
- // aapt resource value: 0x7f0a00d3
- public const int TextAppearance_AppCompat_Caption = 2131362003;
+ // aapt resource value: 0x7F0D00C2
+ public const int TextAppearance_AppCompat_Body1 = 2131558594;
- // aapt resource value: 0x7f0a00d4
- public const int TextAppearance_AppCompat_Display1 = 2131362004;
+ // aapt resource value: 0x7F0D00C3
+ public const int TextAppearance_AppCompat_Body2 = 2131558595;
- // aapt resource value: 0x7f0a00d5
- public const int TextAppearance_AppCompat_Display2 = 2131362005;
+ // aapt resource value: 0x7F0D00C4
+ public const int TextAppearance_AppCompat_Button = 2131558596;
- // aapt resource value: 0x7f0a00d6
- public const int TextAppearance_AppCompat_Display3 = 2131362006;
+ // aapt resource value: 0x7F0D00C5
+ public const int TextAppearance_AppCompat_Caption = 2131558597;
- // aapt resource value: 0x7f0a00d7
- public const int TextAppearance_AppCompat_Display4 = 2131362007;
+ // aapt resource value: 0x7F0D00C6
+ public const int TextAppearance_AppCompat_Display1 = 2131558598;
- // aapt resource value: 0x7f0a00d8
- public const int TextAppearance_AppCompat_Headline = 2131362008;
+ // aapt resource value: 0x7F0D00C7
+ public const int TextAppearance_AppCompat_Display2 = 2131558599;
- // aapt resource value: 0x7f0a00d9
- public const int TextAppearance_AppCompat_Inverse = 2131362009;
+ // aapt resource value: 0x7F0D00C8
+ public const int TextAppearance_AppCompat_Display3 = 2131558600;
- // aapt resource value: 0x7f0a00da
- public const int TextAppearance_AppCompat_Large = 2131362010;
+ // aapt resource value: 0x7F0D00C9
+ public const int TextAppearance_AppCompat_Display4 = 2131558601;
- // aapt resource value: 0x7f0a00db
- public const int TextAppearance_AppCompat_Large_Inverse = 2131362011;
+ // aapt resource value: 0x7F0D00CA
+ public const int TextAppearance_AppCompat_Headline = 2131558602;
- // aapt resource value: 0x7f0a00dc
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131362012;
+ // aapt resource value: 0x7F0D00CB
+ public const int TextAppearance_AppCompat_Inverse = 2131558603;
- // aapt resource value: 0x7f0a00dd
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131362013;
+ // aapt resource value: 0x7F0D00CC
+ public const int TextAppearance_AppCompat_Large = 2131558604;
- // aapt resource value: 0x7f0a00de
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131362014;
+ // aapt resource value: 0x7F0D00CD
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131558605;
- // aapt resource value: 0x7f0a00df
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131362015;
+ // aapt resource value: 0x7F0D00CE
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131558606;
- // aapt resource value: 0x7f0a00e0
- public const int TextAppearance_AppCompat_Medium = 2131362016;
+ // aapt resource value: 0x7F0D00CF
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131558607;
- // aapt resource value: 0x7f0a00e1
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131362017;
+ // aapt resource value: 0x7F0D00D0
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131558608;
- // aapt resource value: 0x7f0a00e2
- public const int TextAppearance_AppCompat_Menu = 2131362018;
+ // aapt resource value: 0x7F0D00D1
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131558609;
- // aapt resource value: 0x7f0a0084
- public const int TextAppearance_AppCompat_Notification = 2131361924;
+ // aapt resource value: 0x7F0D00D2
+ public const int TextAppearance_AppCompat_Medium = 2131558610;
- // aapt resource value: 0x7f0a0085
- public const int TextAppearance_AppCompat_Notification_Info = 2131361925;
+ // aapt resource value: 0x7F0D00D3
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131558611;
- // aapt resource value: 0x7f0a0086
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131361926;
+ // aapt resource value: 0x7F0D00D4
+ public const int TextAppearance_AppCompat_Menu = 2131558612;
- // aapt resource value: 0x7f0a00e3
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131362019;
+ // aapt resource value: 0x7F0D00D5
+ public const int TextAppearance_AppCompat_Notification = 2131558613;
- // aapt resource value: 0x7f0a00e4
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131362020;
+ // aapt resource value: 0x7F0D00D6
+ public const int TextAppearance_AppCompat_Notification_Info = 2131558614;
- // aapt resource value: 0x7f0a0087
- public const int TextAppearance_AppCompat_Notification_Media = 2131361927;
+ // aapt resource value: 0x7F0D00D7
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131558615;
- // aapt resource value: 0x7f0a0088
- public const int TextAppearance_AppCompat_Notification_Time = 2131361928;
+ // aapt resource value: 0x7F0D00D8
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131558616;
- // aapt resource value: 0x7f0a0089
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131361929;
+ // aapt resource value: 0x7F0D00D9
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131558617;
- // aapt resource value: 0x7f0a008a
- public const int TextAppearance_AppCompat_Notification_Title = 2131361930;
+ // aapt resource value: 0x7F0D00DA
+ public const int TextAppearance_AppCompat_Notification_Media = 2131558618;
- // aapt resource value: 0x7f0a008b
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131361931;
+ // aapt resource value: 0x7F0D00DB
+ public const int TextAppearance_AppCompat_Notification_Time = 2131558619;
- // aapt resource value: 0x7f0a00e5
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131362021;
+ // aapt resource value: 0x7F0D00DC
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131558620;
- // aapt resource value: 0x7f0a00e6
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131362022;
+ // aapt resource value: 0x7F0D00DD
+ public const int TextAppearance_AppCompat_Notification_Title = 2131558621;
- // aapt resource value: 0x7f0a00e7
- public const int TextAppearance_AppCompat_Small = 2131362023;
+ // aapt resource value: 0x7F0D00DE
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131558622;
- // aapt resource value: 0x7f0a00e8
- public const int TextAppearance_AppCompat_Small_Inverse = 2131362024;
+ // aapt resource value: 0x7F0D00DF
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131558623;
- // aapt resource value: 0x7f0a00e9
- public const int TextAppearance_AppCompat_Subhead = 2131362025;
+ // aapt resource value: 0x7F0D00E0
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131558624;
- // aapt resource value: 0x7f0a00ea
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131362026;
+ // aapt resource value: 0x7F0D00E1
+ public const int TextAppearance_AppCompat_Small = 2131558625;
- // aapt resource value: 0x7f0a00eb
- public const int TextAppearance_AppCompat_Title = 2131362027;
+ // aapt resource value: 0x7F0D00E2
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131558626;
- // aapt resource value: 0x7f0a00ec
- public const int TextAppearance_AppCompat_Title_Inverse = 2131362028;
+ // aapt resource value: 0x7F0D00E3
+ public const int TextAppearance_AppCompat_Subhead = 2131558627;
- // aapt resource value: 0x7f0a002a
- public const int TextAppearance_AppCompat_Tooltip = 2131361834;
+ // aapt resource value: 0x7F0D00E4
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131558628;
- // aapt resource value: 0x7f0a00ed
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131362029;
+ // aapt resource value: 0x7F0D00E5
+ public const int TextAppearance_AppCompat_Title = 2131558629;
- // aapt resource value: 0x7f0a00ee
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131362030;
+ // aapt resource value: 0x7F0D00E6
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131558630;
- // aapt resource value: 0x7f0a00ef
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131362031;
+ // aapt resource value: 0x7F0D00E7
+ public const int TextAppearance_AppCompat_Tooltip = 2131558631;
- // aapt resource value: 0x7f0a00f0
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131362032;
+ // aapt resource value: 0x7F0D00E8
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131558632;
- // aapt resource value: 0x7f0a00f1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131362033;
+ // aapt resource value: 0x7F0D00E9
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131558633;
- // aapt resource value: 0x7f0a00f2
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131362034;
+ // aapt resource value: 0x7F0D00EA
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131558634;
- // aapt resource value: 0x7f0a00f3
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131362035;
+ // aapt resource value: 0x7F0D00EB
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131558635;
- // aapt resource value: 0x7f0a00f4
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131362036;
+ // aapt resource value: 0x7F0D00EC
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131558636;
- // aapt resource value: 0x7f0a00f5
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131362037;
+ // aapt resource value: 0x7F0D00ED
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131558637;
- // aapt resource value: 0x7f0a00f6
- public const int TextAppearance_AppCompat_Widget_Button = 2131362038;
+ // aapt resource value: 0x7F0D00EE
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131558638;
- // aapt resource value: 0x7f0a00f7
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131362039;
+ // aapt resource value: 0x7F0D00EF
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131558639;
- // aapt resource value: 0x7f0a00f8
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131362040;
+ // aapt resource value: 0x7F0D00F0
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131558640;
- // aapt resource value: 0x7f0a00f9
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131362041;
+ // aapt resource value: 0x7F0D00F1
+ public const int TextAppearance_AppCompat_Widget_Button = 2131558641;
- // aapt resource value: 0x7f0a00fa
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131362042;
+ // aapt resource value: 0x7F0D00F2
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131558642;
- // aapt resource value: 0x7f0a00fb
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131362043;
+ // aapt resource value: 0x7F0D00F3
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131558643;
- // aapt resource value: 0x7f0a00fc
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131362044;
+ // aapt resource value: 0x7F0D00F4
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131558644;
- // aapt resource value: 0x7f0a00fd
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131362045;
+ // aapt resource value: 0x7F0D00F5
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131558645;
- // aapt resource value: 0x7f0a00fe
- public const int TextAppearance_AppCompat_Widget_Switch = 2131362046;
+ // aapt resource value: 0x7F0D00F6
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131558646;
- // aapt resource value: 0x7f0a00ff
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131362047;
+ // aapt resource value: 0x7F0D00F7
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131558647;
- // aapt resource value: 0x7f0a0165
- public const int TextAppearance_Compat_Notification = 2131362149;
+ // aapt resource value: 0x7F0D00F8
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131558648;
- // aapt resource value: 0x7f0a0166
- public const int TextAppearance_Compat_Notification_Info = 2131362150;
+ // aapt resource value: 0x7F0D00F9
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131558649;
- // aapt resource value: 0x7f0a0160
- public const int TextAppearance_Compat_Notification_Info_Media = 2131362144;
+ // aapt resource value: 0x7F0D00FA
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131558650;
- // aapt resource value: 0x7f0a016b
- public const int TextAppearance_Compat_Notification_Line2 = 2131362155;
+ // aapt resource value: 0x7F0D00FB
+ public const int TextAppearance_Compat_Notification = 2131558651;
- // aapt resource value: 0x7f0a0164
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131362148;
+ // aapt resource value: 0x7F0D00FC
+ public const int TextAppearance_Compat_Notification_Info = 2131558652;
- // aapt resource value: 0x7f0a0161
- public const int TextAppearance_Compat_Notification_Media = 2131362145;
+ // aapt resource value: 0x7F0D00FD
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131558653;
- // aapt resource value: 0x7f0a0167
- public const int TextAppearance_Compat_Notification_Time = 2131362151;
+ // aapt resource value: 0x7F0D00FE
+ public const int TextAppearance_Compat_Notification_Line2 = 2131558654;
- // aapt resource value: 0x7f0a0162
- public const int TextAppearance_Compat_Notification_Time_Media = 2131362146;
+ // aapt resource value: 0x7F0D00FF
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131558655;
- // aapt resource value: 0x7f0a0168
- public const int TextAppearance_Compat_Notification_Title = 2131362152;
+ // aapt resource value: 0x7F0D0100
+ public const int TextAppearance_Compat_Notification_Media = 2131558656;
- // aapt resource value: 0x7f0a0163
- public const int TextAppearance_Compat_Notification_Title_Media = 2131362147;
+ // aapt resource value: 0x7F0D0101
+ public const int TextAppearance_Compat_Notification_Time = 2131558657;
- // aapt resource value: 0x7f0a0100
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131362048;
+ // aapt resource value: 0x7F0D0102
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131558658;
- // aapt resource value: 0x7f0a0101
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131362049;
+ // aapt resource value: 0x7F0D0103
+ public const int TextAppearance_Compat_Notification_Title = 2131558659;
- // aapt resource value: 0x7f0a0102
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131362050;
+ // aapt resource value: 0x7F0D0104
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131558660;
- // aapt resource value: 0x7f0a0103
- public const int Theme_AppCompat = 2131362051;
+ // aapt resource value: 0x7F0D0105
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131558661;
- // aapt resource value: 0x7f0a0104
- public const int Theme_AppCompat_CompactMenu = 2131362052;
+ // aapt resource value: 0x7F0D0106
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131558662;
- // aapt resource value: 0x7f0a0004
- public const int Theme_AppCompat_DayNight = 2131361796;
+ // aapt resource value: 0x7F0D0107
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131558663;
- // aapt resource value: 0x7f0a0005
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131361797;
+ // aapt resource value: 0x7F0D011E
+ public const int ThemeOverlay_AppCompat = 2131558686;
- // aapt resource value: 0x7f0a0006
- public const int Theme_AppCompat_DayNight_Dialog = 2131361798;
+ // aapt resource value: 0x7F0D011F
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131558687;
- // aapt resource value: 0x7f0a0007
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131361799;
+ // aapt resource value: 0x7F0D0120
+ public const int ThemeOverlay_AppCompat_Dark = 2131558688;
- // aapt resource value: 0x7f0a0008
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131361800;
+ // aapt resource value: 0x7F0D0121
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131558689;
- // aapt resource value: 0x7f0a0009
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131361801;
+ // aapt resource value: 0x7F0D0122
+ public const int ThemeOverlay_AppCompat_Dialog = 2131558690;
- // aapt resource value: 0x7f0a000a
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131361802;
+ // aapt resource value: 0x7F0D0123
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131558691;
- // aapt resource value: 0x7f0a0105
- public const int Theme_AppCompat_Dialog = 2131362053;
+ // aapt resource value: 0x7F0D0124
+ public const int ThemeOverlay_AppCompat_Light = 2131558692;
- // aapt resource value: 0x7f0a0106
- public const int Theme_AppCompat_Dialog_Alert = 2131362054;
+ // aapt resource value: 0x7F0D0108
+ public const int Theme_AppCompat = 2131558664;
- // aapt resource value: 0x7f0a0107
- public const int Theme_AppCompat_Dialog_MinWidth = 2131362055;
+ // aapt resource value: 0x7F0D0109
+ public const int Theme_AppCompat_CompactMenu = 2131558665;
- // aapt resource value: 0x7f0a0108
- public const int Theme_AppCompat_DialogWhenLarge = 2131362056;
+ // aapt resource value: 0x7F0D010A
+ public const int Theme_AppCompat_DayNight = 2131558666;
- // aapt resource value: 0x7f0a0109
- public const int Theme_AppCompat_Light = 2131362057;
+ // aapt resource value: 0x7F0D010B
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131558667;
- // aapt resource value: 0x7f0a010a
- public const int Theme_AppCompat_Light_DarkActionBar = 2131362058;
+ // aapt resource value: 0x7F0D010C
+ public const int Theme_AppCompat_DayNight_Dialog = 2131558668;
- // aapt resource value: 0x7f0a010b
- public const int Theme_AppCompat_Light_Dialog = 2131362059;
+ // aapt resource value: 0x7F0D010F
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131558671;
- // aapt resource value: 0x7f0a010c
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131362060;
+ // aapt resource value: 0x7F0D010D
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131558669;
- // aapt resource value: 0x7f0a010d
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131362061;
+ // aapt resource value: 0x7F0D010E
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131558670;
- // aapt resource value: 0x7f0a010e
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131362062;
+ // aapt resource value: 0x7F0D0110
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131558672;
- // aapt resource value: 0x7f0a010f
- public const int Theme_AppCompat_Light_NoActionBar = 2131362063;
+ // aapt resource value: 0x7F0D0111
+ public const int Theme_AppCompat_Dialog = 2131558673;
- // aapt resource value: 0x7f0a0110
- public const int Theme_AppCompat_NoActionBar = 2131362064;
+ // aapt resource value: 0x7F0D0114
+ public const int Theme_AppCompat_DialogWhenLarge = 2131558676;
- // aapt resource value: 0x7f0a016d
- public const int Theme_BiometricPromptDialog = 2131362157;
+ // aapt resource value: 0x7F0D0112
+ public const int Theme_AppCompat_Dialog_Alert = 2131558674;
- // aapt resource value: 0x7f0a0111
- public const int ThemeOverlay_AppCompat = 2131362065;
+ // aapt resource value: 0x7F0D0113
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131558675;
- // aapt resource value: 0x7f0a0112
- public const int ThemeOverlay_AppCompat_ActionBar = 2131362066;
+ // aapt resource value: 0x7F0D0115
+ public const int Theme_AppCompat_Light = 2131558677;
- // aapt resource value: 0x7f0a0113
- public const int ThemeOverlay_AppCompat_Dark = 2131362067;
+ // aapt resource value: 0x7F0D0116
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131558678;
- // aapt resource value: 0x7f0a0114
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131362068;
+ // aapt resource value: 0x7F0D0117
+ public const int Theme_AppCompat_Light_Dialog = 2131558679;
- // aapt resource value: 0x7f0a0115
- public const int ThemeOverlay_AppCompat_Dialog = 2131362069;
+ // aapt resource value: 0x7F0D011A
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131558682;
- // aapt resource value: 0x7f0a0116
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131362070;
+ // aapt resource value: 0x7F0D0118
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131558680;
- // aapt resource value: 0x7f0a0117
- public const int ThemeOverlay_AppCompat_Light = 2131362071;
+ // aapt resource value: 0x7F0D0119
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131558681;
- // aapt resource value: 0x7f0a0118
- public const int Widget_AppCompat_ActionBar = 2131362072;
+ // aapt resource value: 0x7F0D011B
+ public const int Theme_AppCompat_Light_NoActionBar = 2131558683;
- // aapt resource value: 0x7f0a0119
- public const int Widget_AppCompat_ActionBar_Solid = 2131362073;
+ // aapt resource value: 0x7F0D011C
+ public const int Theme_AppCompat_NoActionBar = 2131558684;
- // aapt resource value: 0x7f0a011a
- public const int Widget_AppCompat_ActionBar_TabBar = 2131362074;
+ // aapt resource value: 0x7F0D011D
+ public const int Theme_BiometricPromptDialog = 2131558685;
- // aapt resource value: 0x7f0a011b
- public const int Widget_AppCompat_ActionBar_TabText = 2131362075;
+ // aapt resource value: 0x7F0D0125
+ public const int Widget_AppCompat_ActionBar = 2131558693;
- // aapt resource value: 0x7f0a011c
- public const int Widget_AppCompat_ActionBar_TabView = 2131362076;
+ // aapt resource value: 0x7F0D0126
+ public const int Widget_AppCompat_ActionBar_Solid = 2131558694;
- // aapt resource value: 0x7f0a011d
- public const int Widget_AppCompat_ActionButton = 2131362077;
+ // aapt resource value: 0x7F0D0127
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131558695;
- // aapt resource value: 0x7f0a011e
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131362078;
+ // aapt resource value: 0x7F0D0128
+ public const int Widget_AppCompat_ActionBar_TabText = 2131558696;
- // aapt resource value: 0x7f0a011f
- public const int Widget_AppCompat_ActionButton_Overflow = 2131362079;
+ // aapt resource value: 0x7F0D0129
+ public const int Widget_AppCompat_ActionBar_TabView = 2131558697;
- // aapt resource value: 0x7f0a0120
- public const int Widget_AppCompat_ActionMode = 2131362080;
+ // aapt resource value: 0x7F0D012A
+ public const int Widget_AppCompat_ActionButton = 2131558698;
- // aapt resource value: 0x7f0a0121
- public const int Widget_AppCompat_ActivityChooserView = 2131362081;
+ // aapt resource value: 0x7F0D012B
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131558699;
- // aapt resource value: 0x7f0a0122
- public const int Widget_AppCompat_AutoCompleteTextView = 2131362082;
+ // aapt resource value: 0x7F0D012C
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131558700;
- // aapt resource value: 0x7f0a0123
- public const int Widget_AppCompat_Button = 2131362083;
+ // aapt resource value: 0x7F0D012D
+ public const int Widget_AppCompat_ActionMode = 2131558701;
- // aapt resource value: 0x7f0a0124
- public const int Widget_AppCompat_Button_Borderless = 2131362084;
+ // aapt resource value: 0x7F0D012E
+ public const int Widget_AppCompat_ActivityChooserView = 2131558702;
- // aapt resource value: 0x7f0a0125
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131362085;
+ // aapt resource value: 0x7F0D012F
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131558703;
- // aapt resource value: 0x7f0a0126
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131362086;
+ // aapt resource value: 0x7F0D0130
+ public const int Widget_AppCompat_Button = 2131558704;
- // aapt resource value: 0x7f0a0127
- public const int Widget_AppCompat_Button_Colored = 2131362087;
+ // aapt resource value: 0x7F0D0136
+ public const int Widget_AppCompat_ButtonBar = 2131558710;
- // aapt resource value: 0x7f0a0128
- public const int Widget_AppCompat_Button_Small = 2131362088;
+ // aapt resource value: 0x7F0D0137
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131558711;
- // aapt resource value: 0x7f0a0129
- public const int Widget_AppCompat_ButtonBar = 2131362089;
+ // aapt resource value: 0x7F0D0131
+ public const int Widget_AppCompat_Button_Borderless = 2131558705;
- // aapt resource value: 0x7f0a012a
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131362090;
+ // aapt resource value: 0x7F0D0132
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131558706;
- // aapt resource value: 0x7f0a012b
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131362091;
+ // aapt resource value: 0x7F0D0133
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131558707;
- // aapt resource value: 0x7f0a012c
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131362092;
+ // aapt resource value: 0x7F0D0134
+ public const int Widget_AppCompat_Button_Colored = 2131558708;
- // aapt resource value: 0x7f0a012d
- public const int Widget_AppCompat_CompoundButton_Switch = 2131362093;
+ // aapt resource value: 0x7F0D0135
+ public const int Widget_AppCompat_Button_Small = 2131558709;
- // aapt resource value: 0x7f0a012e
- public const int Widget_AppCompat_DrawerArrowToggle = 2131362094;
+ // aapt resource value: 0x7F0D0138
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131558712;
- // aapt resource value: 0x7f0a012f
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131362095;
+ // aapt resource value: 0x7F0D0139
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131558713;
- // aapt resource value: 0x7f0a0130
- public const int Widget_AppCompat_EditText = 2131362096;
+ // aapt resource value: 0x7F0D013A
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131558714;
- // aapt resource value: 0x7f0a0131
- public const int Widget_AppCompat_ImageButton = 2131362097;
+ // aapt resource value: 0x7F0D013B
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131558715;
- // aapt resource value: 0x7f0a0132
- public const int Widget_AppCompat_Light_ActionBar = 2131362098;
+ // aapt resource value: 0x7F0D013C
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131558716;
- // aapt resource value: 0x7f0a0133
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131362099;
+ // aapt resource value: 0x7F0D013D
+ public const int Widget_AppCompat_EditText = 2131558717;
- // aapt resource value: 0x7f0a0134
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131362100;
+ // aapt resource value: 0x7F0D013E
+ public const int Widget_AppCompat_ImageButton = 2131558718;
- // aapt resource value: 0x7f0a0135
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131362101;
+ // aapt resource value: 0x7F0D013F
+ public const int Widget_AppCompat_Light_ActionBar = 2131558719;
- // aapt resource value: 0x7f0a0136
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131362102;
+ // aapt resource value: 0x7F0D0140
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131558720;
- // aapt resource value: 0x7f0a0137
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131362103;
+ // aapt resource value: 0x7F0D0141
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131558721;
- // aapt resource value: 0x7f0a0138
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131362104;
+ // aapt resource value: 0x7F0D0142
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131558722;
- // aapt resource value: 0x7f0a0139
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131362105;
+ // aapt resource value: 0x7F0D0143
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131558723;
- // aapt resource value: 0x7f0a013a
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131362106;
+ // aapt resource value: 0x7F0D0144
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131558724;
- // aapt resource value: 0x7f0a013b
- public const int Widget_AppCompat_Light_ActionButton = 2131362107;
+ // aapt resource value: 0x7F0D0145
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131558725;
- // aapt resource value: 0x7f0a013c
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131362108;
+ // aapt resource value: 0x7F0D0146
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131558726;
- // aapt resource value: 0x7f0a013d
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131362109;
+ // aapt resource value: 0x7F0D0147
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131558727;
- // aapt resource value: 0x7f0a013e
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131362110;
+ // aapt resource value: 0x7F0D0148
+ public const int Widget_AppCompat_Light_ActionButton = 2131558728;
- // aapt resource value: 0x7f0a013f
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131362111;
+ // aapt resource value: 0x7F0D0149
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131558729;
- // aapt resource value: 0x7f0a0140
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131362112;
+ // aapt resource value: 0x7F0D014A
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131558730;
- // aapt resource value: 0x7f0a0141
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131362113;
+ // aapt resource value: 0x7F0D014B
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131558731;
- // aapt resource value: 0x7f0a0142
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131362114;
+ // aapt resource value: 0x7F0D014C
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131558732;
- // aapt resource value: 0x7f0a0143
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131362115;
+ // aapt resource value: 0x7F0D014D
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131558733;
- // aapt resource value: 0x7f0a0144
- public const int Widget_AppCompat_Light_PopupMenu = 2131362116;
+ // aapt resource value: 0x7F0D014E
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131558734;
- // aapt resource value: 0x7f0a0145
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131362117;
+ // aapt resource value: 0x7F0D014F
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131558735;
- // aapt resource value: 0x7f0a0146
- public const int Widget_AppCompat_Light_SearchView = 2131362118;
+ // aapt resource value: 0x7F0D0150
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131558736;
- // aapt resource value: 0x7f0a0147
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131362119;
+ // aapt resource value: 0x7F0D0151
+ public const int Widget_AppCompat_Light_PopupMenu = 2131558737;
- // aapt resource value: 0x7f0a0148
- public const int Widget_AppCompat_ListMenuView = 2131362120;
+ // aapt resource value: 0x7F0D0152
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131558738;
- // aapt resource value: 0x7f0a0149
- public const int Widget_AppCompat_ListPopupWindow = 2131362121;
+ // aapt resource value: 0x7F0D0153
+ public const int Widget_AppCompat_Light_SearchView = 2131558739;
- // aapt resource value: 0x7f0a014a
- public const int Widget_AppCompat_ListView = 2131362122;
+ // aapt resource value: 0x7F0D0154
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131558740;
- // aapt resource value: 0x7f0a014b
- public const int Widget_AppCompat_ListView_DropDown = 2131362123;
+ // aapt resource value: 0x7F0D0155
+ public const int Widget_AppCompat_ListMenuView = 2131558741;
- // aapt resource value: 0x7f0a014c
- public const int Widget_AppCompat_ListView_Menu = 2131362124;
+ // aapt resource value: 0x7F0D0156
+ public const int Widget_AppCompat_ListPopupWindow = 2131558742;
- // aapt resource value: 0x7f0a014d
- public const int Widget_AppCompat_PopupMenu = 2131362125;
+ // aapt resource value: 0x7F0D0157
+ public const int Widget_AppCompat_ListView = 2131558743;
- // aapt resource value: 0x7f0a014e
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131362126;
+ // aapt resource value: 0x7F0D0158
+ public const int Widget_AppCompat_ListView_DropDown = 2131558744;
- // aapt resource value: 0x7f0a014f
- public const int Widget_AppCompat_PopupWindow = 2131362127;
+ // aapt resource value: 0x7F0D0159
+ public const int Widget_AppCompat_ListView_Menu = 2131558745;
- // aapt resource value: 0x7f0a0150
- public const int Widget_AppCompat_ProgressBar = 2131362128;
+ // aapt resource value: 0x7F0D015A
+ public const int Widget_AppCompat_PopupMenu = 2131558746;
- // aapt resource value: 0x7f0a0151
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131362129;
+ // aapt resource value: 0x7F0D015B
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131558747;
- // aapt resource value: 0x7f0a0152
- public const int Widget_AppCompat_RatingBar = 2131362130;
+ // aapt resource value: 0x7F0D015C
+ public const int Widget_AppCompat_PopupWindow = 2131558748;
- // aapt resource value: 0x7f0a0153
- public const int Widget_AppCompat_RatingBar_Indicator = 2131362131;
+ // aapt resource value: 0x7F0D015D
+ public const int Widget_AppCompat_ProgressBar = 2131558749;
- // aapt resource value: 0x7f0a0154
- public const int Widget_AppCompat_RatingBar_Small = 2131362132;
+ // aapt resource value: 0x7F0D015E
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131558750;
- // aapt resource value: 0x7f0a0155
- public const int Widget_AppCompat_SearchView = 2131362133;
+ // aapt resource value: 0x7F0D015F
+ public const int Widget_AppCompat_RatingBar = 2131558751;
- // aapt resource value: 0x7f0a0156
- public const int Widget_AppCompat_SearchView_ActionBar = 2131362134;
+ // aapt resource value: 0x7F0D0160
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131558752;
- // aapt resource value: 0x7f0a0157
- public const int Widget_AppCompat_SeekBar = 2131362135;
+ // aapt resource value: 0x7F0D0161
+ public const int Widget_AppCompat_RatingBar_Small = 2131558753;
- // aapt resource value: 0x7f0a0158
- public const int Widget_AppCompat_SeekBar_Discrete = 2131362136;
+ // aapt resource value: 0x7F0D0162
+ public const int Widget_AppCompat_SearchView = 2131558754;
- // aapt resource value: 0x7f0a0159
- public const int Widget_AppCompat_Spinner = 2131362137;
+ // aapt resource value: 0x7F0D0163
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131558755;
- // aapt resource value: 0x7f0a015a
- public const int Widget_AppCompat_Spinner_DropDown = 2131362138;
+ // aapt resource value: 0x7F0D0164
+ public const int Widget_AppCompat_SeekBar = 2131558756;
- // aapt resource value: 0x7f0a015b
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131362139;
+ // aapt resource value: 0x7F0D0165
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131558757;
- // aapt resource value: 0x7f0a015c
- public const int Widget_AppCompat_Spinner_Underlined = 2131362140;
+ // aapt resource value: 0x7F0D0166
+ public const int Widget_AppCompat_Spinner = 2131558758;
- // aapt resource value: 0x7f0a015d
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131362141;
+ // aapt resource value: 0x7F0D0167
+ public const int Widget_AppCompat_Spinner_DropDown = 2131558759;
- // aapt resource value: 0x7f0a015e
- public const int Widget_AppCompat_Toolbar = 2131362142;
+ // aapt resource value: 0x7F0D0168
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131558760;
- // aapt resource value: 0x7f0a015f
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131362143;
+ // aapt resource value: 0x7F0D0169
+ public const int Widget_AppCompat_Spinner_Underlined = 2131558761;
- // aapt resource value: 0x7f0a0169
- public const int Widget_Compat_NotificationActionContainer = 2131362153;
+ // aapt resource value: 0x7F0D016A
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131558762;
- // aapt resource value: 0x7f0a016a
- public const int Widget_Compat_NotificationActionText = 2131362154;
+ // aapt resource value: 0x7F0D016B
+ public const int Widget_AppCompat_Toolbar = 2131558763;
- // aapt resource value: 0x7f0a016e
- public const int custom_dialog2 = 2131362158;
+ // aapt resource value: 0x7F0D016C
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131558764;
- // aapt resource value: 0x7f0a016f
- public const int picker_view_scale_anim = 2131362159;
+ // aapt resource value: 0x7F0D016D
+ public const int Widget_Compat_NotificationActionContainer = 2131558765;
- // aapt resource value: 0x7f0a0170
- public const int picker_view_slide_anim = 2131362160;
+ // aapt resource value: 0x7F0D016E
+ public const int Widget_Compat_NotificationActionText = 2131558766;
static Style()
{
@@ -4667,204 +4667,193 @@
}
}
- public partial class Xml
- {
-
- // aapt resource value: 0x7f060000
- public const int file_paths = 2131099648;
-
- // aapt resource value: 0x7f060001
- public const int hdl_filepaths = 2131099649;
-
- static Xml()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Xml()
- {
- }
- }
-
public partial class Styleable
{
+ // aapt resource value: { 0x7F030042,0x7F030043,0x7F030044,0x7F030068,0x7F030069,0x7F03006A,0x7F03006B,0x7F03006C,0x7F03006D,0x7F030074,0x7F030078,0x7F030079,0x7F030084,0x7F030098,0x7F030099,0x7F03009A,0x7F03009B,0x7F03009C,0x7F0300A1,0x7F0300A4,0x7F0300B4,0x7F0300BB,0x7F0300C6,0x7F0300C9,0x7F0300CA,0x7F03012A,0x7F03012D,0x7F030148,0x7F030151 }
public static int[] ActionBar = new int[] {
- 2130771978,
- 2130771980,
- 2130771981,
- 2130771982,
- 2130771983,
- 2130771984,
- 2130771985,
- 2130771986,
- 2130771987,
- 2130771988,
- 2130771989,
- 2130771990,
- 2130771991,
- 2130771992,
- 2130771993,
- 2130771994,
- 2130771995,
- 2130771996,
- 2130771997,
- 2130771998,
- 2130771999,
- 2130772000,
- 2130772001,
- 2130772002,
- 2130772003,
- 2130772004,
- 2130772005,
- 2130772006,
- 2130772076};
+ 2130903106,
+ 2130903107,
+ 2130903108,
+ 2130903144,
+ 2130903145,
+ 2130903146,
+ 2130903147,
+ 2130903148,
+ 2130903149,
+ 2130903156,
+ 2130903160,
+ 2130903161,
+ 2130903172,
+ 2130903192,
+ 2130903193,
+ 2130903194,
+ 2130903195,
+ 2130903196,
+ 2130903201,
+ 2130903204,
+ 2130903220,
+ 2130903227,
+ 2130903238,
+ 2130903241,
+ 2130903242,
+ 2130903338,
+ 2130903341,
+ 2130903368,
+ 2130903377};
- // aapt resource value: 10
- public const int ActionBar_background = 10;
-
- // aapt resource value: 12
- public const int ActionBar_backgroundSplit = 12;
-
- // aapt resource value: 11
- public const int ActionBar_backgroundStacked = 11;
-
- // aapt resource value: 21
- public const int ActionBar_contentInsetEnd = 21;
-
- // aapt resource value: 25
- public const int ActionBar_contentInsetEndWithActions = 25;
-
- // aapt resource value: 22
- public const int ActionBar_contentInsetLeft = 22;
-
- // aapt resource value: 23
- public const int ActionBar_contentInsetRight = 23;
-
- // aapt resource value: 20
- public const int ActionBar_contentInsetStart = 20;
-
- // aapt resource value: 24
- public const int ActionBar_contentInsetStartWithNavigation = 24;
-
- // aapt resource value: 13
- public const int ActionBar_customNavigationLayout = 13;
-
- // aapt resource value: 3
- public const int ActionBar_displayOptions = 3;
-
- // aapt resource value: 9
- public const int ActionBar_divider = 9;
-
- // aapt resource value: 26
- public const int ActionBar_elevation = 26;
-
- // aapt resource value: 0
- public const int ActionBar_height = 0;
-
- // aapt resource value: 19
- public const int ActionBar_hideOnContentScroll = 19;
-
- // aapt resource value: 28
- public const int ActionBar_homeAsUpIndicator = 28;
-
- // aapt resource value: 14
- public const int ActionBar_homeLayout = 14;
-
- // aapt resource value: 7
- public const int ActionBar_icon = 7;
-
- // aapt resource value: 16
- public const int ActionBar_indeterminateProgressStyle = 16;
-
- // aapt resource value: 18
- public const int ActionBar_itemPadding = 18;
-
- // aapt resource value: 8
- public const int ActionBar_logo = 8;
-
- // aapt resource value: 2
- public const int ActionBar_navigationMode = 2;
-
- // aapt resource value: 27
- public const int ActionBar_popupTheme = 27;
-
- // aapt resource value: 17
- public const int ActionBar_progressBarPadding = 17;
-
- // aapt resource value: 15
- public const int ActionBar_progressBarStyle = 15;
-
- // aapt resource value: 4
- public const int ActionBar_subtitle = 4;
-
- // aapt resource value: 6
- public const int ActionBar_subtitleTextStyle = 6;
-
- // aapt resource value: 1
- public const int ActionBar_title = 1;
-
- // aapt resource value: 5
- public const int ActionBar_titleTextStyle = 5;
-
+ // aapt resource value: { 0x10100B3 }
public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
+ // aapt resource value: 0
+ public const int ActionBar_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionBar_backgroundSplit = 1;
+
+ // aapt resource value: 2
+ public const int ActionBar_backgroundStacked = 2;
+
+ // aapt resource value: 3
+ public const int ActionBar_contentInsetEnd = 3;
+
+ // aapt resource value: 4
+ public const int ActionBar_contentInsetEndWithActions = 4;
+
+ // aapt resource value: 5
+ public const int ActionBar_contentInsetLeft = 5;
+
+ // aapt resource value: 6
+ public const int ActionBar_contentInsetRight = 6;
+
+ // aapt resource value: 7
+ public const int ActionBar_contentInsetStart = 7;
+
+ // aapt resource value: 8
+ public const int ActionBar_contentInsetStartWithNavigation = 8;
+
+ // aapt resource value: 9
+ public const int ActionBar_customNavigationLayout = 9;
+
+ // aapt resource value: 10
+ public const int ActionBar_displayOptions = 10;
+
+ // aapt resource value: 11
+ public const int ActionBar_divider = 11;
+
+ // aapt resource value: 12
+ public const int ActionBar_elevation = 12;
+
+ // aapt resource value: 13
+ public const int ActionBar_height = 13;
+
+ // aapt resource value: 14
+ public const int ActionBar_hideOnContentScroll = 14;
+
+ // aapt resource value: 15
+ public const int ActionBar_homeAsUpIndicator = 15;
+
+ // aapt resource value: 16
+ public const int ActionBar_homeLayout = 16;
+
+ // aapt resource value: 17
+ public const int ActionBar_icon = 17;
+
+ // aapt resource value: 18
+ public const int ActionBar_indeterminateProgressStyle = 18;
+
+ // aapt resource value: 19
+ public const int ActionBar_itemPadding = 19;
+
+ // aapt resource value: 20
+ public const int ActionBar_logo = 20;
+
+ // aapt resource value: 21
+ public const int ActionBar_navigationMode = 21;
+
+ // aapt resource value: 22
+ public const int ActionBar_popupTheme = 22;
+
+ // aapt resource value: 23
+ public const int ActionBar_progressBarPadding = 23;
+
+ // aapt resource value: 24
+ public const int ActionBar_progressBarStyle = 24;
+
+ // aapt resource value: 25
+ public const int ActionBar_subtitle = 25;
+
+ // aapt resource value: 26
+ public const int ActionBar_subtitleTextStyle = 26;
+
+ // aapt resource value: 27
+ public const int ActionBar_title = 27;
+
+ // aapt resource value: 28
+ public const int ActionBar_titleTextStyle = 28;
+
+ // aapt resource value: { 0x101013F }
public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
public const int ActionMenuItemView_android_minWidth = 0;
- public static int[] ActionMenuView;
+ // aapt resource value: { 0xFFFFFFFF }
+ public static int[] ActionMenuView = new int[] {
+ -1};
+ // aapt resource value: { 0x7F030042,0x7F030043,0x7F030058,0x7F030098,0x7F03012D,0x7F030151 }
public static int[] ActionMode = new int[] {
- 2130771978,
- 2130771984,
- 2130771985,
- 2130771989,
- 2130771991,
- 2130772007};
-
- // aapt resource value: 3
- public const int ActionMode_background = 3;
-
- // aapt resource value: 4
- public const int ActionMode_backgroundSplit = 4;
-
- // aapt resource value: 5
- public const int ActionMode_closeItemLayout = 5;
+ 2130903106,
+ 2130903107,
+ 2130903128,
+ 2130903192,
+ 2130903341,
+ 2130903377};
// aapt resource value: 0
- public const int ActionMode_height = 0;
+ public const int ActionMode_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionMode_backgroundSplit = 1;
// aapt resource value: 2
- public const int ActionMode_subtitleTextStyle = 2;
+ public const int ActionMode_closeItemLayout = 2;
- // aapt resource value: 1
- public const int ActionMode_titleTextStyle = 1;
+ // aapt resource value: 3
+ public const int ActionMode_height = 3;
+ // aapt resource value: 4
+ public const int ActionMode_subtitleTextStyle = 4;
+
+ // aapt resource value: 5
+ public const int ActionMode_titleTextStyle = 5;
+
+ // aapt resource value: { 0x7F030085,0x7F0300A2 }
public static int[] ActivityChooserView = new int[] {
- 2130772008,
- 2130772009};
-
- // aapt resource value: 1
- public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+ 2130903173,
+ 2130903202};
// aapt resource value: 0
- public const int ActivityChooserView_initialActivityCount = 0;
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+ // aapt resource value: 1
+ public const int ActivityChooserView_initialActivityCount = 1;
+
+ // aapt resource value: { 0x10100F2,0x7F030050,0x7F0300AB,0x7F0300AC,0x7F0300B8,0x7F0300DD,0x7F0300DE }
public static int[] AlertDialog = new int[] {
16842994,
- 2130772010,
- 2130772011,
- 2130772012,
- 2130772013,
- 2130772014,
- 2130772015};
+ 2130903120,
+ 2130903211,
+ 2130903212,
+ 2130903224,
+ 2130903261,
+ 2130903262};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -4872,26 +4861,27 @@
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
- // aapt resource value: 5
- public const int AlertDialog_listItemLayout = 5;
-
// aapt resource value: 2
- public const int AlertDialog_listLayout = 2;
+ public const int AlertDialog_listItemLayout = 2;
// aapt resource value: 3
- public const int AlertDialog_multiChoiceItemLayout = 3;
-
- // aapt resource value: 6
- public const int AlertDialog_showTitle = 6;
+ public const int AlertDialog_listLayout = 3;
// aapt resource value: 4
- public const int AlertDialog_singleChoiceItemLayout = 4;
+ public const int AlertDialog_multiChoiceItemLayout = 4;
+ // aapt resource value: 5
+ public const int AlertDialog_showTitle = 5;
+
+ // aapt resource value: 6
+ public const int AlertDialog_singleChoiceItemLayout = 6;
+
+ // aapt resource value: { 0x1010119,0x7F0300E4,0x7F030146,0x7F030147 }
public static int[] AppCompatImageView = new int[] {
16843033,
- 2130772016,
- 2130772017,
- 2130772018};
+ 2130903268,
+ 2130903366,
+ 2130903367};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -4905,11 +4895,12 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
+ // aapt resource value: { 0x1010142,0x7F030143,0x7F030144,0x7F030145 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130772019,
- 2130772020,
- 2130772021};
+ 2130903363,
+ 2130903364,
+ 2130903365};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -4923,6 +4914,7 @@
// aapt resource value: 3
public const int AppCompatSeekBar_tickMarkTintMode = 3;
+ // aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
public static int[] AppCompatTextHelper = new int[] {
16842804,
16843117,
@@ -4953,265 +4945,267 @@
// aapt resource value: 0
public const int AppCompatTextHelper_android_textAppearance = 0;
+ // aapt resource value: { 0x1010034,0x7F03003D,0x7F03003E,0x7F03003F,0x7F030040,0x7F030041,0x7F03008C,0x7F030133 }
public static int[] AppCompatTextView = new int[] {
16842804,
- 2130772022,
- 2130772023,
- 2130772024,
- 2130772025,
- 2130772026,
- 2130772027,
- 2130772028};
+ 2130903101,
+ 2130903102,
+ 2130903103,
+ 2130903104,
+ 2130903105,
+ 2130903180,
+ 2130903347};
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
- // aapt resource value: 6
- public const int AppCompatTextView_autoSizeMaxTextSize = 6;
-
- // aapt resource value: 5
- public const int AppCompatTextView_autoSizeMinTextSize = 5;
-
- // aapt resource value: 4
- public const int AppCompatTextView_autoSizePresetSizes = 4;
-
- // aapt resource value: 3
- public const int AppCompatTextView_autoSizeStepGranularity = 3;
+ // aapt resource value: 1
+ public const int AppCompatTextView_autoSizeMaxTextSize = 1;
// aapt resource value: 2
- public const int AppCompatTextView_autoSizeTextType = 2;
+ public const int AppCompatTextView_autoSizeMinTextSize = 2;
+
+ // aapt resource value: 3
+ public const int AppCompatTextView_autoSizePresetSizes = 3;
+
+ // aapt resource value: 4
+ public const int AppCompatTextView_autoSizeStepGranularity = 4;
+
+ // aapt resource value: 5
+ public const int AppCompatTextView_autoSizeTextType = 5;
+
+ // aapt resource value: 6
+ public const int AppCompatTextView_fontFamily = 6;
// aapt resource value: 7
- public const int AppCompatTextView_fontFamily = 7;
+ public const int AppCompatTextView_textAllCaps = 7;
- // aapt resource value: 1
- public const int AppCompatTextView_textAllCaps = 1;
-
+ // aapt resource value: { 0x1010057,0x10100AE,0x7F030000,0x7F030001,0x7F030002,0x7F030003,0x7F030004,0x7F030005,0x7F030006,0x7F030007,0x7F030008,0x7F030009,0x7F03000A,0x7F03000B,0x7F03000C,0x7F03000E,0x7F03000F,0x7F030010,0x7F030011,0x7F030012,0x7F030013,0x7F030014,0x7F030015,0x7F030016,0x7F030017,0x7F030018,0x7F030019,0x7F03001A,0x7F03001B,0x7F03001C,0x7F03001D,0x7F03001E,0x7F030021,0x7F030022,0x7F030023,0x7F030024,0x7F030025,0x7F03003C,0x7F030049,0x7F03004A,0x7F03004B,0x7F03004C,0x7F03004D,0x7F03004E,0x7F030051,0x7F030052,0x7F030055,0x7F030056,0x7F03005C,0x7F03005D,0x7F03005E,0x7F03005F,0x7F030060,0x7F030061,0x7F030062,0x7F030063,0x7F030064,0x7F030065,0x7F03006E,0x7F030076,0x7F030077,0x7F03007A,0x7F03007C,0x7F03007F,0x7F030080,0x7F030081,0x7F030082,0x7F030083,0x7F03009A,0x7F0300A0,0x7F0300A9,0x7F0300AA,0x7F0300AD,0x7F0300AE,0x7F0300AF,0x7F0300B0,0x7F0300B1,0x7F0300B2,0x7F0300B3,0x7F0300C2,0x7F0300C3,0x7F0300C4,0x7F0300C5,0x7F0300C7,0x7F0300CD,0x7F0300CE,0x7F0300CF,0x7F0300D0,0x7F0300D4,0x7F0300D7,0x7F0300D8,0x7F0300D9,0x7F0300E1,0x7F0300E2,0x7F030131,0x7F030134,0x7F030135,0x7F030136,0x7F030137,0x7F030138,0x7F030139,0x7F03013A,0x7F03013B,0x7F03013C,0x7F03013D,0x7F030152,0x7F030153,0x7F030154,0x7F030155,0x7F030166,0x7F030167,0x7F030168,0x7F030169,0x7F03016A,0x7F03016B,0x7F03016C,0x7F03016D,0x7F03016E,0x7F03016F }
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 2130772029,
- 2130772030,
- 2130772031,
- 2130772032,
- 2130772033,
- 2130772034,
- 2130772035,
- 2130772036,
- 2130772037,
- 2130772038,
- 2130772039,
- 2130772040,
- 2130772041,
- 2130772042,
- 2130772043,
- 2130772044,
- 2130772045,
- 2130772046,
- 2130772047,
- 2130772048,
- 2130772049,
- 2130772050,
- 2130772051,
- 2130772052,
- 2130772053,
- 2130772054,
- 2130772055,
- 2130772056,
- 2130772057,
- 2130772058,
- 2130772059,
- 2130772060,
- 2130772061,
- 2130772062,
- 2130772063,
- 2130772064,
- 2130772065,
- 2130772066,
- 2130772067,
- 2130772068,
- 2130772069,
- 2130772070,
- 2130772071,
- 2130772072,
- 2130772073,
- 2130772074,
- 2130772075,
- 2130772076,
- 2130772077,
- 2130772078,
- 2130772079,
- 2130772080,
- 2130772081,
- 2130772082,
- 2130772083,
- 2130772084,
- 2130772085,
- 2130772086,
- 2130772087,
- 2130772088,
- 2130772089,
- 2130772090,
- 2130772091,
- 2130772092,
- 2130772093,
- 2130772094,
- 2130772095,
- 2130772096,
- 2130772097,
- 2130772098,
- 2130772099,
- 2130772100,
- 2130772101,
- 2130772102,
- 2130772103,
- 2130772104,
- 2130772105,
- 2130772106,
- 2130772107,
- 2130772108,
- 2130772109,
- 2130772110,
- 2130772111,
- 2130772112,
- 2130772113,
- 2130772114,
- 2130772115,
- 2130772116,
- 2130772117,
- 2130772118,
- 2130772119,
- 2130772120,
- 2130772121,
- 2130772122,
- 2130772123,
- 2130772124,
- 2130772125,
- 2130772126,
- 2130772127,
- 2130772128,
- 2130772129,
- 2130772130,
- 2130772131,
- 2130772132,
- 2130772133,
- 2130772134,
- 2130772135,
- 2130772136,
- 2130772137,
- 2130772138,
- 2130772139,
- 2130772140,
- 2130772141,
- 2130772142,
- 2130772143,
- 2130772144,
- 2130772145};
+ 2130903040,
+ 2130903041,
+ 2130903042,
+ 2130903043,
+ 2130903044,
+ 2130903045,
+ 2130903046,
+ 2130903047,
+ 2130903048,
+ 2130903049,
+ 2130903050,
+ 2130903051,
+ 2130903052,
+ 2130903054,
+ 2130903055,
+ 2130903056,
+ 2130903057,
+ 2130903058,
+ 2130903059,
+ 2130903060,
+ 2130903061,
+ 2130903062,
+ 2130903063,
+ 2130903064,
+ 2130903065,
+ 2130903066,
+ 2130903067,
+ 2130903068,
+ 2130903069,
+ 2130903070,
+ 2130903073,
+ 2130903074,
+ 2130903075,
+ 2130903076,
+ 2130903077,
+ 2130903100,
+ 2130903113,
+ 2130903114,
+ 2130903115,
+ 2130903116,
+ 2130903117,
+ 2130903118,
+ 2130903121,
+ 2130903122,
+ 2130903125,
+ 2130903126,
+ 2130903132,
+ 2130903133,
+ 2130903134,
+ 2130903135,
+ 2130903136,
+ 2130903137,
+ 2130903138,
+ 2130903139,
+ 2130903140,
+ 2130903141,
+ 2130903150,
+ 2130903158,
+ 2130903159,
+ 2130903162,
+ 2130903164,
+ 2130903167,
+ 2130903168,
+ 2130903169,
+ 2130903170,
+ 2130903171,
+ 2130903194,
+ 2130903200,
+ 2130903209,
+ 2130903210,
+ 2130903213,
+ 2130903214,
+ 2130903215,
+ 2130903216,
+ 2130903217,
+ 2130903218,
+ 2130903219,
+ 2130903234,
+ 2130903235,
+ 2130903236,
+ 2130903237,
+ 2130903239,
+ 2130903245,
+ 2130903246,
+ 2130903247,
+ 2130903248,
+ 2130903252,
+ 2130903255,
+ 2130903256,
+ 2130903257,
+ 2130903265,
+ 2130903266,
+ 2130903345,
+ 2130903348,
+ 2130903349,
+ 2130903350,
+ 2130903351,
+ 2130903352,
+ 2130903353,
+ 2130903354,
+ 2130903355,
+ 2130903356,
+ 2130903357,
+ 2130903378,
+ 2130903379,
+ 2130903380,
+ 2130903381,
+ 2130903398,
+ 2130903399,
+ 2130903400,
+ 2130903401,
+ 2130903402,
+ 2130903403,
+ 2130903404,
+ 2130903405,
+ 2130903406,
+ 2130903407};
- // aapt resource value: 23
- public const int AppCompatTheme_actionBarDivider = 23;
+ // aapt resource value: 2
+ public const int AppCompatTheme_actionBarDivider = 2;
- // aapt resource value: 24
- public const int AppCompatTheme_actionBarItemBackground = 24;
+ // aapt resource value: 3
+ public const int AppCompatTheme_actionBarItemBackground = 3;
- // aapt resource value: 17
- public const int AppCompatTheme_actionBarPopupTheme = 17;
+ // aapt resource value: 4
+ public const int AppCompatTheme_actionBarPopupTheme = 4;
- // aapt resource value: 22
- public const int AppCompatTheme_actionBarSize = 22;
+ // aapt resource value: 5
+ public const int AppCompatTheme_actionBarSize = 5;
- // aapt resource value: 19
- public const int AppCompatTheme_actionBarSplitStyle = 19;
+ // aapt resource value: 6
+ public const int AppCompatTheme_actionBarSplitStyle = 6;
- // aapt resource value: 18
- public const int AppCompatTheme_actionBarStyle = 18;
+ // aapt resource value: 7
+ public const int AppCompatTheme_actionBarStyle = 7;
- // aapt resource value: 13
- public const int AppCompatTheme_actionBarTabBarStyle = 13;
+ // aapt resource value: 8
+ public const int AppCompatTheme_actionBarTabBarStyle = 8;
+
+ // aapt resource value: 9
+ public const int AppCompatTheme_actionBarTabStyle = 9;
+
+ // aapt resource value: 10
+ public const int AppCompatTheme_actionBarTabTextStyle = 10;
+
+ // aapt resource value: 11
+ public const int AppCompatTheme_actionBarTheme = 11;
// aapt resource value: 12
- public const int AppCompatTheme_actionBarTabStyle = 12;
+ public const int AppCompatTheme_actionBarWidgetTheme = 12;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionButtonStyle = 13;
// aapt resource value: 14
- public const int AppCompatTheme_actionBarTabTextStyle = 14;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionBarTheme = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionBarWidgetTheme = 21;
-
- // aapt resource value: 50
- public const int AppCompatTheme_actionButtonStyle = 50;
-
- // aapt resource value: 46
- public const int AppCompatTheme_actionDropDownStyle = 46;
-
- // aapt resource value: 25
- public const int AppCompatTheme_actionMenuTextAppearance = 25;
-
- // aapt resource value: 26
- public const int AppCompatTheme_actionMenuTextColor = 26;
-
- // aapt resource value: 29
- public const int AppCompatTheme_actionModeBackground = 29;
-
- // aapt resource value: 28
- public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
-
- // aapt resource value: 31
- public const int AppCompatTheme_actionModeCloseDrawable = 31;
-
- // aapt resource value: 33
- public const int AppCompatTheme_actionModeCopyDrawable = 33;
-
- // aapt resource value: 32
- public const int AppCompatTheme_actionModeCutDrawable = 32;
-
- // aapt resource value: 37
- public const int AppCompatTheme_actionModeFindDrawable = 37;
-
- // aapt resource value: 34
- public const int AppCompatTheme_actionModePasteDrawable = 34;
-
- // aapt resource value: 39
- public const int AppCompatTheme_actionModePopupWindowStyle = 39;
-
- // aapt resource value: 35
- public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
-
- // aapt resource value: 36
- public const int AppCompatTheme_actionModeShareDrawable = 36;
-
- // aapt resource value: 30
- public const int AppCompatTheme_actionModeSplitBackground = 30;
-
- // aapt resource value: 27
- public const int AppCompatTheme_actionModeStyle = 27;
-
- // aapt resource value: 38
- public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+ public const int AppCompatTheme_actionDropDownStyle = 14;
// aapt resource value: 15
- public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+ public const int AppCompatTheme_actionMenuTextAppearance = 15;
// aapt resource value: 16
- public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+ public const int AppCompatTheme_actionMenuTextColor = 16;
- // aapt resource value: 58
- public const int AppCompatTheme_activityChooserViewStyle = 58;
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionModeBackground = 17;
- // aapt resource value: 95
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
- // aapt resource value: 96
- public const int AppCompatTheme_alertDialogCenterButtons = 96;
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionModeCloseDrawable = 19;
- // aapt resource value: 94
- public const int AppCompatTheme_alertDialogStyle = 94;
+ // aapt resource value: 20
+ public const int AppCompatTheme_actionModeCopyDrawable = 20;
- // aapt resource value: 97
- public const int AppCompatTheme_alertDialogTheme = 97;
+ // aapt resource value: 21
+ public const int AppCompatTheme_actionModeCutDrawable = 21;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionModeFindDrawable = 22;
+
+ // aapt resource value: 23
+ public const int AppCompatTheme_actionModePasteDrawable = 23;
+
+ // aapt resource value: 24
+ public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+
+ // aapt resource value: 25
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+
+ // aapt resource value: 26
+ public const int AppCompatTheme_actionModeShareDrawable = 26;
+
+ // aapt resource value: 27
+ public const int AppCompatTheme_actionModeSplitBackground = 27;
+
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeStyle = 28;
+
+ // aapt resource value: 29
+ public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+
+ // aapt resource value: 30
+ public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+
+ // aapt resource value: 31
+ public const int AppCompatTheme_actionOverflowMenuStyle = 31;
+
+ // aapt resource value: 32
+ public const int AppCompatTheme_activityChooserViewStyle = 32;
+
+ // aapt resource value: 33
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+
+ // aapt resource value: 34
+ public const int AppCompatTheme_alertDialogCenterButtons = 34;
+
+ // aapt resource value: 35
+ public const int AppCompatTheme_alertDialogStyle = 35;
+
+ // aapt resource value: 36
+ public const int AppCompatTheme_alertDialogTheme = 36;
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -5219,270 +5213,272 @@
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
- // aapt resource value: 102
- public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
+ // aapt resource value: 37
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
- // aapt resource value: 55
- public const int AppCompatTheme_borderlessButtonStyle = 55;
+ // aapt resource value: 38
+ public const int AppCompatTheme_borderlessButtonStyle = 38;
- // aapt resource value: 52
- public const int AppCompatTheme_buttonBarButtonStyle = 52;
+ // aapt resource value: 39
+ public const int AppCompatTheme_buttonBarButtonStyle = 39;
- // aapt resource value: 100
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+ // aapt resource value: 40
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
- // aapt resource value: 101
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+ // aapt resource value: 41
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
- // aapt resource value: 99
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
-
- // aapt resource value: 51
- public const int AppCompatTheme_buttonBarStyle = 51;
-
- // aapt resource value: 103
- public const int AppCompatTheme_buttonStyle = 103;
-
- // aapt resource value: 104
- public const int AppCompatTheme_buttonStyleSmall = 104;
-
- // aapt resource value: 105
- public const int AppCompatTheme_checkboxStyle = 105;
-
- // aapt resource value: 106
- public const int AppCompatTheme_checkedTextViewStyle = 106;
-
- // aapt resource value: 86
- public const int AppCompatTheme_colorAccent = 86;
-
- // aapt resource value: 93
- public const int AppCompatTheme_colorBackgroundFloating = 93;
-
- // aapt resource value: 90
- public const int AppCompatTheme_colorButtonNormal = 90;
-
- // aapt resource value: 88
- public const int AppCompatTheme_colorControlActivated = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_colorControlHighlight = 89;
-
- // aapt resource value: 87
- public const int AppCompatTheme_colorControlNormal = 87;
-
- // aapt resource value: 118
- public const int AppCompatTheme_colorError = 118;
-
- // aapt resource value: 84
- public const int AppCompatTheme_colorPrimary = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_colorPrimaryDark = 85;
-
- // aapt resource value: 91
- public const int AppCompatTheme_colorSwitchThumbNormal = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_controlBackground = 92;
-
- // aapt resource value: 44
- public const int AppCompatTheme_dialogPreferredPadding = 44;
+ // aapt resource value: 42
+ public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
// aapt resource value: 43
- public const int AppCompatTheme_dialogTheme = 43;
+ public const int AppCompatTheme_buttonBarStyle = 43;
- // aapt resource value: 57
- public const int AppCompatTheme_dividerHorizontal = 57;
-
- // aapt resource value: 56
- public const int AppCompatTheme_dividerVertical = 56;
-
- // aapt resource value: 75
- public const int AppCompatTheme_dropDownListViewStyle = 75;
-
- // aapt resource value: 47
- public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
-
- // aapt resource value: 64
- public const int AppCompatTheme_editTextBackground = 64;
-
- // aapt resource value: 63
- public const int AppCompatTheme_editTextColor = 63;
-
- // aapt resource value: 107
- public const int AppCompatTheme_editTextStyle = 107;
-
- // aapt resource value: 49
- public const int AppCompatTheme_homeAsUpIndicator = 49;
-
- // aapt resource value: 65
- public const int AppCompatTheme_imageButtonStyle = 65;
-
- // aapt resource value: 83
- public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+ // aapt resource value: 44
+ public const int AppCompatTheme_buttonStyle = 44;
// aapt resource value: 45
- public const int AppCompatTheme_listDividerAlertDialog = 45;
+ public const int AppCompatTheme_buttonStyleSmall = 45;
- // aapt resource value: 115
- public const int AppCompatTheme_listMenuViewStyle = 115;
+ // aapt resource value: 46
+ public const int AppCompatTheme_checkboxStyle = 46;
- // aapt resource value: 76
- public const int AppCompatTheme_listPopupWindowStyle = 76;
+ // aapt resource value: 47
+ public const int AppCompatTheme_checkedTextViewStyle = 47;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_colorAccent = 48;
+
+ // aapt resource value: 49
+ public const int AppCompatTheme_colorBackgroundFloating = 49;
+
+ // aapt resource value: 50
+ public const int AppCompatTheme_colorButtonNormal = 50;
+
+ // aapt resource value: 51
+ public const int AppCompatTheme_colorControlActivated = 51;
+
+ // aapt resource value: 52
+ public const int AppCompatTheme_colorControlHighlight = 52;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_colorControlNormal = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_colorError = 54;
+
+ // aapt resource value: 55
+ public const int AppCompatTheme_colorPrimary = 55;
+
+ // aapt resource value: 56
+ public const int AppCompatTheme_colorPrimaryDark = 56;
+
+ // aapt resource value: 57
+ public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_controlBackground = 58;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_dialogPreferredPadding = 59;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_dialogTheme = 60;
+
+ // aapt resource value: 61
+ public const int AppCompatTheme_dividerHorizontal = 61;
+
+ // aapt resource value: 62
+ public const int AppCompatTheme_dividerVertical = 62;
+
+ // aapt resource value: 64
+ public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
+
+ // aapt resource value: 63
+ public const int AppCompatTheme_dropDownListViewStyle = 63;
+
+ // aapt resource value: 65
+ public const int AppCompatTheme_editTextBackground = 65;
+
+ // aapt resource value: 66
+ public const int AppCompatTheme_editTextColor = 66;
+
+ // aapt resource value: 67
+ public const int AppCompatTheme_editTextStyle = 67;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_homeAsUpIndicator = 68;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_imageButtonStyle = 69;
// aapt resource value: 70
- public const int AppCompatTheme_listPreferredItemHeight = 70;
-
- // aapt resource value: 72
- public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+ public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
// aapt resource value: 71
- public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+ public const int AppCompatTheme_listDividerAlertDialog = 71;
+
+ // aapt resource value: 72
+ public const int AppCompatTheme_listMenuViewStyle = 72;
// aapt resource value: 73
- public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+ public const int AppCompatTheme_listPopupWindowStyle = 73;
// aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
+ public const int AppCompatTheme_listPreferredItemHeight = 74;
+
+ // aapt resource value: 75
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+
+ // aapt resource value: 76
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+
+ // aapt resource value: 77
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+
+ // aapt resource value: 78
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+
+ // aapt resource value: 79
+ public const int AppCompatTheme_panelBackground = 79;
// aapt resource value: 80
- public const int AppCompatTheme_panelBackground = 80;
-
- // aapt resource value: 82
- public const int AppCompatTheme_panelMenuListTheme = 82;
+ public const int AppCompatTheme_panelMenuListTheme = 80;
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
- // aapt resource value: 61
- public const int AppCompatTheme_popupMenuStyle = 61;
+ // aapt resource value: 82
+ public const int AppCompatTheme_popupMenuStyle = 82;
- // aapt resource value: 62
- public const int AppCompatTheme_popupWindowStyle = 62;
+ // aapt resource value: 83
+ public const int AppCompatTheme_popupWindowStyle = 83;
- // aapt resource value: 108
- public const int AppCompatTheme_radioButtonStyle = 108;
+ // aapt resource value: 84
+ public const int AppCompatTheme_radioButtonStyle = 84;
- // aapt resource value: 109
- public const int AppCompatTheme_ratingBarStyle = 109;
+ // aapt resource value: 85
+ public const int AppCompatTheme_ratingBarStyle = 85;
- // aapt resource value: 110
- public const int AppCompatTheme_ratingBarStyleIndicator = 110;
+ // aapt resource value: 86
+ public const int AppCompatTheme_ratingBarStyleIndicator = 86;
- // aapt resource value: 111
- public const int AppCompatTheme_ratingBarStyleSmall = 111;
+ // aapt resource value: 87
+ public const int AppCompatTheme_ratingBarStyleSmall = 87;
- // aapt resource value: 69
- public const int AppCompatTheme_searchViewStyle = 69;
+ // aapt resource value: 88
+ public const int AppCompatTheme_searchViewStyle = 88;
- // aapt resource value: 112
- public const int AppCompatTheme_seekBarStyle = 112;
+ // aapt resource value: 89
+ public const int AppCompatTheme_seekBarStyle = 89;
- // aapt resource value: 53
- public const int AppCompatTheme_selectableItemBackground = 53;
+ // aapt resource value: 90
+ public const int AppCompatTheme_selectableItemBackground = 90;
- // aapt resource value: 54
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+ // aapt resource value: 91
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
- // aapt resource value: 48
- public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
+ // aapt resource value: 92
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
- // aapt resource value: 113
- public const int AppCompatTheme_spinnerStyle = 113;
+ // aapt resource value: 93
+ public const int AppCompatTheme_spinnerStyle = 93;
- // aapt resource value: 114
- public const int AppCompatTheme_switchStyle = 114;
+ // aapt resource value: 94
+ public const int AppCompatTheme_switchStyle = 94;
- // aapt resource value: 40
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+ // aapt resource value: 95
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
- // aapt resource value: 77
- public const int AppCompatTheme_textAppearanceListItem = 77;
+ // aapt resource value: 96
+ public const int AppCompatTheme_textAppearanceListItem = 96;
- // aapt resource value: 78
- public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
-
- // aapt resource value: 79
- public const int AppCompatTheme_textAppearanceListItemSmall = 79;
-
- // aapt resource value: 42
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
-
- // aapt resource value: 67
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
-
- // aapt resource value: 66
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
-
- // aapt resource value: 41
- public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+ // aapt resource value: 97
+ public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
// aapt resource value: 98
- public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+ public const int AppCompatTheme_textAppearanceListItemSmall = 98;
- // aapt resource value: 68
- public const int AppCompatTheme_textColorSearchUrl = 68;
+ // aapt resource value: 99
+ public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
- // aapt resource value: 60
- public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+ // aapt resource value: 100
+ public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
- // aapt resource value: 59
- public const int AppCompatTheme_toolbarStyle = 59;
+ // aapt resource value: 101
+ public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
- // aapt resource value: 117
- public const int AppCompatTheme_tooltipForegroundColor = 117;
+ // aapt resource value: 102
+ public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
+
+ // aapt resource value: 103
+ public const int AppCompatTheme_textColorAlertDialogListItem = 103;
+
+ // aapt resource value: 104
+ public const int AppCompatTheme_textColorSearchUrl = 104;
+
+ // aapt resource value: 105
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
+
+ // aapt resource value: 106
+ public const int AppCompatTheme_toolbarStyle = 106;
+
+ // aapt resource value: 107
+ public const int AppCompatTheme_tooltipForegroundColor = 107;
+
+ // aapt resource value: 108
+ public const int AppCompatTheme_tooltipFrameBackground = 108;
+
+ // aapt resource value: 109
+ public const int AppCompatTheme_windowActionBar = 109;
+
+ // aapt resource value: 110
+ public const int AppCompatTheme_windowActionBarOverlay = 110;
+
+ // aapt resource value: 111
+ public const int AppCompatTheme_windowActionModeOverlay = 111;
+
+ // aapt resource value: 112
+ public const int AppCompatTheme_windowFixedHeightMajor = 112;
+
+ // aapt resource value: 113
+ public const int AppCompatTheme_windowFixedHeightMinor = 113;
+
+ // aapt resource value: 114
+ public const int AppCompatTheme_windowFixedWidthMajor = 114;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_windowFixedWidthMinor = 115;
// aapt resource value: 116
- public const int AppCompatTheme_tooltipFrameBackground = 116;
+ public const int AppCompatTheme_windowMinWidthMajor = 116;
- // aapt resource value: 2
- public const int AppCompatTheme_windowActionBar = 2;
+ // aapt resource value: 117
+ public const int AppCompatTheme_windowMinWidthMinor = 117;
- // aapt resource value: 4
- public const int AppCompatTheme_windowActionBarOverlay = 4;
+ // aapt resource value: 118
+ public const int AppCompatTheme_windowNoTitle = 118;
- // aapt resource value: 5
- public const int AppCompatTheme_windowActionModeOverlay = 5;
-
- // aapt resource value: 9
- public const int AppCompatTheme_windowFixedHeightMajor = 9;
-
- // aapt resource value: 7
- public const int AppCompatTheme_windowFixedHeightMinor = 7;
-
- // aapt resource value: 6
- public const int AppCompatTheme_windowFixedWidthMajor = 6;
-
- // aapt resource value: 8
- public const int AppCompatTheme_windowFixedWidthMinor = 8;
-
- // aapt resource value: 10
- public const int AppCompatTheme_windowMinWidthMajor = 10;
-
- // aapt resource value: 11
- public const int AppCompatTheme_windowMinWidthMinor = 11;
-
- // aapt resource value: 3
- public const int AppCompatTheme_windowNoTitle = 3;
-
+ // aapt resource value: { 0x7F0300E6,0x7F0300E7,0x7F030116 }
public static int[] BallPulseFooter = new int[] {
- 2130772235,
- 2130772256,
- 2130772257};
-
- // aapt resource value: 1
- public const int BallPulseFooter_srlAnimatingColor = 1;
+ 2130903270,
+ 2130903271,
+ 2130903318};
// aapt resource value: 0
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
+ public const int BallPulseFooter_srlAnimatingColor = 0;
+
+ // aapt resource value: 1
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
+ // aapt resource value: { 0x7F0300E5,0x7F0300F8,0x7F030117 }
public static int[] BezierRadarHeader = new int[] {
- 2130772234,
- 2130772242,
- 2130772244};
+ 2130903269,
+ 2130903288,
+ 2130903319};
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
@@ -5493,31 +5489,33 @@
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
+ // aapt resource value: { 0x7F030026 }
public static int[] ButtonBarLayout = new int[] {
- 2130772146};
+ 2130903078};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
+ // aapt resource value: { 0x7F0300E5,0x7F0300E7,0x7F0300EB,0x7F0300EC,0x7F0300ED,0x7F0300EE,0x7F0300EF,0x7F0300F0,0x7F030106,0x7F030117,0x7F03011A,0x7F03011B,0x7F03011C,0x7F03011D,0x7F03011E,0x7F03011F,0x7F030120,0x7F030123 }
public static int[] ClassicsFooter = new int[] {
- 2130772234,
- 2130772235,
- 2130772236,
- 2130772237,
- 2130772238,
- 2130772239,
- 2130772240,
- 2130772241,
- 2130772243,
- 2130772244,
- 2130772245,
- 2130772246,
- 2130772247,
- 2130772248,
- 2130772249,
- 2130772250,
- 2130772251,
- 2130772254};
+ 2130903269,
+ 2130903271,
+ 2130903275,
+ 2130903276,
+ 2130903277,
+ 2130903278,
+ 2130903279,
+ 2130903280,
+ 2130903302,
+ 2130903319,
+ 2130903322,
+ 2130903323,
+ 2130903324,
+ 2130903325,
+ 2130903326,
+ 2130903327,
+ 2130903328,
+ 2130903331};
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
@@ -5573,29 +5571,30 @@
// aapt resource value: 17
public const int ClassicsFooter_srlTextSizeTitle = 17;
+ // aapt resource value: { 0x7F0300E5,0x7F0300E7,0x7F0300EB,0x7F0300EC,0x7F0300ED,0x7F0300EE,0x7F0300EF,0x7F0300F0,0x7F0300F9,0x7F030106,0x7F030117,0x7F03011A,0x7F03011B,0x7F03011C,0x7F03011E,0x7F03011F,0x7F030120,0x7F030121,0x7F030122,0x7F030123,0x7F030124,0x7F030125 }
public static int[] ClassicsHeader = new int[] {
- 2130772234,
- 2130772235,
- 2130772236,
- 2130772237,
- 2130772238,
- 2130772239,
- 2130772240,
- 2130772241,
- 2130772243,
- 2130772244,
- 2130772245,
- 2130772246,
- 2130772247,
- 2130772249,
- 2130772250,
- 2130772251,
- 2130772252,
- 2130772253,
- 2130772254,
- 2130772255,
- 2130772258,
- 2130772259};
+ 2130903269,
+ 2130903271,
+ 2130903275,
+ 2130903276,
+ 2130903277,
+ 2130903278,
+ 2130903279,
+ 2130903280,
+ 2130903289,
+ 2130903302,
+ 2130903319,
+ 2130903322,
+ 2130903323,
+ 2130903324,
+ 2130903326,
+ 2130903327,
+ 2130903328,
+ 2130903329,
+ 2130903330,
+ 2130903331,
+ 2130903332,
+ 2130903333};
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
@@ -5621,52 +5620,53 @@
// aapt resource value: 7
public const int ClassicsHeader_srlDrawableSize = 7;
- // aapt resource value: 21
- public const int ClassicsHeader_srlEnableLastTime = 21;
-
// aapt resource value: 8
- public const int ClassicsHeader_srlFinishDuration = 8;
+ public const int ClassicsHeader_srlEnableLastTime = 8;
// aapt resource value: 9
- public const int ClassicsHeader_srlPrimaryColor = 9;
+ public const int ClassicsHeader_srlFinishDuration = 9;
// aapt resource value: 10
- public const int ClassicsHeader_srlTextFailed = 10;
+ public const int ClassicsHeader_srlPrimaryColor = 10;
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFinish = 11;
+ public const int ClassicsHeader_srlTextFailed = 11;
// aapt resource value: 12
- public const int ClassicsHeader_srlTextLoading = 12;
+ public const int ClassicsHeader_srlTextFinish = 12;
// aapt resource value: 13
- public const int ClassicsHeader_srlTextPulling = 13;
+ public const int ClassicsHeader_srlTextLoading = 13;
// aapt resource value: 14
- public const int ClassicsHeader_srlTextRefreshing = 14;
+ public const int ClassicsHeader_srlTextPulling = 14;
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRelease = 15;
+ public const int ClassicsHeader_srlTextRefreshing = 15;
// aapt resource value: 16
- public const int ClassicsHeader_srlTextSecondary = 16;
+ public const int ClassicsHeader_srlTextRelease = 16;
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSizeTime = 17;
+ public const int ClassicsHeader_srlTextSecondary = 17;
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTitle = 18;
+ public const int ClassicsHeader_srlTextSizeTime = 18;
+
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextSizeTitle = 19;
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextUpdate = 19;
+ // aapt resource value: 21
+ public const int ClassicsHeader_srlTextUpdate = 21;
+ // aapt resource value: { 0x10101A5,0x101031F,0x7F030027 }
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130772147};
+ 2130903079};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -5677,10 +5677,11 @@
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
+ // aapt resource value: { 0x1010107,0x7F030053,0x7F030054 }
public static int[] CompoundButton = new int[] {
16843015,
- 2130772148,
- 2130772149};
+ 2130903123,
+ 2130903124};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -5691,216 +5692,223 @@
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
+ // aapt resource value: { 0x7F03003A,0x7F03003B,0x7F030047,0x7F03005B,0x7F03007D,0x7F030095,0x7F0300E0,0x7F03013F }
public static int[] DrawerArrowToggle = new int[] {
- 2130772150,
- 2130772151,
- 2130772152,
- 2130772153,
- 2130772154,
- 2130772155,
- 2130772156,
- 2130772157};
-
- // aapt resource value: 4
- public const int DrawerArrowToggle_arrowHeadLength = 4;
-
- // aapt resource value: 5
- public const int DrawerArrowToggle_arrowShaftLength = 5;
-
- // aapt resource value: 6
- public const int DrawerArrowToggle_barLength = 6;
+ 2130903098,
+ 2130903099,
+ 2130903111,
+ 2130903131,
+ 2130903165,
+ 2130903189,
+ 2130903264,
+ 2130903359};
// aapt resource value: 0
- public const int DrawerArrowToggle_color = 0;
-
- // aapt resource value: 2
- public const int DrawerArrowToggle_drawableSize = 2;
-
- // aapt resource value: 3
- public const int DrawerArrowToggle_gapBetweenBars = 3;
+ public const int DrawerArrowToggle_arrowHeadLength = 0;
// aapt resource value: 1
- public const int DrawerArrowToggle_spinBars = 1;
+ public const int DrawerArrowToggle_arrowShaftLength = 1;
+
+ // aapt resource value: 2
+ public const int DrawerArrowToggle_barLength = 2;
+
+ // aapt resource value: 3
+ public const int DrawerArrowToggle_color = 3;
+
+ // aapt resource value: 4
+ public const int DrawerArrowToggle_drawableSize = 4;
+
+ // aapt resource value: 5
+ public const int DrawerArrowToggle_gapBetweenBars = 5;
+
+ // aapt resource value: 6
+ public const int DrawerArrowToggle_spinBars = 6;
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
+ // aapt resource value: { 0x7F03008D,0x7F03008E,0x7F03008F,0x7F030090,0x7F030091,0x7F030092 }
public static int[] FontFamily = new int[] {
- 2130772223,
- 2130772224,
- 2130772225,
- 2130772226,
- 2130772227,
- 2130772228};
+ 2130903181,
+ 2130903182,
+ 2130903183,
+ 2130903184,
+ 2130903185,
+ 2130903186};
- // aapt resource value: 0
- public const int FontFamily_fontProviderAuthority = 0;
-
- // aapt resource value: 3
- public const int FontFamily_fontProviderCerts = 3;
-
- // aapt resource value: 4
- public const int FontFamily_fontProviderFetchStrategy = 4;
-
- // aapt resource value: 5
- public const int FontFamily_fontProviderFetchTimeout = 5;
-
- // aapt resource value: 1
- public const int FontFamily_fontProviderPackage = 1;
-
- // aapt resource value: 2
- public const int FontFamily_fontProviderQuery = 2;
-
+ // aapt resource value: { 0x7F03008B,0x7F030093,0x7F030094 }
public static int[] FontFamilyFont = new int[] {
- 2130772229,
- 2130772230,
- 2130772231};
-
- // aapt resource value: 1
- public const int FontFamilyFont_font = 1;
+ 2130903179,
+ 2130903187,
+ 2130903188};
// aapt resource value: 0
- public const int FontFamilyFont_fontStyle = 0;
+ public const int FontFamilyFont_font = 0;
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_fontStyle = 1;
// aapt resource value: 2
public const int FontFamilyFont_fontWeight = 2;
- public static int[] HDLArcSeekBar = new int[] {
- 2130772300,
- 2130772301,
- 2130772302,
- 2130772303,
- 2130772304,
- 2130772305,
- 2130772306,
- 2130772307,
- 2130772308,
- 2130772309,
- 2130772310,
- 2130772311,
- 2130772312,
- 2130772313,
- 2130772314,
- 2130772315,
- 2130772316,
- 2130772317};
-
- // aapt resource value: 5
- public const int HDLArcSeekBar_arc_border_color = 5;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_border_width = 4;
-
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_colors = 3;
-
- // aapt resource value: 6
- public const int HDLArcSeekBar_arc_max = 6;
-
- // aapt resource value: 7
- public const int HDLArcSeekBar_arc_min = 7;
+ // aapt resource value: 0
+ public const int FontFamily_fontProviderAuthority = 0;
// aapt resource value: 1
- public const int HDLArcSeekBar_arc_open_angle = 1;
-
- // aapt resource value: 8
- public const int HDLArcSeekBar_arc_progress = 8;
-
- // aapt resource value: 16
- public const int HDLArcSeekBar_arc_progress_bar_color = 16;
-
- // aapt resource value: 17
- public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+ public const int FontFamily_fontProviderCerts = 1;
// aapt resource value: 2
- public const int HDLArcSeekBar_arc_rotate_angle = 2;
+ public const int FontFamily_fontProviderFetchStrategy = 2;
- // aapt resource value: 15
- public const int HDLArcSeekBar_arc_shadow_radius = 15;
+ // aapt resource value: 3
+ public const int FontFamily_fontProviderFetchTimeout = 3;
+
+ // aapt resource value: 4
+ public const int FontFamily_fontProviderPackage = 4;
+
+ // aapt resource value: 5
+ public const int FontFamily_fontProviderQuery = 5;
+
+ // aapt resource value: { 0x7F030029,0x7F03002A,0x7F03002B,0x7F03002C,0x7F03002D,0x7F03002E,0x7F03002F,0x7F030030,0x7F030031,0x7F030032,0x7F030033,0x7F030034,0x7F030035,0x7F030036,0x7F030037,0x7F030038,0x7F030039,0x7F030097 }
+ public static int[] HDLArcSeekBar = new int[] {
+ 2130903081,
+ 2130903082,
+ 2130903083,
+ 2130903084,
+ 2130903085,
+ 2130903086,
+ 2130903087,
+ 2130903088,
+ 2130903089,
+ 2130903090,
+ 2130903091,
+ 2130903092,
+ 2130903093,
+ 2130903094,
+ 2130903095,
+ 2130903096,
+ 2130903097,
+ 2130903191};
+
+ // aapt resource value: 0
+ public const int HDLArcSeekBar_arc_border_color = 0;
+
+ // aapt resource value: 1
+ public const int HDLArcSeekBar_arc_border_width = 1;
+
+ // aapt resource value: 2
+ public const int HDLArcSeekBar_arc_colors = 2;
+
+ // aapt resource value: 3
+ public const int HDLArcSeekBar_arc_max = 3;
+
+ // aapt resource value: 4
+ public const int HDLArcSeekBar_arc_min = 4;
+
+ // aapt resource value: 5
+ public const int HDLArcSeekBar_arc_open_angle = 5;
+
+ // aapt resource value: 6
+ public const int HDLArcSeekBar_arc_progress = 6;
+
+ // aapt resource value: 7
+ public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+
+ // aapt resource value: 8
+ public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_rotate_angle = 9;
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_thumb_color = 10;
+ public const int HDLArcSeekBar_arc_shadow_radius = 10;
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_radius = 11;
+ public const int HDLArcSeekBar_arc_thumb_color = 11;
+
+ // aapt resource value: 12
+ public const int HDLArcSeekBar_arc_thumb_radius = 12;
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
+ // aapt resource value: 14
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
- // aapt resource value: 9
- public const int HDLArcSeekBar_arc_thumb_width = 9;
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_thumb_width = 15;
+
+ // aapt resource value: 16
+ public const int HDLArcSeekBar_arc_width = 16;
+
+ // aapt resource value: 17
+ public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
+
+ // aapt resource value: { 0x7F03006F,0x7F030070,0x7F030071,0x7F030072,0x7F030073,0x7F0300D5 }
+ public static int[] HDLCurtainSeekBar = new int[] {
+ 2130903151,
+ 2130903152,
+ 2130903153,
+ 2130903154,
+ 2130903155,
+ 2130903253};
// aapt resource value: 0
- public const int HDLArcSeekBar_arc_width = 0;
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
- // aapt resource value: 14
- public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
-
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323};
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
// aapt resource value: 2
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
+ public const int HDLCurtainSeekBar_curtain_bar_color = 2;
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
-
- // aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_color = 0;
-
- // aapt resource value: 5
- public const int HDLCurtainSeekBar_curtain_bar_height = 5;
+ public const int HDLCurtainSeekBar_curtain_bar_height = 3;
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+ // aapt resource value: { 0x7F0300D6,0x7F03015B,0x7F03015C,0x7F03015D,0x7F03015E,0x7F03015F }
public static int[] HDLWaveSeekBar = new int[] {
- 2130772324,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329};
-
- // aapt resource value: 1
- public const int HDLWaveSeekBar_second_wave_color = 1;
-
- // aapt resource value: 2
- public const int HDLWaveSeekBar_wave_bg_color = 2;
-
- // aapt resource value: 3
- public const int HDLWaveSeekBar_wave_border_color = 3;
+ 2130903254,
+ 2130903387,
+ 2130903388,
+ 2130903389,
+ 2130903390,
+ 2130903391};
// aapt resource value: 0
- public const int HDLWaveSeekBar_wave_color = 0;
+ public const int HDLWaveSeekBar_second_wave_color = 0;
- // aapt resource value: 5
- public const int HDLWaveSeekBar_wave_height = 5;
+ // aapt resource value: 1
+ public const int HDLWaveSeekBar_wave_bg_color = 1;
+
+ // aapt resource value: 2
+ public const int HDLWaveSeekBar_wave_border_color = 2;
+
+ // aapt resource value: 3
+ public const int HDLWaveSeekBar_wave_color = 3;
// aapt resource value: 4
- public const int HDLWaveSeekBar_wave_width = 4;
+ public const int HDLWaveSeekBar_wave_height = 4;
+ // aapt resource value: 5
+ public const int HDLWaveSeekBar_wave_width = 5;
+
+ // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F030079,0x7F03007B,0x7F0300B7,0x7F0300DB }
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130771988,
- 2130772158,
- 2130772159,
- 2130772160};
+ 2130903161,
+ 2130903163,
+ 2130903223,
+ 2130903259};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -5920,15 +5928,10 @@
// aapt resource value: 5
public const int LinearLayoutCompat_divider = 5;
- // aapt resource value: 8
- public const int LinearLayoutCompat_dividerPadding = 8;
-
// aapt resource value: 6
- public const int LinearLayoutCompat_measureWithLargestChild = 6;
+ public const int LinearLayoutCompat_dividerPadding = 6;
- // aapt resource value: 7
- public const int LinearLayoutCompat_showDividers = 7;
-
+ // aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
@@ -5947,6 +5950,13 @@
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
+ // aapt resource value: 7
+ public const int LinearLayoutCompat_measureWithLargestChild = 7;
+
+ // aapt resource value: 8
+ public const int LinearLayoutCompat_showDividers = 8;
+
+ // aapt resource value: { 0x10102AC,0x10102AD }
public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -5957,6 +5967,7 @@
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
+ // aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
public static int[] MenuGroup = new int[] {
16842766,
16842960,
@@ -5983,6 +5994,7 @@
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
+ // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F03000D,0x7F03001F,0x7F030020,0x7F030028,0x7F030067,0x7F03009D,0x7F03009E,0x7F0300BC,0x7F0300DA,0x7F030156 }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -5997,28 +6009,28 @@
16843236,
16843237,
16843375,
- 2130772161,
- 2130772162,
- 2130772163,
- 2130772164,
- 2130772165,
- 2130772166,
- 2130772167,
- 2130772168,
- 2130772169,
- 2130772170};
-
- // aapt resource value: 16
- public const int MenuItem_actionLayout = 16;
-
- // aapt resource value: 18
- public const int MenuItem_actionProviderClass = 18;
-
- // aapt resource value: 17
- public const int MenuItem_actionViewClass = 17;
+ 2130903053,
+ 2130903071,
+ 2130903072,
+ 2130903080,
+ 2130903143,
+ 2130903197,
+ 2130903198,
+ 2130903228,
+ 2130903258,
+ 2130903382};
// aapt resource value: 13
- public const int MenuItem_alphabeticModifiers = 13;
+ public const int MenuItem_actionLayout = 13;
+
+ // aapt resource value: 14
+ public const int MenuItem_actionProviderClass = 14;
+
+ // aapt resource value: 15
+ public const int MenuItem_actionViewClass = 15;
+
+ // aapt resource value: 16
+ public const int MenuItem_alphabeticModifiers = 16;
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
@@ -6059,24 +6071,25 @@
// aapt resource value: 4
public const int MenuItem_android_visible = 4;
+ // aapt resource value: 17
+ public const int MenuItem_contentDescription = 17;
+
+ // aapt resource value: 18
+ public const int MenuItem_iconTint = 18;
+
// aapt resource value: 19
- public const int MenuItem_contentDescription = 19;
-
- // aapt resource value: 21
- public const int MenuItem_iconTint = 21;
-
- // aapt resource value: 22
- public const int MenuItem_iconTintMode = 22;
-
- // aapt resource value: 14
- public const int MenuItem_numericModifiers = 14;
-
- // aapt resource value: 15
- public const int MenuItem_showAsAction = 15;
+ public const int MenuItem_iconTintMode = 19;
// aapt resource value: 20
- public const int MenuItem_tooltipText = 20;
+ public const int MenuItem_numericModifiers = 20;
+ // aapt resource value: 21
+ public const int MenuItem_showAsAction = 21;
+
+ // aapt resource value: 22
+ public const int MenuItem_tooltipText = 22;
+
+ // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0300C8,0x7F030128 }
public static int[] MenuView = new int[] {
16842926,
16843052,
@@ -6085,8 +6098,8 @@
16843055,
16843056,
16843057,
- 2130772171,
- 2130772172};
+ 2130903240,
+ 2130903336};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -6115,10 +6128,45 @@
// aapt resource value: 8
public const int MenuView_subMenuArrow = 8;
+ // aapt resource value: { 0x7F030160,0x7F030161,0x7F030162,0x7F030163,0x7F030164,0x7F030165 }
+ public static int[] pickerview = new int[] {
+ 2130903392,
+ 2130903393,
+ 2130903394,
+ 2130903395,
+ 2130903396,
+ 2130903397};
+
+ // aapt resource value: 0
+ public const int pickerview_wheelview_dividerColor = 0;
+
+ // aapt resource value: 1
+ public const int pickerview_wheelview_gravity = 1;
+
+ // aapt resource value: 2
+ public const int pickerview_wheelview_lineSpacingMultiplier = 2;
+
+ // aapt resource value: 3
+ public const int pickerview_wheelview_textColorCenter = 3;
+
+ // aapt resource value: 4
+ public const int pickerview_wheelview_textColorOut = 4;
+
+ // aapt resource value: 5
+ public const int pickerview_wheelview_textSize = 5;
+
+ // aapt resource value: { 0x1010176,0x10102C9,0x7F0300BD }
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130772173};
+ 2130903229};
+
+ // aapt resource value: { 0x7F030127 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130903335};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -6129,15 +6177,10 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130772174};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
-
+ // aapt resource value: { 0x7F0300BE,0x7F0300C1 }
public static int[] RecycleListView = new int[] {
- 2130772175,
- 2130772176};
+ 2130903230,
+ 2130903233};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -6145,18 +6188,19 @@
// aapt resource value: 1
public const int RecycleListView_paddingTopNoTitle = 1;
+ // aapt resource value: { 0x10100C4,0x10100F1,0x7F030086,0x7F030087,0x7F030088,0x7F030089,0x7F03008A,0x7F0300A6,0x7F0300D1,0x7F0300DF,0x7F030126 }
public static int[] RecyclerView = new int[] {
16842948,
16842993,
- 2130771968,
- 2130771969,
- 2130771970,
- 2130771971,
- 2130771972,
- 2130771973,
- 2130771974,
- 2130771975,
- 2130771976};
+ 2130903174,
+ 2130903175,
+ 2130903176,
+ 2130903177,
+ 2130903178,
+ 2130903206,
+ 2130903249,
+ 2130903263,
+ 2130903334};
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
@@ -6164,51 +6208,52 @@
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
- // aapt resource value: 6
- public const int RecyclerView_fastScrollEnabled = 6;
-
- // aapt resource value: 9
- public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
-
- // aapt resource value: 10
- public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
-
- // aapt resource value: 7
- public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
-
- // aapt resource value: 8
- public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
-
// aapt resource value: 2
- public const int RecyclerView_layoutManager = 2;
-
- // aapt resource value: 4
- public const int RecyclerView_reverseLayout = 4;
+ public const int RecyclerView_fastScrollEnabled = 2;
// aapt resource value: 3
- public const int RecyclerView_spanCount = 3;
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
+
+ // aapt resource value: 4
+ public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
// aapt resource value: 5
- public const int RecyclerView_stackFromEnd = 5;
+ public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
+ // aapt resource value: 6
+ public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
+
+ // aapt resource value: 7
+ public const int RecyclerView_layoutManager = 7;
+
+ // aapt resource value: 8
+ public const int RecyclerView_reverseLayout = 8;
+
+ // aapt resource value: 9
+ public const int RecyclerView_spanCount = 9;
+
+ // aapt resource value: 10
+ public const int RecyclerView_stackFromEnd = 10;
+
+ // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F030057,0x7F030066,0x7F030075,0x7F030096,0x7F03009F,0x7F0300A5,0x7F0300CB,0x7F0300CC,0x7F0300D2,0x7F0300D3,0x7F030129,0x7F03012E,0x7F03015A }
public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
16843364,
- 2130772177,
- 2130772178,
- 2130772179,
- 2130772180,
- 2130772181,
- 2130772182,
- 2130772183,
- 2130772184,
- 2130772185,
- 2130772186,
- 2130772187,
- 2130772188,
- 2130772189};
+ 2130903127,
+ 2130903142,
+ 2130903157,
+ 2130903190,
+ 2130903199,
+ 2130903205,
+ 2130903243,
+ 2130903244,
+ 2130903250,
+ 2130903251,
+ 2130903337,
+ 2130903342,
+ 2130903386};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -6222,83 +6267,84 @@
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
- // aapt resource value: 8
- public const int SearchView_closeIcon = 8;
-
- // aapt resource value: 13
- public const int SearchView_commitIcon = 13;
-
- // aapt resource value: 7
- public const int SearchView_defaultQueryHint = 7;
-
- // aapt resource value: 9
- public const int SearchView_goIcon = 9;
+ // aapt resource value: 4
+ public const int SearchView_closeIcon = 4;
// aapt resource value: 5
- public const int SearchView_iconifiedByDefault = 5;
-
- // aapt resource value: 4
- public const int SearchView_layout = 4;
-
- // aapt resource value: 15
- public const int SearchView_queryBackground = 15;
+ public const int SearchView_commitIcon = 5;
// aapt resource value: 6
- public const int SearchView_queryHint = 6;
+ public const int SearchView_defaultQueryHint = 6;
- // aapt resource value: 11
- public const int SearchView_searchHintIcon = 11;
+ // aapt resource value: 7
+ public const int SearchView_goIcon = 7;
+
+ // aapt resource value: 8
+ public const int SearchView_iconifiedByDefault = 8;
+
+ // aapt resource value: 9
+ public const int SearchView_layout = 9;
// aapt resource value: 10
- public const int SearchView_searchIcon = 10;
+ public const int SearchView_queryBackground = 10;
- // aapt resource value: 16
- public const int SearchView_submitBackground = 16;
-
- // aapt resource value: 14
- public const int SearchView_suggestionRowLayout = 14;
+ // aapt resource value: 11
+ public const int SearchView_queryHint = 11;
// aapt resource value: 12
- public const int SearchView_voiceIcon = 12;
+ public const int SearchView_searchHintIcon = 12;
+ // aapt resource value: 13
+ public const int SearchView_searchIcon = 13;
+
+ // aapt resource value: 14
+ public const int SearchView_submitBackground = 14;
+
+ // aapt resource value: 15
+ public const int SearchView_suggestionRowLayout = 15;
+
+ // aapt resource value: 16
+ public const int SearchView_voiceIcon = 16;
+
+ // aapt resource value: { 0x10100EA,0x10100EB,0x7F0300E5,0x7F0300E8,0x7F0300E9,0x7F0300EA,0x7F0300F1,0x7F0300F2,0x7F0300F3,0x7F0300F4,0x7F0300F5,0x7F0300F6,0x7F0300F7,0x7F0300FA,0x7F0300FB,0x7F0300FC,0x7F0300FD,0x7F0300FE,0x7F0300FF,0x7F030101,0x7F030102,0x7F030103,0x7F030104,0x7F030107,0x7F030108,0x7F03010B,0x7F03010C,0x7F03010D,0x7F03010E,0x7F03010F,0x7F030110,0x7F030111,0x7F030112,0x7F030113,0x7F030114,0x7F030117,0x7F030118 }
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 2130772234,
- 2130772244,
- 2130772260,
- 2130772261,
- 2130772262,
- 2130772263,
- 2130772264,
- 2130772265,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269,
- 2130772270,
- 2130772271,
- 2130772272,
- 2130772273,
- 2130772274,
- 2130772275,
- 2130772276,
- 2130772277,
- 2130772278,
- 2130772279,
- 2130772280,
- 2130772281,
- 2130772282,
- 2130772283,
- 2130772284,
- 2130772285,
- 2130772286,
- 2130772287,
- 2130772288,
- 2130772289,
- 2130772290,
- 2130772291,
- 2130772292};
+ 2130903269,
+ 2130903272,
+ 2130903273,
+ 2130903274,
+ 2130903281,
+ 2130903282,
+ 2130903283,
+ 2130903284,
+ 2130903285,
+ 2130903286,
+ 2130903287,
+ 2130903290,
+ 2130903291,
+ 2130903292,
+ 2130903293,
+ 2130903294,
+ 2130903295,
+ 2130903297,
+ 2130903298,
+ 2130903299,
+ 2130903300,
+ 2130903303,
+ 2130903304,
+ 2130903307,
+ 2130903308,
+ 2130903309,
+ 2130903310,
+ 2130903311,
+ 2130903312,
+ 2130903313,
+ 2130903314,
+ 2130903315,
+ 2130903316,
+ 2130903319,
+ 2130903320};
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -6306,127 +6352,129 @@
// aapt resource value: 1
public const int SmartRefreshLayout_android_clipToPadding = 1;
+ // aapt resource value: { 0x7F0300A7,0x7F0300A8 }
+ public static int[] SmartRefreshLayout_Layout = new int[] {
+ 2130903207,
+ 2130903208};
+
+ // aapt resource value: 0
+ public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
+
+ // aapt resource value: 1
+ public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
+
// aapt resource value: 2
public const int SmartRefreshLayout_srlAccentColor = 2;
- // aapt resource value: 34
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
-
- // aapt resource value: 33
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
-
- // aapt resource value: 9
- public const int SmartRefreshLayout_srlDragRate = 9;
-
- // aapt resource value: 21
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
-
- // aapt resource value: 31
- public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
-
- // aapt resource value: 30
- public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
-
- // aapt resource value: 28
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
-
- // aapt resource value: 29
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
-
- // aapt resource value: 17
- public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
-
- // aapt resource value: 16
- public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
-
- // aapt resource value: 15
- public const int SmartRefreshLayout_srlEnableLoadMore = 15;
-
- // aapt resource value: 27
- public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
-
- // aapt resource value: 24
- public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
-
- // aapt resource value: 22
- public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
-
- // aapt resource value: 32
- public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
-
- // aapt resource value: 20
- public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
-
- // aapt resource value: 23
- public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
-
- // aapt resource value: 14
- public const int SmartRefreshLayout_srlEnableRefresh = 14;
-
- // aapt resource value: 25
- public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
-
- // aapt resource value: 26
- public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
-
- // aapt resource value: 36
- public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
-
- // aapt resource value: 35
- public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlFooterHeight = 6;
-
- // aapt resource value: 8
- public const int SmartRefreshLayout_srlFooterInsetStart = 8;
-
- // aapt resource value: 11
- public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
-
- // aapt resource value: 19
- public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
-
- // aapt resource value: 13
- public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlHeaderHeight = 5;
-
- // aapt resource value: 7
- public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
-
- // aapt resource value: 10
- public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
-
- // aapt resource value: 18
- public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
-
- // aapt resource value: 12
- public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
-
// aapt resource value: 3
- public const int SmartRefreshLayout_srlPrimaryColor = 3;
+ public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
// aapt resource value: 4
- public const int SmartRefreshLayout_srlReboundDuration = 4;
+ public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
- public static int[] SmartRefreshLayout_Layout = new int[] {
- 2130772233,
- 2130772293};
+ // aapt resource value: 5
+ public const int SmartRefreshLayout_srlDragRate = 5;
- // aapt resource value: 1
- public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+ // aapt resource value: 6
+ public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
- // aapt resource value: 0
- public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+ // aapt resource value: 7
+ public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
+ // aapt resource value: 8
+ public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
+
+ // aapt resource value: 9
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
+
+ // aapt resource value: 10
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
+
+ // aapt resource value: 11
+ public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
+
+ // aapt resource value: 12
+ public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
+
+ // aapt resource value: 13
+ public const int SmartRefreshLayout_srlEnableLoadMore = 13;
+
+ // aapt resource value: 14
+ public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
+
+ // aapt resource value: 15
+ public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
+
+ // aapt resource value: 16
+ public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
+
+ // aapt resource value: 17
+ public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
+
+ // aapt resource value: 18
+ public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
+
+ // aapt resource value: 19
+ public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
+
+ // aapt resource value: 20
+ public const int SmartRefreshLayout_srlEnableRefresh = 20;
+
+ // aapt resource value: 21
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
+
+ // aapt resource value: 22
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
+
+ // aapt resource value: 23
+ public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
+
+ // aapt resource value: 24
+ public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
+
+ // aapt resource value: 25
+ public const int SmartRefreshLayout_srlFooterHeight = 25;
+
+ // aapt resource value: 26
+ public const int SmartRefreshLayout_srlFooterInsetStart = 26;
+
+ // aapt resource value: 27
+ public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
+
+ // aapt resource value: 28
+ public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
+
+ // aapt resource value: 29
+ public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
+
+ // aapt resource value: 30
+ public const int SmartRefreshLayout_srlHeaderHeight = 30;
+
+ // aapt resource value: 31
+ public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
+
+ // aapt resource value: 32
+ public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+
+ // aapt resource value: 33
+ public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+
+ // aapt resource value: 34
+ public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+
+ // aapt resource value: 35
+ public const int SmartRefreshLayout_srlPrimaryColor = 35;
+
+ // aapt resource value: 36
+ public const int SmartRefreshLayout_srlReboundDuration = 36;
+
+ // aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0300C6 }
public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
16843362,
- 2130772006};
+ 2130903238};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -6443,21 +6491,22 @@
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
+ // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F0300DC,0x7F0300E3,0x7F03012F,0x7F030130,0x7F030132,0x7F030140,0x7F030141,0x7F030142,0x7F030157,0x7F030158,0x7F030159 }
public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
- 2130772190,
- 2130772191,
- 2130772192,
- 2130772193,
- 2130772194,
- 2130772195,
- 2130772196,
- 2130772197,
- 2130772198,
- 2130772199,
- 2130772200};
+ 2130903260,
+ 2130903267,
+ 2130903343,
+ 2130903344,
+ 2130903346,
+ 2130903360,
+ 2130903361,
+ 2130903362,
+ 2130903383,
+ 2130903384,
+ 2130903385};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -6468,39 +6517,40 @@
// aapt resource value: 2
public const int SwitchCompat_android_thumb = 2;
- // aapt resource value: 13
- public const int SwitchCompat_showText = 13;
+ // aapt resource value: 3
+ public const int SwitchCompat_showText = 3;
- // aapt resource value: 12
- public const int SwitchCompat_splitTrack = 12;
+ // aapt resource value: 4
+ public const int SwitchCompat_splitTrack = 4;
- // aapt resource value: 10
- public const int SwitchCompat_switchMinWidth = 10;
+ // aapt resource value: 5
+ public const int SwitchCompat_switchMinWidth = 5;
- // aapt resource value: 11
- public const int SwitchCompat_switchPadding = 11;
+ // aapt resource value: 6
+ public const int SwitchCompat_switchPadding = 6;
- // aapt resource value: 9
- public const int SwitchCompat_switchTextAppearance = 9;
+ // aapt resource value: 7
+ public const int SwitchCompat_switchTextAppearance = 7;
// aapt resource value: 8
public const int SwitchCompat_thumbTextPadding = 8;
- // aapt resource value: 3
- public const int SwitchCompat_thumbTint = 3;
+ // aapt resource value: 9
+ public const int SwitchCompat_thumbTint = 9;
- // aapt resource value: 4
- public const int SwitchCompat_thumbTintMode = 4;
+ // aapt resource value: 10
+ public const int SwitchCompat_thumbTintMode = 10;
- // aapt resource value: 5
- public const int SwitchCompat_track = 5;
+ // aapt resource value: 11
+ public const int SwitchCompat_track = 11;
- // aapt resource value: 6
- public const int SwitchCompat_trackTint = 6;
+ // aapt resource value: 12
+ public const int SwitchCompat_trackTint = 12;
- // aapt resource value: 7
- public const int SwitchCompat_trackTintMode = 7;
+ // aapt resource value: 13
+ public const int SwitchCompat_trackTintMode = 13;
+ // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F03008C,0x7F030133 }
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -6513,8 +6563,8 @@
16843107,
16843108,
16843692,
- 2130772022,
- 2130772028};
+ 2130903180,
+ 2130903347};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -6549,42 +6599,43 @@
// aapt resource value: 1
public const int TextAppearance_android_typeface = 1;
- // aapt resource value: 12
- public const int TextAppearance_fontFamily = 12;
-
// aapt resource value: 11
- public const int TextAppearance_textAllCaps = 11;
+ public const int TextAppearance_fontFamily = 11;
+ // aapt resource value: 12
+ public const int TextAppearance_textAllCaps = 12;
+
+ // aapt resource value: { 0x10100AF,0x1010140,0x7F03004F,0x7F030059,0x7F03005A,0x7F030068,0x7F030069,0x7F03006A,0x7F03006B,0x7F03006C,0x7F03006D,0x7F0300B4,0x7F0300B5,0x7F0300B6,0x7F0300B9,0x7F0300BA,0x7F0300C6,0x7F03012A,0x7F03012B,0x7F03012C,0x7F030148,0x7F030149,0x7F03014A,0x7F03014B,0x7F03014C,0x7F03014D,0x7F03014E,0x7F03014F,0x7F030150 }
public static int[] Toolbar = new int[] {
16842927,
16843072,
- 2130771980,
- 2130771983,
- 2130771987,
- 2130771999,
- 2130772000,
- 2130772001,
- 2130772002,
- 2130772003,
- 2130772004,
- 2130772006,
- 2130772201,
- 2130772202,
- 2130772203,
- 2130772204,
- 2130772205,
- 2130772206,
- 2130772207,
- 2130772208,
- 2130772209,
- 2130772210,
- 2130772211,
- 2130772212,
- 2130772213,
- 2130772214,
- 2130772215,
- 2130772216,
- 2130772217};
+ 2130903119,
+ 2130903129,
+ 2130903130,
+ 2130903144,
+ 2130903145,
+ 2130903146,
+ 2130903147,
+ 2130903148,
+ 2130903149,
+ 2130903220,
+ 2130903221,
+ 2130903222,
+ 2130903225,
+ 2130903226,
+ 2130903238,
+ 2130903338,
+ 2130903339,
+ 2130903340,
+ 2130903368,
+ 2130903369,
+ 2130903370,
+ 2130903371,
+ 2130903372,
+ 2130903373,
+ 2130903374,
+ 2130903375,
+ 2130903376};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -6592,20 +6643,20 @@
// aapt resource value: 1
public const int Toolbar_android_minHeight = 1;
- // aapt resource value: 21
- public const int Toolbar_buttonGravity = 21;
+ // aapt resource value: 2
+ public const int Toolbar_buttonGravity = 2;
- // aapt resource value: 23
- public const int Toolbar_collapseContentDescription = 23;
+ // aapt resource value: 3
+ public const int Toolbar_collapseContentDescription = 3;
- // aapt resource value: 22
- public const int Toolbar_collapseIcon = 22;
+ // aapt resource value: 4
+ public const int Toolbar_collapseIcon = 4;
+
+ // aapt resource value: 5
+ public const int Toolbar_contentInsetEnd = 5;
// aapt resource value: 6
- public const int Toolbar_contentInsetEnd = 6;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetEndWithActions = 10;
+ public const int Toolbar_contentInsetEndWithActions = 6;
// aapt resource value: 7
public const int Toolbar_contentInsetLeft = 7;
@@ -6613,118 +6664,106 @@
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
- // aapt resource value: 5
- public const int Toolbar_contentInsetStart = 5;
-
// aapt resource value: 9
- public const int Toolbar_contentInsetStartWithNavigation = 9;
+ public const int Toolbar_contentInsetStart = 9;
- // aapt resource value: 4
- public const int Toolbar_logo = 4;
-
- // aapt resource value: 26
- public const int Toolbar_logoDescription = 26;
-
- // aapt resource value: 20
- public const int Toolbar_maxButtonHeight = 20;
-
- // aapt resource value: 25
- public const int Toolbar_navigationContentDescription = 25;
-
- // aapt resource value: 24
- public const int Toolbar_navigationIcon = 24;
+ // aapt resource value: 10
+ public const int Toolbar_contentInsetStartWithNavigation = 10;
// aapt resource value: 11
- public const int Toolbar_popupTheme = 11;
-
- // aapt resource value: 3
- public const int Toolbar_subtitle = 3;
-
- // aapt resource value: 13
- public const int Toolbar_subtitleTextAppearance = 13;
-
- // aapt resource value: 28
- public const int Toolbar_subtitleTextColor = 28;
-
- // aapt resource value: 2
- public const int Toolbar_title = 2;
-
- // aapt resource value: 14
- public const int Toolbar_titleMargin = 14;
-
- // aapt resource value: 18
- public const int Toolbar_titleMarginBottom = 18;
-
- // aapt resource value: 16
- public const int Toolbar_titleMarginEnd = 16;
-
- // aapt resource value: 15
- public const int Toolbar_titleMarginStart = 15;
-
- // aapt resource value: 17
- public const int Toolbar_titleMarginTop = 17;
-
- // aapt resource value: 19
- public const int Toolbar_titleMargins = 19;
+ public const int Toolbar_logo = 11;
// aapt resource value: 12
- public const int Toolbar_titleTextAppearance = 12;
+ public const int Toolbar_logoDescription = 12;
+
+ // aapt resource value: 13
+ public const int Toolbar_maxButtonHeight = 13;
+
+ // aapt resource value: 14
+ public const int Toolbar_navigationContentDescription = 14;
+
+ // aapt resource value: 15
+ public const int Toolbar_navigationIcon = 15;
+
+ // aapt resource value: 16
+ public const int Toolbar_popupTheme = 16;
+
+ // aapt resource value: 17
+ public const int Toolbar_subtitle = 17;
+
+ // aapt resource value: 18
+ public const int Toolbar_subtitleTextAppearance = 18;
+
+ // aapt resource value: 19
+ public const int Toolbar_subtitleTextColor = 19;
+
+ // aapt resource value: 20
+ public const int Toolbar_title = 20;
+
+ // aapt resource value: 21
+ public const int Toolbar_titleMargin = 21;
+
+ // aapt resource value: 22
+ public const int Toolbar_titleMarginBottom = 22;
+
+ // aapt resource value: 23
+ public const int Toolbar_titleMarginEnd = 23;
+
+ // aapt resource value: 26
+ public const int Toolbar_titleMargins = 26;
+
+ // aapt resource value: 24
+ public const int Toolbar_titleMarginStart = 24;
+
+ // aapt resource value: 25
+ public const int Toolbar_titleMarginTop = 25;
// aapt resource value: 27
- public const int Toolbar_titleTextColor = 27;
+ public const int Toolbar_titleTextAppearance = 27;
+ // aapt resource value: 28
+ public const int Toolbar_titleTextColor = 28;
+
+ // aapt resource value: { 0x7F030100,0x7F030105,0x7F030109,0x7F03010A,0x7F030115,0x7F030119 }
public static int[] TwoLevelHeader = new int[] {
- 2130772294,
- 2130772295,
- 2130772296,
- 2130772297,
- 2130772298,
- 2130772299};
-
- // aapt resource value: 5
- public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
-
- // aapt resource value: 4
- public const int TwoLevelHeader_srlEnableTwoLevel = 4;
-
- // aapt resource value: 3
- public const int TwoLevelHeader_srlFloorDuration = 3;
-
- // aapt resource value: 1
- public const int TwoLevelHeader_srlFloorRage = 1;
+ 2130903296,
+ 2130903301,
+ 2130903305,
+ 2130903306,
+ 2130903317,
+ 2130903321};
// aapt resource value: 0
- public const int TwoLevelHeader_srlMaxRage = 0;
+ public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
+
+ // aapt resource value: 1
+ public const int TwoLevelHeader_srlEnableTwoLevel = 1;
// aapt resource value: 2
- public const int TwoLevelHeader_srlRefreshRage = 2;
+ public const int TwoLevelHeader_srlFloorDuration = 2;
+ // aapt resource value: 3
+ public const int TwoLevelHeader_srlFloorRage = 3;
+
+ // aapt resource value: 4
+ public const int TwoLevelHeader_srlMaxRage = 4;
+
+ // aapt resource value: 5
+ public const int TwoLevelHeader_srlRefreshRage = 5;
+
+ // aapt resource value: { 0x1010000,0x10100DA,0x7F0300BF,0x7F0300C0,0x7F03013E }
public static int[] View = new int[] {
16842752,
16842970,
- 2130772218,
- 2130772219,
- 2130772220};
+ 2130903231,
+ 2130903232,
+ 2130903358};
- // aapt resource value: 1
- public const int View_android_focusable = 1;
-
- // aapt resource value: 0
- public const int View_android_theme = 0;
-
- // aapt resource value: 3
- public const int View_paddingEnd = 3;
-
- // aapt resource value: 2
- public const int View_paddingStart = 2;
-
- // aapt resource value: 4
- public const int View_theme = 4;
-
+ // aapt resource value: { 0x10100D4,0x7F030045,0x7F030046 }
public static int[] ViewBackgroundHelper = new int[] {
16842964,
- 2130772221,
- 2130772222};
+ 2130903109,
+ 2130903110};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -6735,6 +6774,7 @@
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
+ // aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
@@ -6749,31 +6789,20 @@
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
- public static int[] pickerview = new int[] {
- 2130772330,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772334,
- 2130772335};
-
- // aapt resource value: 4
- public const int pickerview_wheelview_dividerColor = 4;
+ // aapt resource value: 1
+ public const int View_android_focusable = 1;
// aapt resource value: 0
- public const int pickerview_wheelview_gravity = 0;
-
- // aapt resource value: 5
- public const int pickerview_wheelview_lineSpacingMultiplier = 5;
-
- // aapt resource value: 3
- public const int pickerview_wheelview_textColorCenter = 3;
+ public const int View_android_theme = 0;
// aapt resource value: 2
- public const int pickerview_wheelview_textColorOut = 2;
+ public const int View_paddingEnd = 2;
- // aapt resource value: 1
- public const int pickerview_wheelview_textSize = 1;
+ // aapt resource value: 3
+ public const int View_paddingStart = 3;
+
+ // aapt resource value: 4
+ public const int View_theme = 4;
static Styleable()
{
@@ -6784,6 +6813,25 @@
{
}
}
+
+ public partial class Xml
+ {
+
+ // aapt resource value: 0x7F0F0000
+ public const int file_paths = 2131689472;
+
+ // aapt resource value: 0x7F0F0001
+ public const int hdl_filepaths = 2131689473;
+
+ static Xml()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Xml()
+ {
+ }
+ }
}
}
#pragma warning restore 1591
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
old mode 100755
new mode 100644
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 6abbf03..5eb3467 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -177,9 +177,12 @@
<BundleResource Include="Resources\Phone\Room\ItemUnSelected.png" />
<BundleResource Include="Resources\Phone\Room\ItemUnSelected_Black.png" />
<BundleResource Include="Resources\Phone\Room\FavoriteRoom.png" />
+ <BundleResource Include="Resources\Phone\Room\Temperature.png" />
+ <BundleResource Include="Resources\Phone\Room\List.png" />
<BundleResource Include="Resources\Phone\Room\NoNameRoom.png" />
<BundleResource Include="Resources\Phone\Room\Room_Rectangle.png" />
<BundleResource Include="Resources\Phone\Room\RoomCardView_Name.png" />
+ <BundleResource Include="Resources\Phone\Room\Humidity.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\Instruct\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainAutoOpen.png" />
@@ -383,6 +386,7 @@
<BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
<BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
+ <BundleResource Include="Resources\Phone\Item\PlusSign2.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
<BundleResource Include="Resources\Phone\Item\DownLoad.png" />
@@ -411,7 +415,6 @@
<BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\Remote.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
- <BundleResource Include="Resources\Phone\Item\BottomShadow.png" />
<BundleResource Include="Resources\Phone\Item\Safety.png" />
<BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -431,6 +434,7 @@
<BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />
<BundleResource Include="Resources\Phone\Item\NextSelected.png" />
<BundleResource Include="Resources\Phone\Item\Timer.png" />
+ <BundleResource Include="Resources\Phone\Item\PlusSign2Selected.png" />
<BundleResource Include="Resources\Phone\Item\ShardMenu.png" />
<BundleResource Include="Resources\Phone\Item\UnLockFail.png" />
<BundleResource Include="Resources\Phone\Item\ProgressMsg.png" />
@@ -452,6 +456,7 @@
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
<BundleResource Include="Resources\Phone\Item\Floor.png" />
+ <BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -467,6 +472,7 @@
<BundleResource Include="Resources\Phone\Item\FunctionCardViewSelected.png" />
<BundleResource Include="Resources\Phone\Item\More.png" />
<BundleResource Include="Resources\Phone\Item\PswSettion.png" />
+ <BundleResource Include="Resources\Phone\Item\MinusSign2Selected.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected1.png" />
<BundleResource Include="Resources\Phone\Item\FailIcon.png" />
<BundleResource Include="Resources\Phone\Item\Message.png" />
@@ -646,6 +652,7 @@
<BundleResource Include="Resources\Phone\Account\UnhidePwd.png" />
<BundleResource Include="Resources\Phone\Scene\Delaying.png" />
<BundleResource Include="Resources\Phone\Scene\Selected.png" />
+ <BundleResource Include="Resources\Phone\Scene\Background.png" />
<BundleResource Include="Resources\Phone\Scene\SceneIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\17Icon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\4Icon.png" />
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
old mode 100755
new mode 100644
index 8724e0e..d6e2069
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -71,7 +71,7 @@
66=璇峰皢IC鍗℃斁鍦ㄦ劅搴斿尯鍩熶笂
67=褰曞叆鐘舵��
68=瀵嗙爜褰曞叆鎴愬姛
-69=瀵嗙爜澶囨敞锛�
+69=瀵嗙爜澶囨敞:
70=閰嶅瀹㈡埛
71=鏃�
72=鎴愬憳绠＄悊
@@ -642,9 +642,33 @@
10129=璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
10130=鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
10131=璐﹀彿鎴栧瘑鐮侀敊璇�
-10132=璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+10132=璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
10133=璇疯緭鍏ラ獙璇佺爜
10134=鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
+10135=鐧诲綍涓�...
+10136=褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
+10137=浣忓畢鍚嶇О涓虹┖
+10138=閭閿欒锛岃閲嶆柊杈撳叆
+10139=鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
+10141=浣犲凡琚己鍒朵笅绾匡紒
+
+10150=鏀规埧闂村悕绉板凡瀛樺湪
+10151=鍦烘櫙鍚嶄笉鑳戒负绌�
+10152=鎺у埗鍦烘櫙澶辫触
+10153=鍦烘櫙涓虹┖
+10154=璇ュ満鏅腑娌℃湁鎵ц鐩爣
+10155=鎿嶄綔澶辫触
+10156=鍙戦�侀獙璇佺爜澶辫触
+10157=缃戝叧涓嶅湪绾�
+
+10160=宸叉槸鏈�鏂扮増鏈�
+10161=鏇存柊
+10162=鏇存柊鍐呭
+10163=鏇存柊澶辫触
+10164=鏇存柊涓�...
+10165=鍙栨秷鏇存柊
+
+
11000=鍔熻兘
11001=鍦烘櫙
@@ -1666,6 +1690,12 @@
15975=姝ｅ湪涓婁紶澶囦唤鏂囦欢
15976=纭鍒犻櫎鍏ㄩ儴娑堟伅?
15977=纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
+15978=閫氫俊閾炬帴澶辫触
+15979=鑾峰彇缃戠粶SSID澶辫触
+15980=瀵嗙爜鍙戦�佸け璐�
+15981=閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15982=璇疯繛鎺ュ搴璚iFi
+15983=姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/Home.Ios/Resources/LaunchScreen.xib b/ZigbeeApp/Home.Ios/Resources/LaunchScreen.xib
deleted file mode 100755
index e194da2..0000000
--- a/ZigbeeApp/Home.Ios/Resources/LaunchScreen.xib
+++ /dev/null
@@ -1,43 +0,0 @@
-锘�<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
- <dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
- <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
- </dependencies>
- <objects>
- <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
- <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
- <view contentMode="scaleToFill" id="iN0-l3-epB">
- <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
- <subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
- minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
- <rect key="frame" x="20" y="439" width="441" height="21" />
- <fontDescription key="fontDescription" type="system" pointSize="17" />
- <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
- <nil key="highlightedColor" />
- </label>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Home.IOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
- minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
- <rect key="frame" x="20" y="140" width="441" height="43" />
- <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
- <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
- <nil key="highlightedColor" />
- </label>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
- <constraints>
- <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
- <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
- <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
- <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
- <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
- <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
- </constraints>
- <nil key="simulatedStatusBarMetrics" />
- <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
- <point key="canvasLocation" x="548" y="455" />
- </view>
- </objects>
-</document>
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/BottomShadow.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/BottomShadow.png
deleted file mode 100755
index 17ea24b..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Item/BottomShadow.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2.png
new file mode 100755
index 0000000..0ae50e7
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2Selected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2Selected.png
new file mode 100755
index 0000000..4c660b7
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/MinusSign2Selected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2.png
new file mode 100755
index 0000000..e9b40fa
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2Selected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2Selected.png
new file mode 100755
index 0000000..f6dcee1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/PlusSign2Selected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Room/Humidity.png b/ZigbeeApp/Home.Ios/Resources/Phone/Room/Humidity.png
new file mode 100755
index 0000000..4986073
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Room/Humidity.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Room/List.png b/ZigbeeApp/Home.Ios/Resources/Phone/Room/List.png
new file mode 100755
index 0000000..b63955c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Room/List.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Room/Temperature.png b/ZigbeeApp/Home.Ios/Resources/Phone/Room/Temperature.png
new file mode 100755
index 0000000..fc66b4f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Room/Temperature.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Scene/Background.png b/ZigbeeApp/Home.Ios/Resources/Phone/Scene/Background.png
new file mode 100755
index 0000000..10c30f2
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Scene/Background.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
new file mode 100644
index 0000000..0034a0b
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
@@ -0,0 +1,775 @@
+{
+ "protocol_version" : "0.0.5",
+ "configuration" : {
+ "version" : "(6.6.0.155) (2019-08/296a9afdb24)",
+ "tlc" : "normal",
+ "sigsgev" : "altstack",
+ "notifications" : "kqueue",
+ "architecture" : "amd64",
+ "disabled_features" : "none",
+ "smallconfig" : "disabled",
+ "bigarrays" : "disabled",
+ "softdebug" : "enabled",
+ "interpreter" : "enabled",
+ "llvm_support" : "0",
+ "suspend" : "hybrid"
+ },
+ "memory" : {
+ "Resident Size" : "328982528",
+ "Virtual Size" : "5121175552",
+ "minor_gc_time" : "2192622",
+ "major_gc_time" : "85950198",
+ "minor_gc_count" : "15",
+ "major_gc_count" : "536",
+ "major_gc_time_concurrent" : "1554106"
+ },
+ "threads" : [
+ {
+ "is_managed" : false,
+ "offset_free_hash" : "0x0",
+ "offset_rich_hash" : "0x0",
+ "crashed" : false,
+ "native_thread_id" : "0x70000e3ec000",
+ "thread_info_addr" : "0x7fa814800000",
+ "thread_name" : "Finalizer",
+ "ctx" : {
+ "IP" : "0x7fff67cf5266",
+ "SP" : "0x70000e3ebda8",
+ "BP" : "0x70000e3ebe50"
+ },
+ "unmanaged_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cdac156",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf52775",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf524a7",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10ce16f3c",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67dabb5d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x20",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf53373",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67db42eb",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67db7249",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67db340d",
+ "native_offset" : "0x00000"
+ }
+
+ ]
+ },
+ {
+ "is_managed" : false,
+ "offset_free_hash" : "0x0",
+ "offset_rich_hash" : "0x0",
+ "crashed" : false,
+ "native_thread_id" : "0x11ce5d5c0",
+ "thread_info_addr" : "0x7fa813806000",
+ "thread_name" : "tid_307",
+ "ctx" : {
+ "IP" : "0x7fff67cf886a",
+ "SP" : "0x7ffee2f06c98",
+ "BP" : "0x7ffee2f06d20"
+ },
+ "unmanaged_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cdac156",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf52775",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf524a7",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10ce16f3c",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67dabb5d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cdae5b6",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cffc7c0",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d0172e1",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf4f774",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf4f58a",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cd716c2",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10ccfb848",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67bc03d5",
+ "native_offset" : "0x00000"
+ }
+
+ ]
+ },
+ {
+ "is_managed" : true,
+ "offset_free_hash" : "0x115869ea88",
+ "offset_rich_hash" : "0x115869ee42",
+ "crashed" : true,
+ "native_thread_id" : "0x70000eb7e000",
+ "thread_info_addr" : "0x7fa814d4c200",
+ "thread_name" : "Thread Pool Worker",
+ "ctx" : {
+ "IP" : "0x7fff67cfb2c6",
+ "SP" : "0x70000eb7c548",
+ "BP" : "0x70000eb7c580"
+ },
+ "managed_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "unregistered"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0000c"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001f80",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0001a"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001f27",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00028"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001f25",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00002"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000084",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x000ae"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000083",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x600006a",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00048"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x60000a1",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000067",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000075",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00057"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x0002a"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "unregistered"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0000c"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6004cdb",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0006a"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x60048c4",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000039",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00019"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000166",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00029"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000181",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe8",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00007"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001ec3",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00071"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001ec1",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe6",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00021"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fce",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00074"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe3",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0002a"
+ }
+
+ ],
+ "unmanaged_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cdac156",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf52775",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf52dfa",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10ce17f46",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cdb0c65",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10ce172db",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67dabb5d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d07d439",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67c656a6",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d021cb7",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d002b2f",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d02203e",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d0221bf",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cebce76",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cebd478",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d01019f",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10d0104b0",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cebf7ab",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cee2675",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000083",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x60000a1",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cd0c62d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf2bfa4",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf303a6",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cec76f4",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x60048c4",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000181",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001ec1",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe3",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cd0c62d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf2bfa4",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf55ec0",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10ce8828c",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10cf53373",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67db42eb",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67db7249",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff67db340d",
+ "native_offset" : "0x00000"
+ }
+
+ ]
+}
+]
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index e64b370..4300bdc 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -62,7 +62,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.19112901";
+ public static string CodeIDString = "1.0.19120501";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 7259cdb..1362810 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1639,16 +1639,16 @@
/// <returns></returns>
public string AppendVersion(int versionValue)
{
- //杞负16杩涘埗
- string txt64 = Convert.ToString(versionValue, 16).PadLeft(4, '0');
+ //鐩存帴鏄�10杩涘埗
+ string txt10 = Convert.ToString(versionValue).PadLeft(4, '0');
//杩欎釜鏄皬鏁扮偣鍓嶉潰鐨勫��
- int value1 = Convert.ToInt32(txt64.Substring(0, 2), 16);
+ int value1 = Convert.ToInt32(txt10.Substring(0, txt10.Length - 2));
//杩欎釜鏄皬鏁扮偣鍚庨潰鐨勫��
- int value2 = Convert.ToInt32(txt64.Substring(2, 2), 16);
+ int value2 = Convert.ToInt32(txt10.Substring(txt10.Length - 2, 2));
//Ver.
string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);
- return ver + value1 + "." + value2.ToString().PadLeft(3, '0');
+ return ver + value1 + "." + value2.ToString().PadLeft(2, '0');
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 204d2a4..138ad8e 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -235,8 +235,6 @@
/// </summary>
public static async System.Threading.Tasks.Task<List<string>> GetHomeLists()
{
- //娓呯┖褰撳墠浣忓畢鍒楄〃
- Config.Instance.HomeFilePathList.Clear();
var pageSetting = new SendDataToServer.ResidenceListPageSettingObj()
{
PageSize = CommonPage.PageSize
@@ -266,7 +264,7 @@
if (responseDataObj.TotalCount == 0)
{
//褰撲綇瀹呬负绌烘椂鍏堟彁绀虹敤鎴锋柊寤轰綇瀹�
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
+ var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
alert.Show();
alert.ResultEventHandler += (sender, e) =>
{
@@ -278,6 +276,8 @@
}
else
{
+ //娓呯┖褰撳墠浣忓畢鍒楄〃
+ Config.Instance.HomeFilePathList.Clear();
if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
{
//璧嬩竴涓垵濮嬪��
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index e61dadc..2c56f46 100755
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -112,11 +112,11 @@
{
return null;
}
- if (TaskList[0].Data1 == 0)
+ if (TaskList[0].Data1 == 1)
{
return Language.StringByID(R.MyInternationalizationString.Shut);
}
- return $"{TaskList[0].Data1}%";
+ return $"{TaskList[0].Data2}%";
}
else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
{
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index c3e834f..90baaca 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -11,7 +11,7 @@
}
public static ZigbeeColor Current;
-
+
#region 寰愭
public uint MainColor = 0xFFEAEAEA;
public uint BottomMenuColor = 0xFFFFFFFF;
@@ -117,6 +117,10 @@
/// 娴呯櫧鑳屾櫙 0xFFF5F6FA
/// </summary>
public uint GXCGrayBackgroundColor = 0xFFF5F6FA;
+ /// <summary>
+ /// 0x73000000
+ /// </summary>
+ public uint GXCGrayBackgroundColor2 = 0x73000000;
/// <summary>
/// 榛戣壊鑳屾櫙 0xFF232323
/// </summary>
@@ -304,7 +308,7 @@
public uint LogicTextBlueColor = 0xFF00AAF0;
public uint LogicDelBackgroundColor = 0xFFFF0000;
public uint LogicEditBlackColor = 0xFF00aaf0;
- public uint LogicTimeViewColor= 0xFFFFFFFF;
+ public uint LogicTimeViewColor = 0xFFFFFFFF;
public uint LogicTimeViewSaveButton = 0xFF121212;
//鏈�鏂癠I棰滆壊
public uint LogicTopBackgroundColor = 0xFFF9F9F9;
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 354eaa7..9fba2ee 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
index 41cbd1b..e0c512c 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index e7138c2..16b41e8 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index b287b75..fcb1103 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 89a2645..75a3412 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
index d984867..02f4c26 100755
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
@@ -3,6 +3,7 @@
using ZigBee.Device;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserView;
+using Shared.Phone.Device.DeviceLogic;
namespace Shared.Phone.Device.AC
{
@@ -410,16 +411,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
UserView.UserHomeView.ReadStatus(ac, () =>
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
});
}
else
@@ -427,16 +419,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
index c232736..2a07059 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
@@ -61,6 +61,7 @@
/// </summary>
public AccountForgetPWD()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
Tag = "Forgot";
}
@@ -190,7 +191,7 @@
private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
{
accountCodeFrameLayout.RemoveAll();
-
+ account = string.Empty;
if (phoneOrEmail == "Phone")
{
phoneRow = new PhoneRowForm();
@@ -241,15 +242,16 @@
private void Account_TextChange(object sender, string mouseEventArgs)
{
errorBtn.Text = "";
+
if ((sender as EditText).Text.Trim().Length > 0)
{
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
+ account = (sender as EditText).Text.Trim();
}
else
{
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
}
- //account = (sender as EditText).Text.Trim();
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
new file mode 100755
index 0000000..5199260
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
@@ -0,0 +1,83 @@
+锘縰sing System;
+using System.Text.RegularExpressions;
+using Shared.Common;
+
+namespace Shared.Phone.Device.Account
+{
+ public class AccountLogic
+ {
+ #region 鈼� 鍙橀噺____________________________
+ /// <summary>
+ /// _instance
+ /// </summary>
+ private static AccountLogic _instance;
+ /// <summary>
+ /// Instance
+ /// </summary>
+ public static AccountLogic Instance
+ {
+ get
+ {
+ if(_instance==null)
+ {
+ _instance = new AccountLogic();
+ }
+ return _instance;
+ }
+ }
+
+ #endregion
+
+ #region 鈼� 閭____________________________
+
+ /// <summary>
+ /// 妫�鏌ラ偖绠卞悎娉曟��
+ /// </summary>
+ /// <param name="email"></param>
+ /// <returns></returns>
+ public bool CheckEmail(string email)
+ {
+ var regex= new Regex(CommonPage.EmailRegexStr);
+ return regex.IsMatch(email);
+ }
+
+
+
+ #endregion
+
+ #region 鈼� 鎵嬫満____________________________
+
+ /// <summary>
+ /// 妫�鏌ユ墜鏈哄彿鍚堟硶鎬�
+ /// </summary>
+ /// <param name="phone"></param>
+ /// <returns></returns>
+ public bool CheckPhone(string phone)
+ {
+ var regex = new Regex(CommonPage.PhoneForForeignRegexStr);
+ return regex.IsMatch(phone);
+ }
+
+ /// <summary>
+ /// 妫�鏌ユ墜鏈哄彿鍚堟硶鎬с�佸尯鍒嗗尯鍙�
+ /// </summary>
+ /// <param name="phone">鎵嬫満鍙�</param>
+ /// <param name="zoneCode">鍖哄彿</param>
+ /// <returns></returns>
+ public bool CheckPhoneWithZone(string phone,string zoneCode)
+ {
+ if(zoneCode=="86")
+ {
+ var regex = new Regex(CommonPage.PhoneRegexStr);
+ return regex.IsMatch(phone);
+ }
+ else
+ {
+ var regex = new Regex(CommonPage.PhoneForForeignRegexStr);
+ return regex.IsMatch(phone);
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index a79dba4..3cab11a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -83,6 +83,7 @@
/// </summary>
public AccountLogin()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
Tag = "Login";
}
@@ -342,6 +343,11 @@
{
try
{
+ if(CheckAccount(accountStr)==false)
+ {
+ return;
+ }
+
CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
var requestObj = new SendDataToServer.LoginObj
@@ -459,6 +465,32 @@
//});
};
action();
+ }
+
+ /// <summary>
+ /// CheckAccount
+ /// </summary>
+ /// <param name="accountStr"></param>
+ /// <returns></returns>
+ private bool CheckAccount(string accountStr)
+ {
+ if (phoneEmailForm.SelectedEmail.IsSelected)
+ {
+ if (AccountLogic.Instance.CheckEmail(accountStr) == false)
+ {
+ loginErrorBtn.TextID = R.MyInternationalizationString.TheEmailError;
+ return false;
+ }
+ }
+ else
+ {
+ if (AccountLogic.Instance.CheckPhone(accountStr) == false)
+ {
+ loginErrorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
+ }
+ }
+ return true;
}
/// <summary>
@@ -660,6 +692,7 @@
{
phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
loginBtn.Enable = loginBtn.IsSelected = false;
+ loginErrorBtn.Text = string.Empty;
(sender as Button).IsSelected = true;
if((sender as Button).Tag.ToString()=="Phone")
{
@@ -695,8 +728,6 @@
pwdRow = new PwdLoginRowForm();
pwdRow.Init(accountPwdFrameLayout, 29, 225);
pwdRow.PasswrodET.TextChangeEventHandler += Pwd_TextChange;
-
-
}
#endregion
@@ -724,7 +755,7 @@
private void Register(object sender,MouseEventArgs mouseEventArgs)
{
var registerPage = new AccountRegister();
- Shared.Common.CommonPage.Instance.AddChidren(registerPage);
+ CommonPage.Instance.AddChidren(registerPage);
registerPage.Show();
}
@@ -738,7 +769,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender,string mouseEventArgs)
{
- loginErrorBtn.Text = "";
+ loginErrorBtn.Text = string.Empty;
}
/// <summary>
@@ -748,7 +779,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Pwd_TextChange(object sender,string mouseEventArgs)
{
- loginErrorBtn.Text = "";
+ loginErrorBtn.Text = string.Empty;
if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow.AccountET.Text.Trim().Length>0))
{
loginBtn.Enable = loginBtn.IsSelected = true;
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
index bfdbd0d..3cb3282 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
@@ -87,6 +87,7 @@
/// </summary>
public AccountLoginByCode()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
Tag = "Login";
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
t = new Timer();
@@ -430,7 +431,8 @@
private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
{
accountCodeFrameLayout.RemoveAll();
-
+ account = string.Empty;
+ loginErrorBtn.Text = string.Empty;
if (phoneOrEmail == "Phone")
{
phoneRow = new PhoneRowForm();
@@ -459,11 +461,12 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender, string mouseEventArgs)
{
- loginErrorBtn.Text = "";
+ loginErrorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
IsRightAccount = true;
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
+ account= (sender as EditText).Text.Trim();
}
else
{
@@ -538,9 +541,9 @@
private void Register(object sender, MouseEventArgs mouseEventArgs)
{
this.RemoveFromParent();
- var login = new AccountLogin();
- CommonPage.Instance.AddChidren(login);
- login.Show();
+ var registerPage = new AccountRegister();
+ CommonPage.Instance.AddChidren(registerPage);
+ registerPage.Show();
}
#endregion
@@ -567,6 +570,11 @@
/// <param name="mouseEventArgs"></param>
private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
{
+ if (CheckAccount(account) == false)
+ {
+ return;
+ }
+
(sender as Button).Enable = (sender as Button).IsSelected = false;
CommonPage.Loading.Start();
try
@@ -635,6 +643,34 @@
CommonPage.Loading.Hide();
}
}
+
+ /// <summary>
+ /// CheckAccount
+ /// </summary>
+ /// <param name="accountStr"></param>
+ /// <returns></returns>
+ private bool CheckAccount(string accountStr)
+ {
+ loginErrorBtn.Text = string.Empty;
+ if (phoneEmailForm.SelectedEmail.IsSelected)
+ {
+ if (AccountLogic.Instance.CheckEmail(accountStr) == false)
+ {
+ loginErrorBtn.TextID = R.MyInternationalizationString.TheEmailError;
+ return false;
+ }
+ }
+ else
+ {
+ if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
+ {
+ loginErrorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
+ }
+ }
+ return true;
+ }
+
#endregion
#region 鈼� 楠岃瘉楠岃瘉鐮乢_______________________
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
index 6123f46..ff9b5c3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
@@ -65,6 +65,7 @@
#region 鈼� 鏋勯�犳柟娉昣________________________
public AccountRegister()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
Tag = "Register";
}
@@ -128,7 +129,7 @@
Width = Application.GetRealWidth(942),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetRealHeight(30)
+ Radius = (uint)Application.GetRealHeight(17)
};
bodyFrameLayout.AddChidren(accountCodeFL);
@@ -190,6 +191,8 @@
phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
registerBtn.Enable = registerBtn.IsSelected = false;
(sender as Button).IsSelected = true;
+ account = string.Empty;
+ errorBtn.Text = string.Empty;
if ((sender as Button).Tag.ToString() == "Phone")
{
AddPhoneOrEmailFL(accountCodeFL, "Phone");
@@ -208,7 +211,6 @@
private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
{
accountCodeFrameLayout.RemoveAll();
- account = string.Empty;
if (phoneOrEmail == "Phone")
{
phoneRow = new PhoneRowForm();
@@ -345,7 +347,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
//IsRightAccount = true;
@@ -366,7 +368,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Code_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
registerBtn.Enable = registerBtn.IsSelected = true;
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
index 48ea58b..38eabe4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
@@ -147,6 +147,7 @@
form.FinishSelectEvent += (code) =>
{
(sender as Button).Text = "+" + code;
+ CommonPage.PhoneZoneStr = code;
};
//var zoneListView = new PhoneZone { };
@@ -161,7 +162,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(193),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -574,7 +575,7 @@
PasswrodET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(550),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 777c8a8..89cc2bb 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -7,6 +7,7 @@
using Shared.Phone.Device.CommonForm;
using Shared.Phone.Device.AC;
using Shared.Phone.UserCenter.DoorLock;
+using Shared.Phone.Device.DeviceLogic;
namespace Shared.Phone.Device.Category
{
@@ -828,6 +829,7 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(functionTypeScrowView);
+ //functionSceneBodyView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
deviceListScrolView = new VerticalScrolViewLayout
{
@@ -838,7 +840,10 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(deviceListScrolView);
+ //deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
+
tempFunctionTypeBtn = new FunctionButton();
+ tempFunctionTypeBtn.Init("","");
EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
{
@@ -907,8 +912,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -916,8 +920,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1002,16 +1005,18 @@
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
{
@@ -1026,16 +1031,14 @@
{
UserHomeView.ReadStatus(airSwitch, () =>
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
{
if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1102,16 +1105,19 @@
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
+
}
else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
{
@@ -1126,18 +1132,14 @@
{
UserHomeView.ReadStatus(dimmableLight, () =>
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
});
}
else
{
if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1204,17 +1206,18 @@
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
-
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
{
@@ -1230,16 +1233,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
UserView.UserHomeView.ReadStatus(ac, () =>
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1247,16 +1241,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
}
}
@@ -1313,16 +1298,18 @@
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
@@ -1347,8 +1334,7 @@
{
UserHomeView.ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1356,8 +1342,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
}
}
@@ -1400,16 +1385,18 @@
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
@@ -1452,15 +1439,17 @@
{
Tag = deviceUI
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
else
{
@@ -1484,15 +1473,17 @@
{
Tag = deviceUI
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
}
};
@@ -1644,7 +1635,6 @@
var sceneView = new SceneCategoryView(0, 0);
sceneScrolView.AddChidren(sceneView);
sceneView.Init(scene, room);
- sceneView.SetViewShadow(true);
GetDelayScene(sceneScrolView);
}
}
@@ -1737,6 +1727,18 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// GetExecScene
+ /// </summary>
+ /// <param name="scrolViewLayout"></param>
+ private void GetExecScene(VerticalScrolViewLayout scrolViewLayout)
+ {
+ new System.Threading.Thread(() =>
+ {
+
+ })
+ { IsBackground = true }.Start();
+ }
#endregion
#region 鈼� 鑷姩鍖朹_________________________
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index 9763cd1..9781c78 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -59,7 +59,7 @@
/// <summary>
/// backGround
/// </summary>
- private Button backGround;
+ private ImageView backGround;
/// <summary>
/// 鏄惁淇敼
@@ -78,6 +78,14 @@
/// </summary>
public Common.Room modifyRoom;
+ /// <summary>
+ /// OldBackgroundImagePath
+ /// </summary>
+ private string OldBackgroundImagePath;
+ /// <summary>
+ /// OldIconPathType
+ /// </summary>
+ public int OldIconPathType;
#endregion
@@ -178,7 +186,6 @@
//璁惧璇︾粏璁剧疆鐣岄潰
void detailMouseUpEventHandler(object sender, MouseEventArgs e)
{
- //璁惧
if (targetDevice.Type == 0)
{
if (targetDevice.DeviceUI == null || targetDevice.DeviceUI.CommonDevice == null)
@@ -204,7 +211,6 @@
};
}
- //鏃堕棿闂撮殧
else if (targetDevice.Type == 2)
{
var delayTimeView = new SelectDelayTime();
@@ -223,7 +229,6 @@
RefreshTargetListView();
};
}
- //鍦烘櫙
else if (targetDevice.Type == 1)
{
var sceneView = new SelectScene();
@@ -270,16 +275,7 @@
/// </summary>
private void Init()
{
- //foreach (var floor in Config.Instance.Home.FloorDics)
- //{
- // floorIds.Add(floor.Key);
- // floorNames.Add(floor.Value);
- // if(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key).Count>0)
- // {
- // roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
- // rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
- // }
- //}
+
}
/// <summary>
@@ -324,14 +320,13 @@
};
bodyFrameLayout.AddChidren(imgFL);
- backGround = new Button()
+ backGround = new ImageView()
{
Width = Application.GetMinRealAverage(930),
Height = Application.GetMinRealAverage(464),
Gravity = Gravity.Center,
Radius = (uint)Application.GetMinRealAverage(CommonFormResouce.BigFormRadius),
- //UnSelectedImagePath = ImagePath
- UnSelectedImagePath = "SceneIcon/3.jpg"
+ ImagePath = "SceneIcon/3.jpg"
};
imgFL.AddChidren(backGround);
backGround.SetViewShadow(true);
@@ -421,12 +416,10 @@
};
addTargetFL.AddChidren(targetLine);
- //娣诲姞鐩爣鍚庣殑灞曠ず鍒楄〃
TargetListScrolView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(49+127),
Height = Application.GetRealHeight(730-127-49),
- //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
targetFL.AddChidren(TargetListScrolView);
@@ -435,10 +428,22 @@
if(isModify)
{
- backGround.UnSelectedImagePath = modifySceneUI.IconPath;
+ IconPathType = modifySceneUI.IconPathType;
+ OldIconPathType = modifySceneUI.IconPathType;
+ if (IconPathType != 0)
+ {
+ OldBackgroundImagePath = modifySceneUI.IconPath;
+ }
+ if (modifySceneUI.IconPathType==0)
+ {
+ backGround.ImagePath = modifySceneUI.IconPath;
+ }
+ else
+ {
+ backGround.ImagePath = System.IO.Path.Combine(Config.Instance.FullPath, modifySceneUI.IconPath);
+ }
nameRow.SetTitle(modifySceneUI.Name);
zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(modifyRoom.FloorId)},{modifyRoom.Name}");
- IconPathType = modifySceneUI.IconPathType;
curRoom = modifyRoom;
sceneTargetDevicesList.AddRange(modifySceneTargetDevicesList);
}
@@ -447,7 +452,6 @@
#region event
- //閫夋嫨鑳屾櫙鍥�
EventHandler<MouseEventArgs> backGroundIMGHander = (sender, e) =>
{
if (curRoom != null && curRoom.IsSharedRoom)
@@ -540,14 +544,14 @@
{
IconPathType = 0;
backGround.ImageBytes = null;
- backGround.UnSelectedImagePath = imgPath;
+ backGround.ImagePath = imgPath;
};
};
selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
{
selectFL.RemoveFromParent();
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Scene_{tradeTime}";
+ var fileName = $"SceneIcon_{tradeTime}";
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
{
@@ -555,13 +559,13 @@
{
if (IconPathType != 0)
{
- Global.DeleteFilebyHomeId(backGround.UnSelectedImagePath);
+ Global.DeleteFilebyHomeId(backGround.ImagePath);
}
}
IconPathType = 1;
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
- backGround.UnSelectedImagePath = imagePath;
+ backGround.ImagePath = imagePath;
System.IO.File.Delete(imagePath);
}, fileName, 2, 1);
@@ -571,7 +575,7 @@
{
selectFL.RemoveFromParent();
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Scene_{tradeTime}";
+ var fileName = $"SceneIcon_{tradeTime}";
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
@@ -579,13 +583,13 @@
{
if (IconPathType != 0)
{
- Global.DeleteFilebyHomeId(backGround.UnSelectedImagePath);
+ Global.DeleteFilebyHomeId(backGround.ImagePath);
}
}
IconPathType = 2;
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
- backGround.UnSelectedImagePath = imagePath;
+ backGround.ImagePath = imagePath;
System.IO.File.Delete(imagePath);
}, fileName, 2,1);
@@ -832,44 +836,42 @@
try
{
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Scene_{tradeTime}";
- //鏀瑰悕
+ var fileName = $"SceneIcon_{tradeTime}";
if (modifySceneUI.Name != nameRow.NameText.Text.Trim())
{
if (Common.Room.CurrentRoom.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
{
- Common.CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneHadExist);
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
return;
}
- //淇敼鍚嶅瓧
var r = await ZigBee.Device.Scene.RenameSceneAsync(modifySceneUI.Id, nameRow.NameText.Text.Trim());
var reName = r.sceneRenameResponseData.Result;
if (reName == 0)
{
- //澶辫触
return;
}
else if (reName == 1)
{
- //鎴愬姛
modifySceneUI.Name = nameRow.NameText.Text.Trim();
}
else if (reName == 2)
{
- //娌℃湁璇ュ満鏅�
return;
}
}
- //鍥剧墖
- if(IconPathType==1 || IconPathType ==2)
+ if (OldIconPathType != 0)
+ {
+ Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, OldBackgroundImagePath));
+ }
+ if (IconPathType == 1 || IconPathType == 2)
{
Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
- modifySceneUI.IconPath = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
+ modifySceneUI.IconPath = fileName;
}
else
{
- modifySceneUI.IconPath = backGround.UnSelectedImagePath;
+ modifySceneUI.IconPath = backGround.ImagePath;
}
modifySceneUI.IconPathType = IconPathType;
@@ -982,12 +984,10 @@
}
else if (result == 0)
{
- //澶辫触
Common.CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
}
else if (result == -1)
{
- //宸插瓨鍦�
Common.CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneHadExist);
}
}
@@ -1020,15 +1020,14 @@
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
var fileName = $"SceneIcon_{tradeTime}.png";
string imgPath;
- //鍥剧墖
if (IconPathType == 1 || IconPathType == 2)
{
Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
- imgPath = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
+ imgPath = fileName;
}
else
{
- imgPath = backGround.UnSelectedImagePath;
+ imgPath = backGround.ImagePath;
}
if (Common.Room.CurrentRoom.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
{
@@ -1091,12 +1090,10 @@
}
else if (result == 0)
{
- //澶辫触
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.AddSceneFail);
}
else if (result == -1)
{
- //宸插瓨鍦�
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneHadExist);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
index 9811dc5..188c42f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
@@ -75,18 +75,19 @@
{
var itemView = new FrameLayout()
{
- Height = Application.GetRealHeight(311 + CommonPage.XLeft)
+ Height = Application.GetRealHeight(311 + 58)
};
scrollView.AddChidren(itemView);
for (int i = 0; i < 2; i++)
{
- var icon = new Button()
+ var icon = new ImageView()
{
- X=Application.GetRealWidth(CommonPage.XLeft+i*(467+32)),
- Width=Application.GetMinRealAverage(467),
- Height=Application.GetMinRealAverage(311),
- Gravity=Gravity.CenterVertical,
- UnSelectedImagePath = $"SceneIcon/{k}.jpg",
+ X=Application.GetRealWidth(58+i*(467+32)),
+ Y=Application.GetRealHeight(58),
+ Width=Application.GetRealWidth(467),
+ Height=Application.GetRealHeight(311),
+ ImagePath = $"SceneIcon/{k}.jpg",
+ Radius =(uint)Application.GetRealHeight(17)
};
itemView.AddChidren(icon);
icon.SetViewShadow(true);
@@ -94,17 +95,13 @@
EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
{
- //CategoryAddScene.ImagePath = icon.UnSelectedImagePath;
- //Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
- action?.Invoke(icon.UnSelectedImagePath);
+ action?.Invoke(icon.ImagePath);
action = null;
this.RemoveFromParent();
-
};
icon.MouseUpEventHandler += selectIcon;
}
}
-
}
#endregion
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
index 9b92c37..96c797f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
@@ -724,7 +724,7 @@
if (sceneTarget.TaskList.Count > 0)
{
- if (sceneTarget.TaskList[0].Data1 == 0)
+ if (sceneTarget.TaskList[0].Data1 == 1)
{
open.IsSelected = false;
shut.IsSelected = true;
@@ -733,7 +733,7 @@
{
open.IsSelected = true;
shut.IsSelected = false;
- open.SetProgress(sceneTarget.TaskList[0].Data1);
+ open.SetProgress(sceneTarget.TaskList[0].Data2);
}
}
@@ -748,14 +748,14 @@
if (shut.IsSelected)
{
//鍏�
- data1 = 0;
+ data1 = 1;
data2 = 0;
}
else
{
//鐧惧垎姣�
- data1 = open.SeekBar.Progress;
- data2 = 0;
+ data1 = 5;
+ data2 = open.SeekBar.Progress;
}
var taskInfo = new ZigBee.Device.Scene.TaskListInfo
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs
index a4f3a70..ec4ead2 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs
@@ -3,7 +3,7 @@
namespace Shared.Phone.Device.CommonForm
{
- public class ButtonLineForm:FrameLayout
+ public class ButtonLineForm : FrameLayout
{
/// <summary>
/// name
@@ -65,12 +65,13 @@
{
Width = Width,
Height = Height - 3,
- TextColor=ZigbeeColor.Current.GXCTextGrayColor4,
- SelectedTextColor=ZigbeeColor.Current.GXCTextDeepBlackColor
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor4,
+ SelectedTextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
+ TextSize = CommonFormResouce.TextSize
};
AddChidren(NameBtn);
- Line = new Line(Height,Width/2,2);
+ Line = new Line(Height, Width / 2, 2);
AddChidren(Line);
}
@@ -99,6 +100,7 @@
public void SetStatu(bool statu)
{
NameBtn.IsSelected = Line.IsSelected = statu;
+ NameBtn.TextSize = statu ? CommonFormResouce.TextSize_Selected : CommonFormResouce.TextSize;
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
index b149316..6a94c98 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
@@ -224,7 +224,7 @@
/// <param name="statu"></param>
public void SetStatu(bool statu)
{
- OpenOrUpBtn.IsSelected = CloseOrDownBtn.IsSelected = StopBtn.IsSelected = statu;
+ //OpenOrUpBtn.IsSelected = CloseOrDownBtn.IsSelected = StopBtn.IsSelected = statu;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
index 85182b5..d019415 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
@@ -11,6 +11,15 @@
public const int AppRealWidth = 1080;
/// <summary>
+ /// 14
+ /// </summary>
+ public const int TextSize = 14;
+ /// <summary>
+ /// 16
+ /// </summary>
+ public const int TextSize_Selected = 16;
+
+ /// <summary>
/// 瀛椾綋12
/// </summary>
public const int loginTextSize = 12;
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
index ce78534..a6fc541 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
@@ -99,7 +99,7 @@
Y = Application.GetMinRealAverage(17),
Width = Application.GetMinRealAverage(320),
Height = Application.GetMinRealAverage(63),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextAlignment=TextAlignment.CenterLeft
};
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
index a39d1ff..3ac3e26 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
@@ -8,7 +8,7 @@
/// <summary>
/// SceneIcon
/// </summary>
- public Button Icon;
+ public ImageView Icon;
/// <summary>
/// RoomNameButton
/// </summary>
@@ -45,7 +45,7 @@
};
AddChidren(CardBG);
- Icon = new Button
+ Icon = new ImageView
{
X = Application.GetMinRealAverage(14),
Width = Application.GetMinRealAverage(467),
@@ -89,7 +89,7 @@
/// <param name="imagePath"></param>
public void SetRoomIcon(string imagePath)
{
- Icon.UnSelectedImagePath = imagePath;
+ Icon.ImagePath = imagePath;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
new file mode 100755
index 0000000..50deba0
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -0,0 +1,246 @@
+锘縰sing System;
+using Shared.Common;
+using Shared.Phone.UserCenter;
+using Shared.Phone.UserView;
+
+namespace Shared.Phone.Device.CommonForm
+{
+ public class RoomView:FrameLayout
+ {
+ /// <summary>
+ /// Room
+ /// </summary>
+ private Common.Room room;
+ /// <summary>
+ /// action
+ /// </summary>
+ public Action action;
+
+ public override void RemoveFromParent()
+ {
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+ base.RemoveFromParent();
+ }
+
+ /// <summary>
+ /// RoomView
+ /// </summary>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
+ public RoomView(int x, int y)
+ {
+ X = Application.GetRealWidth(x);
+ Y = Application.GetRealHeight(y);
+ Width = Application.GetRealWidth(717);
+ Height = Application.GetRealHeight(478);
+ }
+
+ /// <summary>
+ /// Init
+ /// </summary>
+ /// <param name="r"></param>
+ public void Init(Common.Room r)
+ {
+ this.room = r;
+
+ var roomBackView = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(717),
+ Height = Application.GetRealHeight(478)
+ };
+ AddChidren(roomBackView);
+
+ var roomImg = new ImageView()
+ {
+ ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage),
+ Radius = (uint)Application.GetRealHeight(17)
+ };
+ roomBackView.AddChidren(roomImg);
+
+ var roomNameBackground = new FrameLayout
+ {
+ X = Application.GetRealWidth(29),
+ Y = Application.GetRealHeight(282),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
+ };
+ roomBackView.AddChidren(roomNameBackground);
+ roomNameBackground.SetCornerWithSameRadius(Application.GetRealHeight(40), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);
+
+ var roomName = new Button()
+ {
+ X = Application.GetRealWidth(5),
+ Width = Application.GetRealWidth(190),
+ Text = room.Name,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ };
+ roomNameBackground.AddChidren(roomName);
+
+
+ var roomTemperatureBackground = new FrameLayout
+ {
+ X = Application.GetRealWidth(29),
+ Y = Application.GetRealHeight(374),
+ Width = Application.GetRealWidth(340),
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
+ };
+ roomBackView.AddChidren(roomTemperatureBackground);
+ roomTemperatureBackground.SetCornerWithSameRadius(Application.GetRealHeight(40), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);
+
+ var temperatureIcon = new Button
+ {
+ X = Application.GetRealWidth(12),
+ Width = Application.GetMinRealAverage(58),
+ Height = Application.GetMinRealAverage(58),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Room/Temperature.png"
+ };
+ roomTemperatureBackground.AddChidren(temperatureIcon);
+
+ var temperatureText = new Button
+ {
+ X = Application.GetRealWidth(69),
+ Width = Application.GetRealWidth(86),
+ Height = Application.GetRealHeight(58),
+ Gravity = Gravity.CenterVertical,
+ Text = "26鈩�"
+ };
+ roomTemperatureBackground.AddChidren(temperatureText);
+
+ var humidityIcon = new Button
+ {
+ X = Application.GetRealWidth(179),
+ Width = Application.GetMinRealAverage(58),
+ Height = Application.GetMinRealAverage(58),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Room/Humidity.png"
+ };
+ roomTemperatureBackground.AddChidren(humidityIcon);
+
+ var humidityText = new Button
+ {
+ X = Application.GetRealWidth(236),
+ Width = Application.GetRealWidth(86),
+ Height = Application.GetRealHeight(58),
+ Gravity = Gravity.CenterVertical,
+ Text = "13%"
+ };
+ roomTemperatureBackground.AddChidren(humidityText);
+
+
+ if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
+ {
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (Action<ZigBee.Device.CommonDevice>)((report) =>
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (room.TemperatrueDevice != mainKeys)
+ {
+ return;
+ }
+ //绉婚櫎鎺変簨浠�
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+
+ foreach (var data in report.DeviceStatusReport.AttriBute)
+ {
+ if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ if (data.AttriButeData == 0)
+ {
+ //0鈩�
+ temperatureText.Text = "0.0鈩�";
+ }
+ else if (data.AttriButeData > 32767)
+ {
+ //璐熸暟(鐗规畩澶勭悊)
+ string strValue = (data.AttriButeData - 65536).ToString();
+ //灏忔暟鐐归渶瑕佷竴浣�
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ }
+ }
+ }
+ }));
+ //鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
+ var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+ if (dev != null)
+ {
+ (dev as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
+ }
+ }
+
+ if (string.IsNullOrEmpty(room.HumidityDevice) == false)
+ {
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (room.HumidityDevice != mainKeys)
+ {
+ return;
+ }
+ //绉婚櫎鎺変簨浠�
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+ foreach (var data in report.DeviceStatusReport.AttriBute)
+ {
+ if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ if (data.AttriButeData == 0)
+ {
+ //0
+ humidityText.Text = "0.0%";
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
+ }
+ }
+ }
+ });
+ //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
+ var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ if (dev != null)
+ {
+ (dev as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
+ }
+ }
+
+ var roomListBtn = new Button()
+ {
+ X = roomBackView.Width - Application.GetRealWidth(100 + 20),
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetMinRealAverage(100),
+ Height = Application.GetMinRealAverage(100),
+ UnSelectedImagePath = "Room/List.png",
+ };
+ roomBackView.AddChidren(roomListBtn);
+
+ roomListBtn.MouseUpEventHandler += (send, e) =>
+ {
+ CommonPage.Instance.IsDrawerLockMode = true;
+ var editRoom = new Device.Room.EditRoom();
+ HomePage.Instance.AddChidren(editRoom);
+ HomePage.Instance.PageIndex += 1;
+ editRoom.Show(room);
+ editRoom.action += () =>
+ {
+ action?.Invoke();
+ };
+ };
+
+ }
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index 28e2981..e1e988d 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -23,7 +23,7 @@
/// <summary>
/// sceneImg
/// </summary>
- private Button sceneImg;
+ private ImageView sceneImg;
/// <summary>
/// SceneCategoryView
@@ -60,19 +60,21 @@
{
Y = Application.GetRealHeight(46),
Height = Application.GetRealHeight(446 - 46),
- LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor
+ LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
+ Tag= scene
};
AddChidren(sceneRowLayout);
- sceneImg = new Button()
+ sceneImg = new ImageView()
{
X = Application.GetRealWidth(179),
Width = Application.GetRealWidth(844),
Height = Application.GetRealHeight(400),
- UnSelectedImagePath = scene.IconPath,
+ ImagePath = scene.IconPathType == 0 ? scene.IconPath : System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath),
Radius = (uint)Application.GetRealHeight(17)
};
sceneRowLayout.AddChidren(sceneImg);
+ //sceneImg.SetViewShadow(true);
var leftFL = new FrameLayout
{
@@ -200,12 +202,12 @@
if (room.IsLove)
{
Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
- RemoveViewByTag((sender as Button).Tag);
+ RemoveFromParent();
}
else
{
var tip = new CustomAlert { };
- AddChidren(tip);
+ Common.CommonPage.Instance.AddChidren(tip);
tip.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete));
tip.ResultEventHandler += async (e1) =>
@@ -224,7 +226,7 @@
{
room.RemoveScene(scene);
//RefreshBodyView();
- RemoveViewByTag((sender as Button).Tag);
+ RemoveFromParent();
}
//0 绉婚櫎澶辫触
else if (removeSceneAllData.removeSceneData.Result == 0)
@@ -237,7 +239,7 @@
{
room.RemoveScene(scene);
//RefreshBodyView();
- RemoveViewByTag((sender as Button).Tag);
+ RemoveFromParent();
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneIsNull);
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
index 2c934c4..daf0928 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -16,7 +16,7 @@
/// <summary>
/// SceneIcon
/// </summary>
- public Button SceneIcon;
+ public ImageView SceneIcon;
/// <summary>
/// statu
/// </summary>
@@ -58,12 +58,17 @@
}
}
+ /// <summary>
+ /// SceneMainView
+ /// </summary>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
public SceneMainView(int x, int y)
{
X = Application.GetRealWidth(x);
Y = Application.GetRealHeight(y);
- Width = Application.GetMinRealAverage(487);
- Height = Application.GetMinRealAverage(348);
+ Width = Application.GetRealWidth(487);
+ Height = Application.GetRealHeight(358);
}
/// <summary>
@@ -83,29 +88,32 @@
/// </summary>
private void InitFrame()
{
- CardBG = new Button
- {
- Width = Application.GetMinRealAverage(487),
- Height = Application.GetMinRealAverage(348),
- UnSelectedImagePath = "Item/FunctionCardView.png",
- Gravity = Gravity.CenterHorizontal
- };
- AddChidren(CardBG);
+ //CardBG = new Button
+ //{
+ // Width = Application.GetMinRealAverage(487),
+ // Height = Application.GetMinRealAverage(348),
+ // UnSelectedImagePath = "Item/FunctionCardView.png",
+ // Gravity = Gravity.CenterHorizontal
+ //};
+ //AddChidren(CardBG);
- SceneIcon = new Button
+ SceneIcon = new ImageView
{
- X = Application.GetMinRealAverage(14),
+ X=Application.GetRealWidth(14),
Width = Application.GetMinRealAverage(458),
- Height = Application.GetRealHeight(305),
- Gravity = Gravity.CenterHorizontal
+ Height = Application.GetMinRealAverage(305),
+ Gravity = Gravity.CenterHorizontal,
+ Radius= (uint)Application.GetRealHeight(17)
};
AddChidren(SceneIcon);
+ //SceneIcon.SetViewShadow(true);
+ //SceneIcon.SetCornerWithSameRadius(Application.GetRealHeight(100), HDLUtils.RectCornerBottomRight);
sceneBG = new Button
{
Width = Application.GetMinRealAverage(487),
Height = Application.GetMinRealAverage(348),
- UnSelectedImagePath = "Item/SceneCard.png",
+ UnSelectedImagePath = "Scene/Background.png",
Gravity = Gravity.CenterHorizontal
};
AddChidren(sceneBG);
@@ -138,7 +146,7 @@
Y = Application.GetMinRealAverage(239),
Width = Application.GetMinRealAverage(279),
Height = Application.GetMinRealAverage(60),
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -150,7 +158,7 @@
/// </summary>
private void InitStatu()
{
- SetIimeByDelayTime(scene.SceneDelayTime);
+ SetTimeByDelayTime(scene.SceneDelayTime);
SetSceneNameText(scene.Name);
SetIcon(scene.IconPath);
SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));
@@ -158,7 +166,6 @@
TimeButton.MouseUpEventHandler += SetTimeEvents;
CollectButton.MouseUpEventHandler += CollectionEvent;
SceneIcon.MouseUpEventHandler += SceneUpHandler;
- sceneBG.MouseUpEventHandler += SceneUpHandler;
SceneNameButton.MouseUpEventHandler += SceneUpHandler;
}
@@ -189,7 +196,7 @@
/// SetIimeByDelayTime
/// </summary>
/// <param name="time"></param>
- public void SetIimeByDelayTime(int time)
+ public void SetTimeByDelayTime(int time)
{
if (time > 0)
{
@@ -216,7 +223,14 @@
/// <param name="iconPath"></param>
public void SetIcon(string iconPath)
{
- SceneIcon.UnSelectedImagePath = iconPath;
+ if (scene.IconPathType == 0)
+ {
+ SceneIcon.ImagePath = iconPath;
+ }
+ else
+ {
+ SceneIcon.ImagePath = System.IO.Path.Combine(Config.Instance.FullPath, iconPath);
+ }
}
/// <summary>
@@ -322,7 +336,7 @@
timeSelect.TimeAction = (t) =>
{
scene.SceneDelayTime = t;
- SetIimeByDelayTime(t);
+ SetTimeByDelayTime(t);
};
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs
index b1dce70..d32c138 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs
@@ -162,6 +162,14 @@
public void SetStatu(bool statu)
{
SelectBtn.Visible = statu;
+ if(statu)
+ {
+ SetProgress(100);
+ }
+ else
+ {
+ SetProgress(0);
+ }
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index efbd1ec..c60af98 100755
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;
@@ -137,8 +138,6 @@
{
curtainSeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
}
- //SeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
- //seekBarTitle.Text = $"{SeekBar.Progress} %";
rollerShade.LastDateTime = DateTime.Now;
}
else if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
@@ -274,8 +273,7 @@
{
UserHomeView.ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
});
}
else
@@ -283,8 +281,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
}
}
@@ -505,28 +502,12 @@
//upBtn.MouseUpEventHandler += Up;
//stopBtn.MouseUpEventHandler += Stop;
//downBtn.MouseUpEventHandler += Down;
- //SeekBar.ProgressChanged += SeekBar_ProgressChange;
- //collectionBtn.MouseUpEventHandler += Collection;
- //moreBtn.MouseUpEventHandler += More;
- //roomBtn.MouseUpEventHandler += BackToRoomHandler;
- //roomName.MouseUpEventHandler += BackToRoomHandler;
+ collectionBtn.MouseUpEventHandler += Collection;
}
#endregion
- #region 鈼� 鎺у埗___________________________
-
- /// <summary>
- /// 婊戞潯绉诲姩鍙戦�佸懡浠�
- /// </summary>
- /// <param name="sender">Sender.</param>
- /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
- private void SeekBar_ProgressChange(object sender, int mouseEventArgs)
- {
- //seekBarTitle.Text = $"{SeekBar.Progress}%";
- //(device.CommonDevice as ZigBee.Device.Rollershade).WcdGoToTiltValue(SeekBar.Progress);
- }
-
+ #region 鈼� 鎺у埗__________________________
/// <summary>
/// 涓娿�佸紑
@@ -726,11 +707,12 @@
curtainSeekBar.Width = Application.GetRealWidth(570);
curtainSeekBar.Height = Application.GetRealHeight(513);
curtainSeekBar.Gravity = Gravity.CenterHorizontal;
+ curtainSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage;
layout.AddChidren(curtainSeekBar);
curtainSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
{
- (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
+ (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainSeekBar.Progress);
};
}
}
@@ -748,15 +730,14 @@
/// <param name="e">E.</param>
private void Collection(object sender, MouseEventArgs e)
{
- //collection
if (collectionBtn.IsSelected)
{
- Shared.Common.Room.Lists[0].DeleteDevice(device.FileName);
+ Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
collectionBtn.IsSelected = false;
}
else
{
- Shared.Common.Room.Lists[0].AddDevice(device.FileName);
+ Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
collectionBtn.IsSelected = true;
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs
new file mode 100755
index 0000000..97bfe44
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs
@@ -0,0 +1,225 @@
+锘縰sing System;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.DeviceLogic
+{
+ public class ReadDeviceAttributeLogic
+ {
+ #region 鈼� 鍙橀噺____________________________
+ /// <summary>
+ /// ReadDeviceAttributeLogic
+ /// </summary>
+ private static ReadDeviceAttributeLogic _instance;
+ /// <summary>
+ /// ReadDeviceAttributeLogic
+ /// </summary>
+ public static ReadDeviceAttributeLogic Instance
+ {
+ get
+ {
+ if(_instance == null)
+ {
+ _instance = new ReadDeviceAttributeLogic();
+ }
+ return _instance;
+ }
+ }
+
+ #endregion
+
+ #region 鈼� 绌鸿皟____________________________
+
+ /// <summary>
+ /// SendACStatuComand
+ /// </summary>
+ /// <param name="device">璁惧</param>
+ public void SendACStatuComand(CommonDevice device)
+ {
+ SendThermostatStatuComand(device);
+ SendFanStatuComand(device);
+ }
+
+ /// <summary>
+ /// SendThermostatStatuComand
+ /// </summary>
+ /// <param name="device">璁惧</param>
+ private void SendThermostatStatuComand(CommonDevice device)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject
+ {
+ { "DeviceAddr",device.DeviceAddr },
+ { "Epoint", device.DeviceEpoint },
+ { "Cluster_ID", (int)Cluster_ID.Thermostat },
+ { "Command", 108 }
+ };
+ var attriBute = new Newtonsoft.Json.Linq.JArray
+ {
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.LocalTemperature}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.CoolingSetpoint}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.HeatingSetpoint}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.AutoSetpoint}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.SystemMode}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.AcModeSupport}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.CleanStatu}
+ }
+
+ };
+ var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+ jObject.Add("Data", data);
+ device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+ }
+
+ /// <summary>
+ /// SendFanStatuComand
+ /// </summary>
+ /// <param name="device">璁惧</param>
+ private void SendFanStatuComand(CommonDevice device)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject
+ {
+ { "DeviceAddr",device.DeviceAddr },
+ { "Epoint", device.DeviceEpoint },
+ { "Cluster_ID", (int)Cluster_ID.FanControl },
+ { "Command", 108 }
+ };
+ var attriBute = new Newtonsoft.Json.Linq.JArray
+ {
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.FanMode}
+ },
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.FanSwing}
+ }
+ };
+ var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+ jObject.Add("Data", data);
+ device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+ }
+
+ #endregion
+
+ #region 鈼� 绐楀笜____________________________
+ /// <summary>
+ /// 鍙戦�佽幏鍙栫獥甯樼姸鎬佸懡浠�
+ /// </summary>
+ /// <param name="device">绐楀笜</param>
+ public void SendCurtainStatuComand(CommonDevice device)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject
+ {
+ { "DeviceAddr",device.DeviceAddr },
+ { "Epoint", device.DeviceEpoint },
+ { "Cluster_ID", (int)Cluster_ID.WindowCovering },
+ { "Command", 108 }
+ };
+ var attriBute = new Newtonsoft.Json.Linq.JArray
+ {
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.CurrentPositionLiftPercentage}
+ }
+ };
+ var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+ jObject.Add("Data", data);
+ device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+ }
+
+ #endregion
+
+ #region 鈼� 鐏厜____________________________
+
+ /// <summary>
+ /// Light
+ /// </summary>
+ /// <param name="device"></param>
+ public void SendLightStatuComand(CommonDevice device)
+ {
+ SendSwitchStatuComand(device);
+ }
+
+ /// <summary>
+ /// Light
+ /// </summary>
+ /// <param name="device"></param>
+ public void SendDimmableLightStatuComand(CommonDevice device)
+ {
+ SendSwitchStatuComand(device);
+ SendLevelStatuComand(device);
+ }
+
+ /// <summary>
+ /// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
+ /// </summary>
+ /// <param name="device">绐楀笜</param>
+ private void SendSwitchStatuComand(CommonDevice device)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject
+ {
+ { "DeviceAddr",device.DeviceAddr },
+ { "Epoint", device.DeviceEpoint },
+ { "Cluster_ID", (int)Cluster_ID.Switch },
+ { "Command", 108 }
+ };
+ var attriBute = new Newtonsoft.Json.Linq.JArray
+ {
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.Switch}
+ }
+ };
+ var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+ jObject.Add("Data", data);
+ device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+ }
+
+ /// <summary>
+ /// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
+ /// </summary>
+ /// <param name="device">绐楀笜</param>
+ private void SendLevelStatuComand(CommonDevice device)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject
+ {
+ { "DeviceAddr",device.DeviceAddr },
+ { "Epoint", device.DeviceEpoint },
+ { "Cluster_ID", (int)Cluster_ID.LevelControl },
+ { "Command", 108 }
+ };
+ var attriBute = new Newtonsoft.Json.Linq.JArray
+ {
+ new Newtonsoft.Json.Linq.JObject
+ {
+ { "AttriButeId", (int)AttriButeId.LevelControl}
+ }
+ };
+ var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+ jObject.Add("Data", data);
+ device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+ }
+
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
index b1115fc..87d0d18 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.Device.Light
@@ -206,8 +207,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
});
}
else
@@ -215,8 +215,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index 4d99ecb..6d52a0a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using ZigBee.Device;
namespace Shared.Phone.Device.Light
@@ -246,9 +247,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
UserView.UserHomeView.ReadStatus(dimmableLight, () =>
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
});
}
else
@@ -256,9 +255,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
index 790e4e2..076661e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.Device.Light
@@ -228,8 +229,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
});
}
else
@@ -237,8 +237,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
index ddadda0..8ce7c2b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.Device.Light
@@ -236,8 +237,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
});
}
else
@@ -245,8 +245,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- light.ReadOnOffStatus();
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
index 233725a..d8ca61a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.Device.Light
@@ -229,8 +230,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
});
}
else
@@ -238,8 +238,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 8f89c08..bca6db1 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -393,7 +393,7 @@
//Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(securityfra);
- securityfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ securityfra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
{
@@ -730,7 +730,7 @@
//Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(Locationfra);
- Locationfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ Locationfra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var typeRow = new RowLayout
@@ -1011,7 +1011,7 @@
// Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(timetypeframelayout);
- timetypeframelayout.SetCornerWithSameRadius(20,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
+ timetypeframelayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 1dcbdfe..a8a3b9d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -70,7 +70,7 @@
};
this.AddChidren(middle);
- var textBox = new EditText
+ var textBox = new EditTextView//EditText
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(600),
@@ -81,6 +81,7 @@
TextSize = 14,
};
middle.AddChidren(textBox);
+ textBox.HideSoftInput();
var btnsave = new Button
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 09560c1..d712314 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -129,7 +129,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(PickerViewfra);
- PickerViewfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
var mUIPickerView = new UIPickerView
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 092dc54..f63c328 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -134,7 +134,7 @@
};
this.AddChidren(devicetypehorizontalScrol);
- devicetypehorizontalScrol.SetCornerWithSameRadius(20,HDLUtils.RectCornerBottomLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
@@ -143,7 +143,7 @@
middle.X = Application.GetRealWidth(58);
//middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
- middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
+ middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
var deviceTypeList = new List<DeviceType> {
DeviceType.IASZone,
@@ -733,7 +733,7 @@
// Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
- devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
+ devicefra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index e3d24b5..fa4eb0b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -12,10 +12,10 @@
Tag = "LockLogic";
}
Button selectedIcon = new Button();
- VerticalScrolViewLayout middle;
+ VerticalRefreshLayout middle;
public int conditionsIndex = -1;
- public async void Show()
+ public void Show()
{
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
@@ -69,14 +69,37 @@
#endregion
- middle = new VerticalScrolViewLayout
+ middle = new VerticalRefreshLayout
{
Y = topRowLayout.Bottom,
Height = Application.GetRealHeight(1920 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
+ middle.BeginHeaderRefreshingAction += () =>
+ {
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
+ for (int i = 0; i < Send.LockList.Count; i++)
+ {
+ if (Send.LockList[i].DoorLockMacPort == macport)
+ {
+ ///浠庡垪琛ㄧЩ闄ゅ綋鍓嶉棬閿佸叏閮ㄧ殑鏃ф暟鎹紱
+ Send.LockList.Remove(Send.LockList[i]);
+ }
+ }
+ Read();
+ //鍏抽棴鍒锋柊View锛�
+ middle.EndHeaderRefreshing();
+ };
+ Read();
+ }
+ /// <summary>
+ /// 璇诲彇褰撳墠闂ㄩ攣鐨勪簯绔暟鎹紱
+ /// </summary>
+ public async void Read()
+ {
bool d = false;
string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
for (int i = 0; i < Send.LockList.Count; i++)
@@ -96,12 +119,11 @@
}
UserAllView(macport);
CommonPage.Loading.Hide();
-
}
/// <summary>
/// 鏄剧ず鎵�鏈夌敤鎴�
/// </summary>
- void UserAllView(string macport)
+ public void UserAllView(string macport)
{
for (int i = 0; i < Send.LockList.Count; i++)
@@ -167,10 +189,10 @@
/// 閫夋嫨鏌愪釜鐢ㄦ埛
/// </summary>
/// <param name="membershipIfon">瑙﹀彂婧愬垪琛�</param>
- /// <param name="userName">鐢ㄦ埛鍚嶅瓧</param>
- void SelectedUserID(Send.MembershipIfon membershipIfon) {
+ public void SelectedUserID(Send.MembershipIfon membershipIfon)
+ {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
flMain.MouseUpEventHandler += (sender1, e1) =>
@@ -178,7 +200,7 @@
flMain.RemoveFromParent();
};
-
+
var lockcolorfra1 = new FrameLayout
{
@@ -190,7 +212,7 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(lockcolorfra1);
- lockcolorfra1.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ lockcolorfra1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var lockRow = new RowLayout
@@ -279,7 +301,7 @@
TextSize = 14,
};
doorlockRow.AddChidren(doorlockBtn);
-
+
var doorlockSelected = new Button
{
X = Application.GetRealWidth(860),
@@ -320,11 +342,11 @@
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
}
-
+
}
}
-
+
Btncomplete.MouseUpEventHandler += (sender, e) =>
{
var lockConditionsInfo = new Dictionary<string, string>();
@@ -339,7 +361,7 @@
lockConditionsInfo.Add("Range", "0");
var accounts = new Dictionary<string, string>();
accounts.Add("Type", "1");
- accounts.Add("Account", membershipIfon.UserName+ modeName);
+ accounts.Add("Account", membershipIfon.UserName + modeName);
accounts.Add("UserId", attriButeData2);
if (SelectedLockStatus != "")
{
@@ -422,6 +444,6 @@
lockLogicCommunalPage.Show(() => { });
};
}
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
index 52c85fb..3d9eb71 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -134,7 +134,7 @@
};
this.AddChidren(devicetypehorizontalScrol);
- devicetypehorizontalScrol.SetCornerWithSameRadius(20,HDLUtils.RectCornerBottomLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58),HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
@@ -143,7 +143,7 @@
middle.X = Application.GetRealWidth(58);
//middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
- middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
+ middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
List<DeviceType> deviceTypeList = new List<DeviceType> {
@@ -695,7 +695,7 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
- devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
{
@@ -1745,21 +1745,10 @@
{
#region ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
- Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
Dictionary<string, string> modedictionary = new Dictionary<string, string>();
Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
- taskListInfo.Add(switchdictionary);
- taskListInfo.Add(temperaturedictionary);
- taskListInfo.Add(modedictionary);
- taskListInfo.Add(speeddictionary);
- dictionary(switchdictionary, "TaskType", "1");
- dictionary(switchdictionary, "Data2", "0");
- dictionary(temperaturedictionary, "TaskType", "5");
- dictionary(modedictionary, "TaskType", "5");
- dictionary(modedictionary, "Data1", "3");
- dictionary(speeddictionary, "TaskType", "5");
- dictionary(speeddictionary, "Data1", "6");
+
#endregion
@@ -1916,25 +1905,24 @@
{
foreach (var value in TaskList)
{
- if (value["TaskType"] == "1")
+ if (TaskList.Count == 1)
{
- dictionary(switchdictionary, "Data1", value["Data1"]);
- if (value["Data1"] == "1")
- {
- openBtnSelected.Visible = true;
- closeBtnSelected.Visible = false;
- pausePickerViewfra.Height = Application.GetRealHeight(0);
- }
- else if (value["Data1"] == "0")
- {
- openBtnSelected.Visible = false;
- closeBtnSelected.Visible = true;
- pausePickerViewfra.Height = Application.GetRealHeight(600);
- break;
- }
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ openBtnSelected.Visible = false;
+ closeBtnSelected.Visible = true;
+ pausePickerViewfra.Height = Application.GetRealHeight(600);
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
- else if (value["TaskType"] == "5")
+ else
+ {
+ openBtnSelected.Visible = true;
+ closeBtnSelected.Visible = false;
+ pausePickerViewfra.Height = Application.GetRealHeight(0);
+ }
+
+ if (value["TaskType"] == "5")
{
if (value["Data1"] == "3")
{//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
@@ -2022,11 +2010,21 @@
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
+ //娓呴櫎涔嬪墠鏁版嵁锛�
+ taskListInfo.Clear();
+ //鍔犺浇鏂版暟鎹紱
+ dictionary(temperaturedictionary, "TaskType", "5");
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(speeddictionary, "TaskType", "5");
+ dictionary(speeddictionary, "Data1", "6");
+ taskListInfo.Add(temperaturedictionary);
+ taskListInfo.Add(modedictionary);
+ taskListInfo.Add(speeddictionary);
pausePickerViewfra.Height = Application.GetRealHeight(0);
SelectedDeviceStatusaction = "yes";
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
- dictionary(switchdictionary, "Data1", "1");
var temperature = mList1[indextemperature].Split(' ')[0];
var modestring = mList2[indexmode].Split(' ')[0];
var speedstring = mList3[indexspeed].Split(' ')[0];
@@ -2045,12 +2043,18 @@
///鍙栨秷浜嬩欢
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
- pausePickerViewfra.Height = Application.GetRealHeight(600);
+ //娓呴櫎涔嬪墠鏁版嵁锛�
+ taskListInfo.Clear();
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(modedictionary, "Data2", "0");
+ //鍔犺浇鏂版暟鎹紱
+ taskListInfo.Add(modedictionary);
+ pausePickerViewfra.Height = Application.GetRealHeight(600);
SelectedDeviceStatusaction = "yes";
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
- dictionary(switchdictionary, "Data1", "0");
};
closerowlayout.MouseUpEventHandler += closeclick;
btnclose.MouseUpEventHandler += closeclick;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index e0a0496..d15eb32 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -760,23 +760,19 @@
bool ifclose = false;
foreach (var status in TaskList)
{
- if (status["TaskType"].ToString() == "1")
+ if (TaskList.Count == 1)
{
- if (status["Data1"].ToString() == "0")
- {
- // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
-
- ifclose = false;
- break;
- }
- else if (status["Data1"].ToString() == "1")
- {
- //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
- ifclose = true;
- }
-
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ ifclose = false;
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
- else if (status["TaskType"].ToString() == "5")
+ else
+ {
+ ifclose = true;
+ }
+
+ if (status["TaskType"].ToString() == "5")
{
if (status["Data1"] == "3")
{//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index ebf8d23..46746f5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -12,8 +12,8 @@
{
Tag = "LockLogicList";
}
- VerticalScrolViewLayout middle;
- public async void Show()
+ VerticalRefreshLayout middle;
+ public void Show()
{
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -89,14 +89,29 @@
};
#endregion
- middle = new VerticalScrolViewLayout
+ middle = new VerticalRefreshLayout
{
Y = topRowLayout.Bottom,
Height = Application.GetRealHeight(1920 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
+ middle.BeginHeaderRefreshingAction += () =>
+ {
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ Common.Logic.LockLogicList.Clear();
+ Read();
+ //鍏抽棴鍒锋柊View锛�
+ middle.EndHeaderRefreshing();
+ };
+ Read();
+ }
+ /// <summary>
+ /// 璇诲彇鑷姩鍖栨暟鎹�
+ /// </summary>
+ public async void Read()
+ {
CommonPage.Loading.Start();
if (Common.Logic.LockLogicList.Count == 0)
{
@@ -129,12 +144,13 @@
}
}
}
- //鑷姩鍖�
Automationview();
CommonPage.Loading.Hide();
}
-
- void Automationview()
+ /// <summary>
+ /// 鍔犺浇鑷姩鍖栧垪琛ㄧ殑鐣岄潰
+ /// </summary>
+ public void Automationview()
{
middle.RemoveAll();
for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 419b95e..36ea833 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -1350,28 +1350,23 @@
{
continue;
}
- string modetext = "", temperaturetext="", speedtext = "";
+ string modetext = "", temperaturetext = "", speedtext = "";
bool ifclose = false;
foreach (var status in TaskList)
{
- if (status["TaskType"].ToString() == "1")
+
+ if (TaskList.Count == 1)
{
- if (status["Data1"].ToString() == "0")
- {
- // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
-
- ifclose = false;
- //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
- break;
- }
- else if (status["Data1"].ToString() == "1")
- {
- //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
- ifclose = true;
- }
-
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ ifclose = false;
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
- else if (status["TaskType"].ToString() == "5")
+ else
+ {
+ ifclose = true;
+ }
+ if (status["TaskType"].ToString() == "5")
{
if (status["Data1"] == "3")
{//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
@@ -2258,7 +2253,7 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(framelayout);
- framelayout.SetCornerWithSameRadius(20,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
+ framelayout.SetCornerWithSameRadius(Application.GetRealHeight(58),HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index b23a780..fffe741 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -133,7 +133,7 @@
};
this.AddChidren(devicetypehorizontalScrol);
- devicetypehorizontalScrol.SetCornerWithSameRadius(20, HDLUtils.RectCornerBottomLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
@@ -142,7 +142,7 @@
middle.X = Application.GetRealWidth(58);
//middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
- middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
+ middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
List<DeviceType> deviceTypeList = new List<DeviceType> {
@@ -691,7 +691,7 @@
//Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
- devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
@@ -1742,22 +1742,9 @@
{
#region ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
- Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
- Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
- Dictionary<string, string> modedictionary = new Dictionary<string, string>();
- Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
- taskListInfo.Add(switchdictionary);
- taskListInfo.Add(temperaturedictionary);
- taskListInfo.Add(modedictionary);
- taskListInfo.Add(speeddictionary);
- dictionary(switchdictionary, "TaskType", "1");
- dictionary(switchdictionary, "Data2", "0");
- dictionary(temperaturedictionary, "TaskType", "5");
- dictionary(modedictionary, "TaskType", "5");
- dictionary(modedictionary, "Data1", "3");
- dictionary(speeddictionary, "TaskType", "5");
- dictionary(speeddictionary, "Data1", "6");
-
+ var temperaturedictionary = new Dictionary<string, string>();
+ var modedictionary = new Dictionary<string, string>();
+ var speeddictionary = new Dictionary<string, string>();
#endregion
#region 绌鸿皟View
@@ -1906,33 +1893,32 @@
}
};
- #endregion
+ #endregion
//榛樿26,鑷姩,涓
int indextemperature = 10, indexmode = 2, indexspeed = 1;
if (edit && TaskList != null)
{
foreach (var value in TaskList)
{
- if (value["TaskType"] == "1")
+ if (TaskList.Count == 1)
{
- dictionary(switchdictionary, "Data1", value["Data1"]);
- if (value["Data1"] == "1")
- {
- openBtnSelected.Visible = true;
- closeBtnSelected.Visible = false;
- pausePickerViewfra.Height = Application.GetRealHeight(0);
- }
- else if (value["Data1"] == "0")
- {
- openBtnSelected.Visible = false;
- closeBtnSelected.Visible = true;
- pausePickerViewfra.Height = Application.GetRealHeight(600);
- //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
- break;
- }
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ openBtnSelected.Visible = false;
+ closeBtnSelected.Visible = true;
+ pausePickerViewfra.Height = Application.GetRealHeight(600);
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
- else if (value["TaskType"] == "5")
+ else
+ {
+ openBtnSelected.Visible = true;
+ closeBtnSelected.Visible = false;
+ pausePickerViewfra.Height = Application.GetRealHeight(0);
+ }
+
+
+ if (value["TaskType"] == "5")
{
if (value["Data1"] == "3")
{//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
@@ -2020,11 +2006,21 @@
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
+ //娓呴櫎涔嬪墠鏁版嵁锛�
+ taskListInfo.Clear();
+ //鍔犺浇鏂版暟鎹紱
+ dictionary(temperaturedictionary, "TaskType", "5");
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(speeddictionary, "TaskType", "5");
+ dictionary(speeddictionary, "Data1", "6");
+ taskListInfo.Add(temperaturedictionary);
+ taskListInfo.Add(modedictionary);
+ taskListInfo.Add(speeddictionary);
pausePickerViewfra.Height = Application.GetRealHeight(0);
SelectedDeviceStatusaction = "yes";
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
- dictionary(switchdictionary, "Data1", "1");
var temperature = mList1[indextemperature].Split(' ')[0];
var modestring = mList2[indexmode].Split(' ')[0];
var speedstring = mList3[indexspeed].Split(' ')[0];
@@ -2043,12 +2039,18 @@
///鍙栨秷浜嬩欢
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
+ //娓呴櫎涔嬪墠鏁版嵁锛�
+ taskListInfo.Clear();
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(modedictionary, "Data2", "0");
+ //鍔犺浇鏂版暟鎹紱
+ taskListInfo.Add(modedictionary);
pausePickerViewfra.Height = Application.GetRealHeight(600);
-
SelectedDeviceStatusaction = "yes";
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
- dictionary(switchdictionary, "Data1", "0");
+
};
closerowlayout.MouseUpEventHandler += closeclick;
btnclose.MouseUpEventHandler += closeclick;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 78c77e8..01df463 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -13,7 +13,7 @@
/// </summary>
/// <param name="common">Common.</param>
/// <param name="objecttype">Objecttype.</param>
- public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
+ public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index edb61d2..c387b1c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -15,12 +15,14 @@
}
Button selectedIcon = new Button();
public static bool edit = false;
- VerticalScrolViewLayout middle;
+ VerticalRefreshLayout middle;
+ CommonDevice common;
+ Dictionary<string, string> editdeviceConditionsInfo;
- public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo = null)
+ public void Show(CommonDevice commondevice, Dictionary<string, string> editdeviceConditions = null)
{
-
-
+ common = commondevice;
+ editdeviceConditionsInfo = editdeviceConditions;
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -73,14 +75,36 @@
};
#endregion
- middle = new VerticalScrolViewLayout
+ middle = new VerticalRefreshLayout
{
Y = topRowLayout.Bottom,
Height = Application.GetRealHeight(1920 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
-
+ middle.BeginHeaderRefreshingAction += () =>
+ {
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ string macport = common.DeviceAddr + "_" + common.DeviceEpoint.ToString();
+ for (int i = 0; i < Send.LockList.Count; i++)
+ {
+ if (Send.LockList[i].DoorLockMacPort == macport)
+ {
+ ///浠庡垪琛ㄧЩ闄ゅ綋鍓嶉棬閿佸叏閮ㄧ殑鏃ф暟鎹紱
+ Send.LockList.Remove(Send.LockList[i]);
+ }
+ }
+ Read();
+ //鍏抽棴鍒锋柊View锛�
+ middle.EndHeaderRefreshing();
+ };
+ Read();
+ }
+ /// <summary>
+ /// 璇诲彇褰撳墠闂ㄩ攣鐨勪簯绔暟鎹紱
+ /// </summary>
+ public async void Read()
+ {
bool d = false;
string macport = common.DeviceAddr + "_" + common.DeviceEpoint.ToString();
@@ -100,14 +124,14 @@
var allMemberslist = await Send.AllMembers(common.DeviceAddr);
Send.LockList.AddRange(allMemberslist);
}
- UserList(macport, common, editdeviceConditionsInfo);
+ UserList(macport);
CommonPage.Loading.Hide();
}
/// <summary>
/// 鎴愬憳鍒楄〃鐨勬柟娉�
/// </summary>
/// <param name="macport"></param>
- void UserList(string macport, CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo)
+ public void UserList(string macport)
{
foreach (var user in Send.LockList)
@@ -156,7 +180,7 @@
EventHandler<MouseEventArgs> useridclick = (sender, e) =>
{
- User(user, common, editdeviceConditionsInfo);
+ User(user);
};
userBtn.MouseUpEventHandler += useridclick;
@@ -167,12 +191,12 @@
}
- }
+ }
/// <summary>
/// 褰撳墠鎴愬憳淇℃伅鐨勬柟娉�
/// </summary>
/// <param name="user"></param>
- void User(Send.MembershipIfon user, CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo)
+ public void User(Send.MembershipIfon user)
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
index 2ea8539..c59eb1f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
@@ -133,7 +133,7 @@
};
this.AddChidren(devicetypehorizontalScrol);
- devicetypehorizontalScrol.SetCornerWithSameRadius(20, HDLUtils.RectCornerBottomLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
@@ -142,7 +142,7 @@
middle.X = Application.GetRealWidth(58);
//middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
- middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
+ middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
List<DeviceType> deviceTypeList = new List<DeviceType> {
@@ -691,7 +691,7 @@
// Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
- devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
+ devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
index 1a514ba..bc06c67 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -133,7 +133,7 @@
};
this.AddChidren(devicetypehorizontalScrol);
- devicetypehorizontalScrol.SetCornerWithSameRadius(20, HDLUtils.RectCornerBottomLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
@@ -142,7 +142,7 @@
middle.X = Application.GetRealWidth(58);
// middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
- middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
+ middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
var deviceTypeList = new List<DeviceType> {
@@ -726,7 +726,7 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
- devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
index 609c8b7..57a97f7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
@@ -610,7 +610,7 @@
//Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(fraview);
- fraview.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ fraview.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
index c0d9db5..6a7e5bc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
@@ -56,18 +56,19 @@
{
var itemView = new FrameLayout()
{
- Height = Application.GetRealHeight(311 + CommonPage.XLeft)
+ Height = Application.GetRealHeight(311 + 58)
};
midFl.AddChidren(itemView);
for (int i = 0; i < 2; i++)
{
- var icon = new Button()
+ var icon = new ImageView()
{
- X = Application.GetRealWidth(CommonPage.XLeft + i * (467 + 32)),
- Width = Application.GetMinRealAverage(467),
- Height = Application.GetMinRealAverage(311),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = $"RoomIcon/{k}.JPG",
+ X = Application.GetRealWidth(58 + i * (467 + 32)),
+ Y = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(467),
+ Height = Application.GetRealHeight(311),
+ ImagePath = $"RoomIcon/{k}.JPG",
+ Radius = (uint)Application.GetRealHeight(17)
};
itemView.AddChidren(icon);
icon.SetViewShadow(true);
@@ -75,7 +76,7 @@
EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
{
- action?.Invoke(icon.UnSelectedImagePath);
+ action?.Invoke(icon.ImagePath);
action = null;
this.RemoveFromParent();
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index 21b0e95..df581f4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -29,7 +29,7 @@
/// <summary>
/// backGround
/// </summary>
- private Button backGround;
+ private ImageView backGround;
/// <summary>
/// IconPathType
/// </summary>
@@ -60,7 +60,7 @@
room = r;
IconPathType = r.BackgroundImageType;
OldIconPathType= r.BackgroundImageType;
- if (IconPathType != 1)
+ if (IconPathType != 0)
{
OldBackgroundImagePath = r.BackgroundImage;
}
@@ -109,17 +109,21 @@
};
AddChidren(bodyFrameLayout);
- backGround = new Button()
+ backGround = new ImageView()
{
Y = Application.GetRealHeight(60),
Width = Application.GetMinRealAverage(887),
Height = Application.GetMinRealAverage(444),
Gravity = Gravity.CenterHorizontal,
Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
- UnSelectedImagePath = room.BackgroundImage
+ ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage)
};
bodyFrameLayout.AddChidren(backGround);
backGround.SetViewShadow(true);
+ if (room.BackgroundImageType != 0)
+ {
+ backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(backGround.ImagePath);
+ }
backGround.MouseUpEventHandler += backGroundIMGHander;
var infoFL = new FrameLayout
@@ -150,6 +154,10 @@
nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.RoomName)} :");
nameRow.SetTitle(room.Name);
infoFL.AddChidren(nameRow);
+ if(room.IsLove)
+ {
+ nameRow.NameText.Enable = false;
+ }
var floorRow = new DeviceInfoRow(308);
floorRow.Init();
@@ -391,18 +399,18 @@
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
var fileName = $"RoomIcon_{tradeTime}.png";
room.Name = nameRow.NameText.Text.Trim();
- if (OldIconPathType != 1)
+ if (OldIconPathType != 0)
{
- Shared.IO.FileUtils.DeleteFile(OldBackgroundImagePath);
+ Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath,OldBackgroundImagePath));
}
if (IconPathType == 0)
{
- room.BackgroundImage = backGround.UnSelectedImagePath;
+ room.BackgroundImage = backGround.ImagePath;
}
else
{
Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
- room.BackgroundImage = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
+ room.BackgroundImage = fileName;
}
room.BackgroundImageType = IconPathType;
room.Save();
@@ -509,7 +517,7 @@
{
IconPathType = 0;
backGround.ImageBytes = null;
- backGround.UnSelectedImagePath = imgPath;
+ backGround.ImagePath = imgPath;
};
};
selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
@@ -522,12 +530,12 @@
{
if (IconPathType != 0)
{
- Global.DeleteFilebyHomeId(backGround.UnSelectedImagePath);
+ Global.DeleteFilebyHomeId(backGround.ImagePath);
}
IconPathType = 1;
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
- backGround.UnSelectedImagePath = imagePath;
+ backGround.ImagePath = imagePath;
System.IO.File.Delete(imagePath);
}, fileName, 2, 1);
@@ -543,12 +551,12 @@
{
if (IconPathType != 0)
{
- Global.DeleteFilebyHomeId(backGround.UnSelectedImagePath);
+ Global.DeleteFilebyHomeId(backGround.ImagePath);
}
IconPathType = 2;
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
- backGround.UnSelectedImagePath = imagePath;
+ backGround.ImagePath = imagePath;
System.IO.File.Delete(imagePath);
}, fileName, 2, 1);
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 585f178..52ebd3b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -27,7 +27,6 @@
public override void RemoveFromParent()
{
- //鏇存柊鐣岄潰
//action?.Invoke();
base.RemoveFromParent();
}
@@ -174,7 +173,7 @@
}
/// <summary>
- ///
+ /// ShowUnallocatedRoom_MouseUpEvent
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
index bccc36e..01d8174 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
@@ -47,7 +47,7 @@
public void Show(Shared.Common.Room r)
{
room = r;
-
+
AddTop();
AddBodyView();
@@ -112,7 +112,7 @@
devRow.SetIcon(device.IconPath);
devRow.SetName(device.DeviceName);
devRow.SetZone(room.FloorName + ", " + room.Name);
-
+
if(tempDevice!=null && tempDevice==device)
{
tempDeviceRow = devRow;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 7a5fef0..4fad441 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1080,4 +1080,22 @@
public string MsgTime = string.Empty;
}
#endregion
+
+ #region 鈻� 闅愬尶鍔熻兘绫籣_________________________
+
+ /// <summary>
+ /// 闅愬尶鍔熻兘
+ /// </summary>
+ public class HideOptionInfo
+ {
+ /// <summary>
+ /// 鏄惁鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�): 1 -> 鏄剧ず
+ /// </summary>
+ public int CenterHideMenu = 0;
+ /// <summary>
+ /// 鏄惁鍑哄姏璇︾粏Log 1 -> 鍑哄姏
+ /// </summary>
+ public int DetailedLog = 0;
+ }
+ #endregion
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 36c8452..42798c2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -32,17 +32,22 @@
}
/// <summary>
- /// 鎺т欢鐨勭偣鍑讳簨浠�(姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠讹紝鍙桟anClick灞炴�ф帶鍒�)
+ /// 鏄惁鏄暱鎸夌姸鎬�
+ /// </summary>
+ private bool isLongClick = false;
+
+ /// <summary>
+ /// 鎺т欢鐨勭偣鍑讳簨浠�(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
public Action<Button, MouseEventArgs> ButtonClickEvent = null;
/// <summary>
- /// 搴曢儴闃村奖鎺т欢1
+ /// (鈽呭綋鍓嶄笉瑕佷娇鐢ㄢ槄)鎺т欢鐨勯暱鎸変簨浠�,褰撲簨浠朵负null鏃�,浠ｈ〃闀挎寜缁撴潫(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽暱鎸変簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
- private Button btnBottomShadowView1 = null;
+ public Action<Button, MouseEventArgs> ButtonLongClickEvent = null;
/// <summary>
- /// 搴曢儴闃村奖鎺т欢2
+ /// 鎺т欢鐨勬寜涓嬩簨浠�(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
- private Button btnBottomShadowView2 = null;
+ public Action<Button, MouseEventArgs> ButtonDownClickEvent = null;
#endregion
@@ -61,6 +66,10 @@
//鐐瑰嚮浜嬩欢
this.MouseUpEventHandler += ButtonBase_MouseUpEventHandler;
+ //鎸変笅浜嬩欢
+ this.MouseDownEventHandler += ButtonBase_MouseDownEventHandler;
+ //闀挎寜浜嬩欢
+ this.MouseLongEventHandler += ButtonBase_MouseLongEventHandler;
}
/// <summary>
@@ -133,11 +142,94 @@
if (CanClick == true)
{
//Log鍑哄姏
- this.WriteLog();
+ this.WriteLog(0);
try
{
- this.ButtonClickEvent?.Invoke(this, e);
+ if (this.isLongClick == false)
+ {
+ this.ButtonClickEvent(this, e);
+ }
+ else if (ButtonLongClickEvent != null)
+ {
+ //闀挎寜缁撴潫
+ this.ButtonLongClickEvent(this, null);
+ }
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ alert.Show();
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
+ }
+ }
+ //鐘舵�佽繕鍘�
+ this.isLongClick = false;
+ }
+
+ #endregion
+
+ #region 鈻� 鎸変笅浜嬩欢___________________________
+
+ /// <summary>
+ /// 鎸変笅浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ButtonBase_MouseDownEventHandler(object sender, MouseEventArgs e)
+ {
+ //杩樺師鐘舵��
+ this.isLongClick = false;
+
+ if (CanClick == false || this.ButtonDownClickEvent == null)
+ {
+ //涓嶈兘鐐瑰嚮
+ return;
+ }
+
+ try
+ {
+ this.ButtonDownClickEvent(this, e);
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ alert.Show();
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 闀挎寜浜嬩欢___________________________
+
+ /// <summary>
+ /// 闀挎寜浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ButtonBase_MouseLongEventHandler(object sender, MouseEventArgs e)
+ {
+ //闀挎寜鐘舵��
+ this.isLongClick = true;
+
+ if (ButtonLongClickEvent == null)
+ {
+ this.MouseLongEventHandler -= ButtonBase_MouseLongEventHandler;
+ return;
+ }
+ if (CanClick == true)
+ {
+ //Log鍑哄姏
+ this.WriteLog(1);
+
+ try
+ {
+ this.ButtonLongClickEvent(this, e);
}
catch (Exception ex)
{
@@ -173,21 +265,14 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
- /// 閲嶇疆鍗曞嚮浜嬩欢(姝ゆ搷浣滃鎵樹細鍙榥ull)
- /// </summary>
- public void ResetClickEvent()
- {
- ButtonClickEvent = null;
- this.MouseUpEventHandler -= this.ButtonBase_MouseUpEventHandler;
- this.MouseUpEventHandler += this.ButtonBase_MouseUpEventHandler;
- }
-
- /// <summary>
/// 鎺т欢鎽ф瘉
/// </summary>
public override void RemoveFromParent()
{
ButtonClickEvent = null;
+ ButtonDownClickEvent = null;
+ ButtonLongClickEvent = null;
+
base.RemoveFromParent();
}
@@ -257,7 +342,7 @@
/// <summary>
/// Log鍑哄姏
/// </summary>
- private void WriteLog()
+ private void WriteLog(int div)
{
if (formName == null)
{
@@ -288,7 +373,14 @@
controlName = this.UnSelectedImagePath;
}
}
- HdlLogLogic.Current.WriteLog(1, formName + "鐨刐" + controlName + "]鎸夐敭琚偣鍑�");
+ if (div == 0)
+ {
+ HdlLogLogic.Current.WriteLog(1, formName + "鐨刐" + controlName + "]鎸夐敭琚偣鍑�");
+ }
+ else
+ {
+ HdlLogLogic.Current.WriteLog(1, formName + "鐨刐" + controlName + "]鎸夐敭琚暱鎸�");
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs
index 514060f..1b53982 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs
@@ -41,7 +41,7 @@
this.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
this.TextAlignment = TextAlignment.Center;
- this.MouseDownEventHandler += this.Button_MouseDownEvent;
+ this.ButtonDownClickEvent += this.Button_MouseDownEvent;
}
#endregion
@@ -58,7 +58,7 @@
if (this.UseClickStatu == false)
{
//姘镐箙绉婚櫎
- this.MouseDownEventHandler -= this.Button_MouseDownEvent;
+ this.ButtonDownClickEvent -= Button_MouseDownEvent;
return;
}
if (base.CanClick == false || isSelcetStatu == true)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs
index 64a0020..f93af7e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs
@@ -26,7 +26,7 @@
public IconControlCommon()
{
//杩欎釜浜嬩欢鏄悶鐐逛寒鐗规晥鐨�
- this.MouseDownEventHandler += this.Button_MouseDownEvent;
+ this.ButtonDownClickEvent += this.Button_MouseDownEvent;
}
#endregion
@@ -43,7 +43,7 @@
if (this.UseClickStatu == false || string.IsNullOrEmpty(this.SelectedImagePath) == true)
{
//姘镐箙绉婚櫎
- this.MouseDownEventHandler -= this.Button_MouseDownEvent;
+ this.ButtonDownClickEvent -= Button_MouseDownEvent;
return;
}
if (base.CanClick == false || this.IsSelected == true)
@@ -54,15 +54,8 @@
//璁剧疆澶勪簬閫夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
this.SetSelectPictrue();
- HdlThreadLogic.Current.RunThread(() =>
- {
- System.Threading.Thread.Sleep(ControlCommonResourse.StatuChangedWaitTime);
- Application.RunOnMainThread(() =>
- {
- //璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
- this.SetUnSelectPictrue();
- });
- });
+ //璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
+ this.SetUnSelectPictrue(true);
}
/// <summary>
@@ -76,10 +69,29 @@
/// <summary>
/// 璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
/// </summary>
- public void SetUnSelectPictrue()
+ /// <param name="waitTime">杩藉姞鍙橀噺:鏄惁绛夊緟</param>
+ public void SetUnSelectPictrue(bool waitTime)
{
- //璁剧疆涓嶉�夋嫨鐘舵��
- this.IsSelected = false;
+ if (waitTime == false)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //璁剧疆涓嶉�夋嫨鐘舵��
+ this.IsSelected = false;
+ });
+ }
+ else
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ System.Threading.Thread.Sleep(ControlCommonResourse.StatuChangedWaitTime);
+ Application.RunOnMainThread(() =>
+ {
+ //璁剧疆涓嶉�夋嫨鐘舵��
+ this.IsSelected = false;
+ });
+ });
+ }
}
#endregion
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index 54939ae..abc30df 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -23,6 +23,10 @@
/// 鎾ら槻
/// </summary>
private GarrisonControl btnReGarrisonGarrison = null;
+ /// <summary>
+ /// 妗屽竷鎺т欢
+ /// </summary>
+ private FrameLayout frameTable = null;
#endregion
@@ -36,8 +40,6 @@
this.Gravity = Gravity.CenterHorizontal;
this.Width = Application.GetRealWidth(964);
this.Height = Application.GetRealHeight(340);
- this.Radius = 20;
- this.BackgroundColor = UserCenterColor.Current.White;
}
/// <summary>
@@ -49,15 +51,22 @@
this.btnReGarrisonGarrison = null;
this.btnRemovehomeGarrison = null;
+ this.frameTable = new FrameLayout();
+ frameTable.Height = this.Height;
+ frameTable.Width = this.Width;
+ frameTable.Radius = 20;
+ frameTable.BackgroundColor = UserCenterColor.Current.White;
+ this.AddChidren(frameTable);
+
//鍙充笂鍦嗚鑳屾櫙
- var btnTopRight = new NormalViewControl(50, 50, true);
+ var btnTopRight = new NormalViewControl(150, 60, true);
btnTopRight.BackgroundColor = UserCenterColor.Current.White;
btnTopRight.Radius = 6;
this.AddChidren(btnTopRight);
btnTopRight.X = this.Width - btnTopRight.Width;
//宸︿笅鍦嗚鑳屾櫙
- var btnBottomRight = new NormalViewControl(50, 50, true);
+ var btnBottomRight = new NormalViewControl(150, 60, true);
btnBottomRight.BackgroundColor = UserCenterColor.Current.White;
btnBottomRight.Radius = 6;
this.AddChidren(btnBottomRight);
@@ -68,7 +77,7 @@
{
//鍦ㄥ甯冮槻
btnAthomeGarrison = new GarrisonControl();
- this.AddChidren(btnAthomeGarrison);
+ frameTable.AddChidren(btnAthomeGarrison);
btnAthomeGarrison.InitControl(GarrisonMode.AtHome);
btnAthomeGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -80,7 +89,7 @@
//绂诲甯冮槻
btnRemovehomeGarrison = new GarrisonControl();
btnRemovehomeGarrison.X = btnAthomeGarrison.Right + Application.GetRealWidth(32);
- this.AddChidren(btnRemovehomeGarrison);
+ frameTable.AddChidren(btnRemovehomeGarrison);
btnRemovehomeGarrison.InitControl(GarrisonMode.RemoveHome);
btnRemovehomeGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -92,7 +101,7 @@
//鎾ら槻
btnReGarrisonGarrison = new GarrisonControl();
btnReGarrisonGarrison.X = btnRemovehomeGarrison.Right + Application.GetRealWidth(32);
- this.AddChidren(btnReGarrisonGarrison);
+ frameTable.AddChidren(btnReGarrisonGarrison);
btnReGarrisonGarrison.InitControl(GarrisonMode.RemoveGarrison);
btnReGarrisonGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -104,7 +113,7 @@
//甯冮槻
btnAthomeGarrison = new GarrisonControl();
btnAthomeGarrison.X = Application.GetRealWidth(166);
- this.AddChidren(btnAthomeGarrison);
+ frameTable.AddChidren(btnAthomeGarrison);
btnAthomeGarrison.InitControl(GarrisonMode.AtHome);
btnAthomeGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -116,7 +125,7 @@
//鎾ら槻
btnReGarrisonGarrison = new GarrisonControl();
btnReGarrisonGarrison.X = btnAthomeGarrison.Right + Application.GetRealWidth(32);
- this.AddChidren(btnReGarrisonGarrison);
+ frameTable.AddChidren(btnReGarrisonGarrison);
btnReGarrisonGarrison.InitControl(GarrisonMode.RemoveGarrison);
btnReGarrisonGarrison.ButtonClickEvent += (sender, e) =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index cb7d026..4c0144d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -35,11 +35,6 @@
}
}
- /// <summary>
- /// Log澶囦唤鐨勫悕瀛�
- /// </summary>
- private string LogBackupName = "##Log##";
-
#endregion
#region 鈻� 鑾峰彇澶囦唤鍚嶅瓧鍒楄〃___________________
@@ -49,9 +44,9 @@
/// </summary>
/// <param name="ZigbeeBackupType">0:App鎵嬪姩澶囦唤 1: App 鑷姩澶囦唤 2锛氱綉鍏虫墜鍔ㄥ浠� 3:缃戝叧鑷姩澶囦唤</param>
/// <param name="ZigbeeUniqueId">缃戝叧鐨勫敮涓�Id,鑾峰彇缃戝叧澶囦唤闇�瑕�</param>
- /// <param name="getLogBackup">鏄惁鑾峰彇Log澶囦唤</param>
+ /// <param name="getOptionBackup">鏄惁鑾峰彇鍔熻兘澶囦唤</param>
/// <returns></returns>
- public async Task<List<BackupListNameInfo>> GetBackupListNameFromDB(int ZigbeeBackupType = 0, string ZigbeeUniqueId = null, bool getLogBackup = false)
+ public async Task<List<BackupListNameInfo>> GetBackupListNameFromDB(int ZigbeeBackupType = 0, string ZigbeeUniqueId = null, bool getOptionBackup = false)
{
//澶囦唤鍚嶅瓧寰堝皯鐨勫唴瀛橈紝鍙互鐩存帴涓�娆℃�у叏閮ㄥ彇瀹�
var pra = new GetBackupListPra();
@@ -78,9 +73,9 @@
{
continue;
}
- if (getLogBackup == false && data2.BackupName == LogBackupName)
+ if (getOptionBackup == false && data2.BackupName == DirNameResourse.OptionBackupName)
{
- //涓嶈幏鍙朙og澶囦唤
+ //涓嶈幏鍙栧姛鑳藉浠�
continue;
}
list.Add(data2);
@@ -370,13 +365,6 @@
ProgressFormBar.Current.SetValue(i + 1 + listNormalFile.Count, listFileCount);
}
- //涓婁紶Log澶囦唤
- if (upPath != UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory))
- {
- //閲岄潰鏈変釜鍥炶皟鑷韩鐨勬柟娉�,鎵�浠ヨ繖閲屽姞涓垽鏂�,涓嶇劧浼氭寰幆
- await this.UpLoadLogBackup();
- }
-
//杩涘害鏉″叧闂�
ProgressFormBar.Current.Close();
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
@@ -541,10 +529,10 @@
#region 鈻� 涓婁紶Log澶囦唤________________________
/// <summary>
- /// 涓婁紶Log澶囦唤
+ /// 涓婁紶Log澶囦唤(闅愬尶鍔熻兘)
/// </summary>
/// <returns></returns>
- private async Task<bool> UpLoadLogBackup()
+ public async Task<bool> UpLoadLogBackup()
{
string upPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory);
if (HdlAutoBackupLogic.GetFileFromDirectory(upPath).Count == 0)
@@ -553,41 +541,38 @@
return true;
}
- //鏃犺閿欒
- IMessageCommon.Current.IgnoreError = true;
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg("姝ｅ湪涓婁紶Log鏂囦欢");
+
//浠庝簯绔幏鍙栨暟鎹�
var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(0, null, true);
if (pageData == null)
{
- //鎭㈠
- IMessageCommon.Current.IgnoreError = false;
+ ProgressFormBar.Current.Close();
return false;
}
+ string backId = string.Empty;
for (int i = 0; i < pageData.Count; i++)
{
- if (pageData[i].BackupName == LogBackupName)
+ if (pageData[i].BackupName == DirNameResourse.OptionBackupName)
{
- //鍒犻櫎鎺夎繖涓浠�
- bool flage = await this.DeleteDbBackupData(pageData[i].Id);
- if (flage == false)
- {
- //鎭㈠
- IMessageCommon.Current.IgnoreError = false;
- return false;
- }
+ //鑾峰彇鍔熻兘澶囦唤鐨処D
+ backId = pageData[i].Id;
break;
}
}
- //鍒涘缓鏂扮殑澶囦唤
- string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(LogBackupName);
- if (backupClassId == null)
+ if (backId == string.Empty)
{
- //鎭㈠
- IMessageCommon.Current.IgnoreError = false;
- return false;
+ //鍒涘缓鏂扮殑澶囦唤
+ backId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(DirNameResourse.OptionBackupName);
+ if (backId == null)
+ {
+ ProgressFormBar.Current.Close();
+ return false;
+ }
}
//涓婁紶Log鏂囦欢
- bool result = await this.UpLoadBackupFileToDB(backupClassId, 0, upPath, false);
+ bool result = await this.UpLoadBackupFileToDB(backId, 0, upPath, false);
if (result == true)
{
try
@@ -597,14 +582,81 @@
}
catch { }
}
- //鎭㈠
- IMessageCommon.Current.IgnoreError = false;
+ ProgressFormBar.Current.Close();
return result;
}
#endregion
+ #region 鈻� 璇诲彇闅愬尶鍔熻兘閰嶇疆___________________
+
+ /// <summary>
+ /// 璇诲彇闅愬尶鍔熻兘閰嶇疆(涓嶈鍦ㄦ剰杩斿洖鍊�)
+ /// </summary>
+ /// <returns></returns>
+ public async Task<bool> LoadHideOption()
+ {
+ //鍏堝垵濮嬪寲
+ UserCenterResourse.HideOption = new HideOptionInfo();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1 && UserCenterResourse.UserInfo.AuthorityNo != 2)
+ {
+ return true;
+ }
+
+ //鏃犺閿欒
+ IMessageCommon.Current.IgnoreError = true;
+ //浠庝簯绔幏鍙栨暟鎹�
+ var pageData = await this.GetBackupListNameFromDB(0, null, true);
+ if (pageData == null)
+ {
+ //鎭㈠
+ IMessageCommon.Current.IgnoreError = false;
+ return false;
+ }
+ string backId = string.Empty;
+ for (int i = 0; i < pageData.Count; i++)
+ {
+ if (pageData[i].BackupName == DirNameResourse.OptionBackupName)
+ {
+ //鑾峰彇鍔熻兘澶囦唤鐨処D
+ backId = pageData[i].Id;
+ break;
+ }
+ }
+ if (backId == string.Empty)
+ {
+ //娌℃湁鍔熻兘閰嶇疆
+ IMessageCommon.Current.IgnoreError = false;
+ return true;
+ }
+ //鑾峰彇杩欎釜澶囦唤涓嬮潰鏈夊灏戜釜鏂囦欢
+ List<string> listFile = await GetBackFileIDFromDB(backId, false, null);
+ if (listFile == null)
+ {
+ //鎭㈠
+ IMessageCommon.Current.IgnoreError = false;
+ return false;
+ }
+
+ if (listFile.Contains(DirNameResourse.ShowOptionMenuFile) == true)
+ {
+ //鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�)
+ UserCenterResourse.HideOption.CenterHideMenu = 1;
+ }
+ if (listFile.Contains(DirNameResourse.DetailedLogFile) == true)
+ {
+ //鍑哄姏璇︾粏Log(Debug鐢�)
+ UserCenterResourse.HideOption.DetailedLog = 1;
+ }
+
+ //鎭㈠
+ IMessageCommon.Current.IgnoreError = false;
+ return true;
+ }
+
+ #endregion
+
#region 鈻� 璇诲彇澶囦唤___________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index ea5c735..5a8c34a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -461,7 +461,7 @@
btnMsg.TextID = R.MyInternationalizationString.uGatewayDataIsChangingPleaseWhait;
});
}
- await System.Threading.Tasks.Task.Delay(8000);
+ await Task.Delay(8000);
//鑾峰彇缃戝叧鐨勪俊鎭�
var result = await zbGateway.GetZbGwInfoAsync();
@@ -473,15 +473,7 @@
return -1;
}
- if (result == null)
- {
- //鑾峰彇缃戝叧淇℃伅澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);
- this.ShowTipMsg(msg);
- return -1;
- }
-
- if (result.getGwData == null)
+ if (result == null || result.getGwData == null)
{
//鑾峰彇缃戝叧淇℃伅澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index 2895fed..bccf1e7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -60,7 +60,7 @@
{
lock (objLock)
{
- if (div != -1)
+ if (div != -1 && UserCenterResourse.HideOption.DetailedLog == 0)
{
//鏆傛椂鍙褰曞紓甯镐俊鎭�
return;
@@ -95,11 +95,11 @@
string fileName = DateTime.Now.ToString("yyyyMMdd");
if (div == -1)
{
- fileName += "Log";
+ fileName += "Error";
}
else if (div == 1)
{
- fileName += "Error";
+ fileName += "Log";
}
fileName = UserCenterLogic.EncryptPassword("4^Olh_3f", fileName);
return fileName;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index b73cdc7..046b3fa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -32,18 +32,6 @@
}
/// <summary>
- /// 褰撳墠Wifi鐨処p鍦板潃
- /// </summary>
- public string IpAddress
- {
- get
- {
- var temp = new Shared.Net.NetWiFi();
- return temp.GetIPAddress();
- }
- }
-
- /// <summary>
/// 褰撳墠鏄惁鏄綉鍏崇儹鐐�
/// </summary>
public bool IsGatewayHotspot
@@ -286,14 +274,14 @@
/// <param name="wifiPsw">wifi瀵嗙爜</param>
/// <param name="p2">鎴戜篃涓嶇煡閬撹繖涓槸浠�涔堜笢瑗�</param>
/// <returns></returns>
- public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")
+ public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")
{
if (hdlWiFi == null)
{
Com.Mediatek.Elian.ElianNative.LoadLib();
//鍒濆鍖朩i-Fi閰嶇綉
this.hdlWiFi = new Com.Mediatek.Elian.ElianNative();
- hdlWiFi.InitSmartConnection(null, 1, 1);
+ var value = hdlWiFi.InitSmartConnection(null, 1, 0);
}
//寮�濮媁i-Fi閰嶇綉
var result = hdlWiFi.StartSmartConnection(wifiName, wifiPsw, p2);
@@ -308,7 +296,7 @@
if (hdlWiFi != null)
{
//鍋滄Wi-Fi閰嶇綉
- hdlWiFi.StopSmartConnection();
+ var result = hdlWiFi.StopSmartConnection();
}
}
#endif
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 319918d..ebed985 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -639,11 +639,6 @@
}
catch { }
- if (noticeDb == true)
- {
- //閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
- var result = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/SignOut", null, "GET");
- }
HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
@@ -654,6 +649,12 @@
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
formLogin.Show(account);
});
+
+ if (noticeDb == true)
+ {
+ //閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
+ var result = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/SignOut", null, "GET");
+ }
});
}
@@ -800,7 +801,9 @@
/// <summary>
/// 寮傛鏂规硶鎵ц(浠呴檺鍒囨崲浣忓畢鏃惰皟鐢�)锛屽埛鏂颁釜浜轰腑蹇冪殑鍐呭瓨鍙婄嚎绋�
/// </summary>
- public async static Task<bool> InitUserCenterMenmoryAndThread()
+ /// <param name="ShowPrompted">鏂拌拷鍔犲彉閲忥細鏄惁鏄剧ず鎻愮ず鑷姩澶囦唤鐨勭晫闈�</param>
+ /// <returns></returns>
+ public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
{
//APP缂撳瓨鍔犺浇寮�濮�
UserCenterResourse.Option.AppCanSignout = false;
@@ -831,6 +834,8 @@
{
//閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+ //璇诲彇闅愬尶閰嶇疆
+ await HdlBackupLogic.Current.LoadHideOption();
}
//鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅
@@ -878,7 +883,7 @@
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
- if (result == 0)
+ if (result == 0 && ShowPrompted == true)
{
//寮�鍚嚜鍔ㄥ浠芥彁绀�
HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index 81f0a60..f507655 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -118,5 +118,18 @@
/// 淇濆瓨鎰忚鍙嶉娆℃暟鐨勩�愭枃浠躲��
/// </summary>
public const string SuggestionFile = "f782709778b751ef2b3840f17e407ead";
+
+ /// <summary>
+ /// 鏄剧ず鍔熻兘鑿滃崟鐨勩�愭爣璇嗘枃浠躲��
+ /// </summary>
+ public const string ShowOptionMenuFile = "eaf5efcca1be2f4cb0ff3dea79df755f5886beb3bf7aed1b";
+ /// <summary>
+ /// 璇︾粏Log澶勭悊鐨勩�愭爣璇嗘枃浠躲��
+ /// </summary>
+ public const string DetailedLogFile = "ceec8cfdbe5e8112755cba32c1b081f9";
+ /// <summary>
+ /// 鍔熻兘澶囦唤鐨勫悕瀛� 杩欎釜涓滆タ涓嶅姞瀵�
+ /// </summary>
+ public const string OptionBackupName = "##Option##";
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 4526128..7b2a875 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -35,5 +35,9 @@
/// 璐﹀彿鐨勮缃俊鎭�
/// </summary>
public static AccountOption Option = new AccountOption();
+ /// <summary>
+ /// 闅愬尶閰嶇疆
+ /// </summary>
+ public static HideOptionInfo HideOption = new HideOptionInfo();
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index e47fed7..3fed027 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -15,10 +15,10 @@
/// </summary>
/// <param name="common">Common.</param>
public void Changed(CommonDevice common)
- {
+ {
Shared.Application.RunOnMainThread(() =>
{
- });
+ });
}
/// 鏋勯�犲嚱鏁�
@@ -573,7 +573,7 @@
};
rowLayout.AddChidren(line2);
- if (curIndex == curRoom.SceneUIList.Count - 1)
+ if (curIndex == curRoom.DeviceUIList.Count - 1)
{
line2.Visible = false;
}
@@ -591,9 +591,16 @@
}
else
{
- targetList.Add(device.CommonDevice);
- btnChoose.IsSelected = true;
- btnChoose.Visible = true;
+ if (targetList.Count > 9)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ }
+ else
+ {
+ targetList.Add(device.CommonDevice);
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ }
}
};
rowLayout.MouseUpEventHandler += hander;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index cfb5f36..c6c03c8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -1112,96 +1112,103 @@
// new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
//}
- if (delResult.delDeviceBindResponseData?.RemoveBindList != null)
+ if (delResult != null && delResult.removeBindResultResponseData != null)
{
- foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
+ if (delResult.delDeviceBindResponseData?.RemoveBindList != null)
{
- switch (re.Result)
+ foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
{
- case 0:
- currentKey.bindList.Remove(bindDevice);
- RefreshList();
- //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
- currentKey.RoomId = "";
- currentKey.ReSave();
- return 0;
- break;
- case 1:
- currentKey.bindList.Clear();
- try
- {
- CommonPage.Loading.Start("");
-
- var getBindList = await currentKey.GetDeviceBindAsync();
- var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
- var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
- if (getBindList != null)
+ switch (re.Result)
+ {
+ case 0:
+ currentKey.bindList.Remove(bindDevice);
+ RefreshList();
+ //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
+ currentKey.RoomId = "";
+ currentKey.ReSave();
+ return 0;
+ break;
+ case 1:
+ currentKey.bindList.Clear();
+ try
{
- if (getBindList.getAllBindResponseData != null)
- {
- foreach (var b in getBindList.getAllBindResponseData.BindList)
- {
- if (b.BindCluster == currentClusterID)
- {
- if (b.BindCluster == 6)
- {
+ CommonPage.Loading.Start("");
- if (b.BindType == 2)
+ var getBindList = await currentKey.GetDeviceBindAsync();
+ var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
+ var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
+ if (getBindList != null)
+ {
+ if (getBindList.getAllBindResponseData != null)
+ {
+ foreach (var b in getBindList.getAllBindResponseData.BindList)
+ {
+ if (b.BindCluster == currentClusterID)
+ {
+ if (b.BindCluster == 6)
{
- bindSceneListTemp.Add(b);
+
+ if (b.BindType == 2)
+ {
+ bindSceneListTemp.Add(b);
+ }
+ else
+ {
+ bindDeviceListTemp.Add(b);
+ }
}
else
{
- bindDeviceListTemp.Add(b);
+ currentKey.bindList.Add(b);
}
- }
- else
- {
- currentKey.bindList.Add(b);
}
}
}
}
+ if (currentKey.panelMode == 1)
+ {
+ currentKey.bindList = bindSceneListTemp;
+ }
+ else if (currentKey.panelMode == 100 || currentKey.panelMode == 101 || currentKey.panelMode == 102)
+ {
+ currentKey.bindList = bindDeviceListTemp;
+ }
}
- if (currentKey.panelMode == 1)
+ catch { }
+ finally
{
- currentKey.bindList = bindSceneListTemp;
- }
- else if (currentKey.panelMode == 100 || currentKey.panelMode == 101 || currentKey.panelMode == 102)
- {
- currentKey.bindList = bindDeviceListTemp;
- }
- }
- catch { }
- finally
- {
- RefreshList();
- CommonPage.Loading.Hide();
- }
- break;
- case 2:
- if (delResult.removeBindResultResponseData != null)
- {
- if (delResult.removeBindResultResponseData.Result == 0)
- {
- currentKey.bindList.Remove(bindDevice);
RefreshList();
- return 0;
+ CommonPage.Loading.Hide();
}
- else
+ break;
+ case 2:
+ if (delResult.removeBindResultResponseData != null)
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ if (delResult.removeBindResultResponseData.Result == 0)
+ {
+ currentKey.bindList.Remove(bindDevice);
+ RefreshList();
+ return 0;
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ }
}
- }
- break;
- default:
- break;
+ break;
+ default:
+ break;
+ }
}
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
}
}
catch { }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index 3404c78..741411a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -221,6 +221,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -241,10 +246,10 @@
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
- if (canTest == true)
- {
- menuCount = 2;
- }
+ //if (canTest == true)
+ //{
+ // menuCount = 2;
+ //}
var frame = new TopRightMenuControl(menuCount);
if (canTest == true)
{
@@ -258,10 +263,10 @@
}
//鍒犻櫎
- deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
- frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
- {
- });
+ //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
+ //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //{
+ //});
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
index cd52804..7a7fcc6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -220,6 +220,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -240,10 +245,10 @@
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
- if (canTest == true)
- {
- menuCount = 2;
- }
+ //if (canTest == true)
+ //{
+ // menuCount = 2;
+ //}
var frame = new TopRightMenuControl(menuCount);
if (canTest == true)
{
@@ -257,10 +262,10 @@
}
//鍒犻櫎
- deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
- frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
- {
- });
+ //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
+ //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //{
+ //});
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 5759c49..a6f7ada 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -918,16 +918,27 @@
/// <summary>
/// 鍒犻櫎鎸囧畾璁惧
/// </summary>
- private async void DoDeleteDevice()
+ private void DoDeleteDevice()
{
- //鍒犻櫎璁惧
- bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(async () =>
{
- return;
- }
- //鍏抽棴鐣岄潰
- this.CloseForm();
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍒犻櫎璁惧
+ bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ });
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index 5e7e106..4745c8f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -184,6 +184,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -204,10 +209,10 @@
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
- if (canTest == true)
- {
- menuCount = 2;
- }
+ //if (canTest == true)
+ //{
+ // menuCount = 2;
+ //}
var frame = new TopRightMenuControl(menuCount);
if (canTest == true)
{
@@ -221,10 +226,10 @@
}
//鍒犻櫎
- deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
- frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
- {
- });
+ //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
+ //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //{
+ //});
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index 0a7ed17..d10b69d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -214,6 +214,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -234,10 +239,10 @@
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
- if (canTest == true)
- {
- menuCount = 2;
- }
+ //if (canTest == true)
+ //{
+ // menuCount = 2;
+ //}
var frame = new TopRightMenuControl(menuCount);
if (canTest == true)
{
@@ -251,10 +256,10 @@
}
//鍒犻櫎
- deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
- frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
- {
- });
+ //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
+ //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //{
+ //});
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 9ea0ffd..7c33e57 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -64,7 +64,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
#endregion
@@ -424,9 +424,8 @@
var dialog = new Dialog { };
var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
doorDialog.Show();
- doorDialog.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(190);
+ doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
@@ -529,12 +528,12 @@
var dialog3 = new Dialog { };
var doorDialog3 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog3, Language.StringByID(R.MyInternationalizationString.UnlockRequest));
doorDialog3.Show();
- doorDialog3.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
doorDialog3.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog3.dialogMidFraFrameLayout.X = Application.GetRealWidth(228);
+ doorDialog3.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
doorDialog3.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
doorDialog3.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToOpenDoorLock);
+ doorDialog3.dialogMidText.TextAlignment = TextAlignment.Center;
doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
doorDialog3.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.Confrim);
doorDialog3.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs
index 0c6c44e..0ef19e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs
@@ -48,7 +48,6 @@
/// </summary>
public FrameLayout dialogMidFraFrameLayout = new FrameLayout
{
- Width = Application.GetRealWidth(415),
Height = Application.GetRealHeight(58),
X = Application.GetRealWidth(190),
Y = Application.GetRealHeight(202),
@@ -60,6 +59,8 @@
public Button dialogMidText = new Button
{
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextSize = 14,
+ TextAlignment = TextAlignment.Center,
};
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index d8c9401..5361754 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -131,7 +131,7 @@
var btnLine = new FrameLayout()
{
Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(5),
+ Height = 1,
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(81 + 127),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
@@ -152,7 +152,7 @@
Width = Application.GetRealWidth(222),
Height = Application.GetRealHeight(58),
Y = Application.GetRealHeight(35),
- Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+ Text = Language.StringByID(R.MyInternationalizationString.MatchPerson) + ":",
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
@@ -171,6 +171,16 @@
};
personRemarkRemarkFrameLayout.AddChidren(btnMatchPersonContent);
+ var btnLine1 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(965),
+ Height = 1,
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(81 + 127 + 12 + 127),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ bottomFrameLayout.AddChidren(btnLine1);
+
var completeBtn = new Button
{
X = Application.GetRealWidth(86),
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 0fbe09b..0d18c15 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -163,10 +163,9 @@
if (i == 0)
{
bottomRowLayout.Y = Application.GetRealHeight(220);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
- btnNext.Text = doorLock.DeviceName;
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(233 + 20);
var btnDeviceNameEditText = new EditText()
{
X = Application.GetRealWidth(46),
@@ -239,9 +238,8 @@
{
bottomRowLayout.Y = Application.GetRealHeight(481);
btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
-
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(253);
btnNext.TextAlignment = TextAlignment.CenterLeft;
btnNext.Height = Application.GetRealHeight(58);
btnNext.Text = doorLock.DeviceName;
@@ -286,7 +284,7 @@
btnName.Text = Language.StringByID(R.MyInternationalizationString.DoorLockTime);
btnNextFrameLayout.Y = btnName.Y;
btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
- btnLine.Visible = false;
+ btnLine.Visible = true;
btnLine.Y = Application.GetRealHeight(992);
}
int currentIndex = i;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
index 03a5d1a..10be4e8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
@@ -145,10 +145,9 @@
if (i == 0)
{
bottomRowLayout.Y = Application.GetRealHeight(220);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
- btnNext.Text = doorLock.DeviceName;
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(233 + 20);
var btnDeviceNameEditText = new EditText()
{
X = Application.GetRealWidth(46),
@@ -220,9 +219,8 @@
{
bottomRowLayout.Y = Application.GetRealHeight(481);
btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
-
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(253);
btnNext.TextAlignment = TextAlignment.CenterLeft;
btnNext.Height = Application.GetRealHeight(58);
btnNext.Text = doorLock.DeviceName;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 0676dc9..2a71d4b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -227,10 +227,23 @@
}
}
};
- btnRightFrameLayout.MouseUpEventHandler += eHandler;
- btnRight.MouseUpEventHandler += eHandler;
- RowView.MouseUpEventHandler += eHandler;
- btnText.MouseUpEventHandler += eHandler;
+ if (i == 0)
+ {
+ btnRightFrameLayout.MouseUpEventHandler += eHandler;
+ btnRight.MouseUpEventHandler += eHandler;
+ RowView.MouseUpEventHandler += eHandler;
+ btnText.MouseUpEventHandler += eHandler;
+ }
+ else if (i == 1)
+ {
+ btnRightFrameLayout.MouseUpEventHandler += eHandler;
+ btnRight.MouseUpEventHandler += eHandler;
+ }
+ else if (i == 2)
+ {
+ btnRightFrameLayout.MouseUpEventHandler += eHandler;
+ btnRight.MouseUpEventHandler += eHandler;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
index b65da79..bd30cea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
@@ -350,7 +350,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
this.bottomRadiusFrameLayout.AddChidren(btnOk);
@@ -522,7 +522,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
this.bottomRadiusFrameLayout.AddChidren(btnOk);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 74cbb04..c78f4f1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -46,17 +46,20 @@
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
- ZigBee.Device.DoorLock doorLock;
- VerticalRefreshLayout bodyView;
+ ZigBee.Device.DoorLock doorLock;//褰撳墠闂ㄩ攣
+ VerticalRefreshLayout bodyView;//鍒锋柊View
Button currentMethod;// 褰撳墠閫夋嫨鐨勬柟寮�
- Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ Shared.Phone.UserCenter.MemberInfoRes curAccountObj;//褰撳墠璐︽埛
Button entryStatusPic;
Button btnPicTip;
Button btnPicTip1;
- bool isSecondDel;
- FrameLayout blankFrameLayout;
+ bool isSecondDel;//鏄惁浜屾鍒犻櫎
+ FrameLayout blankFrameLayout;//绌烘暟鎹樉绀哄竷灞�
#endregion
+ /// <summary>
+ /// 璇诲彇闂ㄩ攣瀛樺偍鐨勬渶鏂版暟鎹�
+ /// </summary>
void ReadDoorLockUserInfo()
{
System.Threading.Tasks.Task.Run(async () =>
@@ -238,6 +241,9 @@
BlankPicUI();
}
+ /// <summary>
+ /// 绌烘暟鎹甎I鏄剧ず
+ /// </summary>
void BlankPicUI()
{
blankFrameLayout = new FrameLayout
@@ -334,6 +340,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
};
bodyView.AddChidren(frameLayoutRow);
+
int i = 0;
foreach (var curUserId in curAccountDoorLockUserList.Keys)
{
@@ -655,6 +662,20 @@
#endregion
i++;
}
+
+ //閬尅RowLayout澶氫綑鐨勭嚎鏉�
+ for (int j = 0; j < curAccountDoorLockUserList.Keys.Count; j++)
+ {
+ var frameLayoutRowLineHide = new FrameLayout()
+ {
+ Height = 10,
+ Width = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(58),
+ Y = (j + 1) * Application.GetRealHeight(145),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ };
+ frameLayoutRow.AddChidren(frameLayoutRowLineHide);
+ }
frameLayoutRow.Height = i * Application.GetRealHeight(150);
}
}
@@ -697,6 +718,8 @@
var rowFrameLayout = new RowLayout()
{
Height = Application.GetRealHeight(150),
+ LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ X = Application.GetRealWidth(81),
};
sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
@@ -704,7 +727,6 @@
{
Width = Application.GetRealWidth(81),
Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(81),
Y = Application.GetRealHeight(55),
};
rowFrameLayout.AddChidren(btnAllMethod);
@@ -713,7 +735,7 @@
{
Width = Application.GetRealWidth(311),
Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(92),
Y = Application.GetRealHeight(69),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index a0f8318..60d84c7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -249,7 +249,7 @@
var line2 = new Button()
{
Y = rowFrameLayout.Height - 1,
- X = Application.GetRealWidth(58),
+ X = Application.GetRealWidth(176),
Width = Application.GetRealWidth(965),
Height = 1,
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
@@ -364,33 +364,35 @@
var btnMatchUser = new Button
{
- X = Application.GetRealWidth(446),
+ X = Application.GetRealWidth(159),
Y = Application.GetRealHeight(35),
Height = Application.GetRealHeight(63),
- Width = Application.GetRealWidth(284),
+ Width = Application.GetRealWidth(762),
Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 16,
+ TextAlignment = TextAlignment.Center,
};
matchUsersFrameLayout.AddChidren(btnMatchUser);
var btnFinish = new Button
{
- X = Application.GetRealWidth(919),
+ X = Application.GetRealWidth(921),
Y = Application.GetRealHeight(40),
Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(101),
+ Width = Application.GetRealWidth(101 + 81),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
};
matchUsersFrameLayout.AddChidren(btnFinish);
var btnTopLine = new FrameLayout()
{
- Height = Application.GetRealHeight(5),
+ Height = 1,
Y = Application.GetRealHeight(138),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
};
bottomFrameLayout2.AddChidren(btnTopLine);
@@ -644,6 +646,8 @@
var rowFrameLayout = new RowLayout()
{
Height = Application.GetRealHeight(150),
+ LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ X = Application.GetRealWidth(81),
};
sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
@@ -651,7 +655,6 @@
{
Width = Application.GetRealWidth(81),
Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(81),
Y = Application.GetRealHeight(55),
};
rowFrameLayout.AddChidren(btnAllMethod);
@@ -660,7 +663,7 @@
{
Width = Application.GetRealWidth(311),
Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(92),
Y = Application.GetRealHeight(69),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 675be01..028d6f1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -117,6 +117,7 @@
Height = Application.GetRealHeight(1238),
Width = Application.GetRealWidth(965),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ Radius = 6,
};
this.midFrameLayout.AddChidren(midTopFrameLayout);
@@ -286,12 +287,22 @@
};
closeFrameLayout.AddChidren(btnDoorClosePic);
+ var btnCurrentTopFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(965),
+ BackgroundColor = ZigbeeColor.Current.XMBlack,
+ Y = Application.GetRealHeight(1100),
+ };
+ midTopFrameLayout.AddChidren(btnCurrentTopFrameLayout);
+
var btnCurrentFrameLayout = new FrameLayout()
{
Width = Application.GetRealWidth(965),
Height = Application.GetRealHeight(138),
Y = Application.GetRealHeight(1100),
BackgroundColor = ZigbeeColor.Current.XMBlack,
+ Radius = 6,
};
midTopFrameLayout.AddChidren(btnCurrentFrameLayout);
@@ -320,17 +331,19 @@
#endregion
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
- {
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result == false)
- {
- var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result1 == true)
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
- devicNameSecAction += (deviceRename) =>
+ {
+ openFrameLayout.Enable = false;
+ btnDoorOpenPic.Enable = false;
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result == false)
+ {
+ var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result1 == true)
+ {
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
{
@@ -340,21 +353,27 @@
deviceUI.CommonDevice.ReSave();
}
};
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- }
- else
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
- devicNameSecAction += (deviceRename) =>
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ }
+ else
+ {
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
{
@@ -364,8 +383,10 @@
deviceUI.CommonDevice.ReSave();
}
};
- }
- };
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ };
openFrameLayout.MouseUpEventHandler += hander1;
btnDoorOpenPic.MouseUpEventHandler += hander1;
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 89680e3..9bd9829 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -394,6 +394,8 @@
{
//闇�瑕侀噸鏂扮粦瀹�
this.dicZbGatewayDiv[listId[i]] = 2;
+ //鑾峰彇鍒颁簡鏂扮綉鍏�
+ this.newGatewayGetting = true;
}
if (mode == GatewayBindMode.First)
@@ -415,29 +417,7 @@
public override void CloseFormBefore()
{
ZigBee.Common.Application.IsSearchingGateway = false;
- //鏂紑娌℃湁鎵ц缁戝畾鐨勭綉鍏崇殑mqtt
- var list = new List<ZbGateway>();
- for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
- {
- if (HdlGatewayLogic.Current.IsGatewayExist(ZbGateway.GateWayList[i]) == false)
- {
- list.Add(ZbGateway.GateWayList[i]);
- }
- }
- if (list.Count > 0)
- {
- foreach (var way in list)
- {
- ZbGateway.GateWayList.RemoveAll((obj) => HdlGatewayLogic.Current.GetGatewayId(obj) == HdlGatewayLogic.Current.GetGatewayId(way));
- way.DisConnectLocalMqttClient("Search");
- }
- }
- if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
- {
- //鍒锋柊涓婚〉
- UserView.UserPage.Instance.Fresh();
- }
-
+
base.CloseFormBefore();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index ea4e0a0..2882324 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -382,6 +382,8 @@
{
//闇�瑕侀噸鏂扮粦瀹�
this.dicZbGatewayDiv[wayId] = 2;
+ //鑾峰彇鍒颁簡鏂扮綉鍏�
+ this.newGatewayGetting = true;
}
if (mode == GatewayBindMode.First)
@@ -403,14 +405,7 @@
public override void CloseFormBefore()
{
ZigBee.Common.Application.IsSearchingGateway = false;
- //鍋滄Wi-Fi閰嶇綉
- HdlWifiLogic.Current.StopSmartConnection();
- if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
- {
- //鍒锋柊涓婚〉
- UserView.UserPage.Instance.Fresh();
- }
base.CloseFormBefore();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
index 98431cf..57c6554 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -384,6 +384,8 @@
{
//闇�瑕侀噸鏂扮粦瀹�
this.dicZbGatewayDiv[wayId] = 2;
+ //鑾峰彇鍒颁簡鏂扮綉鍏�
+ this.newGatewayGetting = true;
}
if (mode == GatewayBindMode.First)
@@ -408,11 +410,6 @@
//鍋滄Wi-Fi閰嶇綉
HdlWifiLogic.Current.StopSmartConnection();
- if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
- {
- //鍒锋柊涓婚〉
- UserView.UserPage.Instance.Fresh();
- }
base.CloseFormBefore();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index 08c517b..59956dd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -395,21 +395,32 @@
/// </summary>
/// <param name="strWayId"></param>
/// <param name="row"></param>
- private async void DeleteGateway(string strWayId)
+ private void DeleteGateway(string strWayId)
{
- //鍒犻櫎浜戠缃戝叧
- bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(async () =>
{
- return;
- }
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
- {
- HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
- }
- //鍏抽棴鑷韩
- this.CloseForm();
+ //鍒犻櫎浜戠缃戝叧
+ bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+
+ if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ {
+ HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ });
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index ce7a88e..d0de6d5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -148,6 +148,7 @@
{
//濡傛灉杩欎釜缃戝叧杩樻病鏈夌粦瀹�,鍒欑洿鎺ュ叧闂晫闈�
this.CloseForm();
+ return;
}
//瀹屾垚鎸夐挳鎸変笅
this.FinishButtonClick(btnGateName.Text);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index 4266eeb..4868a21 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
@@ -177,5 +177,22 @@
}
#endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
+ {
+ //鍒锋柊涓婚〉
+ UserView.UserPage.Instance.Fresh();
+ }
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
index 8fc2aaf..9e7939d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
@@ -99,7 +99,7 @@
bodyFrameLayout.AddChidren(btnRemind);
btnRemind.ButtonClickEvent += (sender, e) =>
{
- HdlAutoBackupLogic.SaveBackupNotPrompted(false, 1);
+ HdlAutoBackupLogic.SaveBackupNotPrompted(false, 3);
this.CloseForm();
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
new file mode 100755
index 0000000..0632ca3
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
@@ -0,0 +1,127 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.HideOption
+{
+ /// <summary>
+ /// 闅愬尶鍔熻兘鐨勭綉鍏冲垪琛ㄧ晫闈�
+ /// </summary>
+ public class HideOptionGatewayListForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listview = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_GatewayDiv">缃戝叧鍖哄垎,1:鏈湴缃戝叧 2:骞挎挱鎼滃埌鐨勭綉鍏�</param>
+ public void ShowForm(int i_GatewayDiv)
+ {
+ if (i_GatewayDiv == 1)
+ {
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText("鏈湴缃戝叧");
+ }
+ else
+ {
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText("骞挎挱鎼滃埌鐨勭綉鍏�");
+ }
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame(i_GatewayDiv);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame(int i_GatewayDiv)
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ listview = new VerticalListControl(29);
+ listview.Height = bodyFrameLayout.Height;
+ listview.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(listview);
+
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //璁惧畾涓儴淇℃伅
+ this.SetMiddleFrameInfo(i_GatewayDiv);
+ });
+ }
+
+ /// <summary>
+ /// 璁惧畾涓儴淇℃伅
+ /// </summary>
+ private void SetMiddleFrameInfo(int i_GatewayDiv)
+ {
+ List<ZbGateway> listway = null;
+ if (i_GatewayDiv == 1)
+ {
+ //鑾峰彇鏈湴鍏ㄩ儴缃戝叧瀵硅薄
+ listway = HdlGatewayLogic.Current.GetAllLocalGateway();
+ }
+ else
+ {
+ listway = ZbGateway.GateWayList;
+ }
+ for (int i = 0; i < listway.Count; i++)
+ {
+ //娣诲姞琛�
+ this.AddRowLayout(listway[i], i != listway.Count - 1);
+ }
+
+ //璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
+ this.listview.AdjustRealHeight(Application.GetRealHeight(23));
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞缃戝叧琛宊________________________
+
+ /// <summary>
+ /// 娣诲姞琛�
+ /// </summary>
+ /// <param name="i_gateway">i_gateway</param>
+ /// <param name="addLine">鏄惁娣诲姞搴曠嚎</param>
+ private void AddRowLayout(ZbGateway i_gateway, bool addLine)
+ {
+ //缃戝叧鎺т欢
+ var gatewayRow = new GatewayRowControl(i_gateway, listview.rowSpace / 2);
+ listview.AddChidren(gatewayRow);
+ gatewayRow.InitControl(81);
+ if (addLine == true)
+ {
+ gatewayRow.frameTable.AddBottomLine();
+ }
+
+ //瀹氫綅
+ var btnPosition = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
+ btnPosition.BackgroundColor = 0xff4a4a4a;
+ btnPosition.TextAlignment = TextAlignment.Center;
+ btnPosition.TextColor = UserCenterColor.Current.White;
+ btnPosition.TextSize = 12;
+ btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
+ gatewayRow.AddRightView(btnPosition);
+ btnPosition.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佸畾浣嶅懡浠�
+ HdlGatewayLogic.Current.SetFixedPositionCommand(i_gateway);
+ };
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
new file mode 100755
index 0000000..d26382c
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -0,0 +1,136 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.HideOption
+{
+ /// <summary>
+ /// 闅愬尶鍔熻兘鐨勪富鐣岄潰
+ /// </summary>
+ public class HideOptionMainForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListRefreshControl listView = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText("闅愬尶涓荤晫闈�");
+
+ listView = new VerticalListRefreshControl(23);
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ listView.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listView);
+ listView.BeginHeaderRefreshingAction += () =>
+ {
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ listView.EndHeaderRefreshing();
+ };
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ listView.RemoveAll();
+
+ this.AddRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
+
+ this.AddRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
+
+ this.AddRowControl("璐﹀彿绫诲瀷", 400, Common.Config.Instance.Home.AccountType.ToString(), 400);
+
+ this.AddRowControl("鏄惁杩滅▼杩炴帴", 400, ZigBee.Device.ZbGateway.IsRemote == true ? "鏄�" : "鍚�", 400);
+
+ int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.UseClickStatu = false;
+ row1.AddLeftCaption("鏈湴缃戝叧", 400);
+ if (count > 0)
+ {
+ row1.UseClickStatu = true;
+ row1.AddRightArrow();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionGatewayListForm();
+ form.AddForm(1);
+ };
+ }
+ row1.AddMostRightView(count + "涓�", 400);
+ row1.AddBottomLine();
+
+ count = ZigBee.Device.ZbGateway.GateWayList.Count;
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.UseClickStatu = false;
+ row1.AddLeftCaption("骞挎挱鎼滃埌鐨勭綉鍏�", 400);
+ if (count > 0)
+ {
+ row1.UseClickStatu = true;
+ row1.AddRightArrow();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionGatewayListForm();
+ form.AddForm(2);
+ };
+ }
+ row1.AddMostRightView(count + "涓�", 400);
+ row1.AddBottomLine();
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("涓婁紶Log", 500);
+ row1.AddRightArrow();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶Log鏂囦欢", () =>
+ {
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ await HdlBackupLogic.Current.UpLoadLogBackup();
+ });
+ });
+ };
+
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ }
+
+ /// <summary>
+ /// 娣诲姞琛�
+ /// </summary>
+ /// <param name="caption"></param>
+ /// <param name="width1"></param>
+ /// <param name="viewText"></param>
+ /// <param name="width2"></param>
+ private FrameRowControl AddRowControl(string caption, int width1, string viewText, int width2)
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption(caption, width1);
+ row1.AddMostRightView(viewText, width2);
+ row1.AddBottomLine();
+ row1.UseClickStatu = false;
+
+ return row1;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index ea31def..9f840e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -117,6 +117,15 @@
listResidenceSort.Add(pageData.PageData[i].Id);
}
}
+ for (int i = 0; i < listResidenceSort.Count; i++)
+ {
+ //绉婚櫎鎺変笉瀛樺湪浜嗙殑椤哄簭
+ if (dicData.ContainsKey(listResidenceSort[i]) == false)
+ {
+ listResidenceSort.RemoveAt(i);
+ i--;
+ }
+ }
//淇濆瓨椤哄簭
string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceSortFile);
UserCenterLogic.SaveFileContent(fullName, listResidenceSort);
@@ -132,6 +141,10 @@
this.dicResidenceData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();
for (int i = 0; i < listResidenceSort.Count; i++)
{
+ if (dicData.ContainsKey(listResidenceSort[i]) == false)
+ {
+ continue;
+ }
var info = dicData[listResidenceSort[i]];
if (info.IsOthreShare == false)
{
@@ -206,12 +219,13 @@
{
HdlThreadLogic.Current.RunThread(async () =>
{
- ProgressBar.Show();
+ this.ShowProgressBar();
+
Config.Instance.HomeId = info.Id;
Global.CreateHomeDirectory(info.Id);
Config.Instance.Save();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread();
+ await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
Room.InitAllRoom();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 0b71266..7524e31 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -601,10 +601,10 @@
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
if (result == false)
{
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
return;
}
@@ -636,8 +636,9 @@
Common.Config.Instance.HomeId = myHouse.Id;
Common.Global.CreateHomeDirectory(myHouse.Id);
Common.Config.Instance.Save();
+
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread();
+ await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
Common.Room.InitAllRoom();
//鍒犻櫎浣忓畢
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
index 702fbec..3073e2b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
@@ -44,6 +44,11 @@
{
Contacts.ContactAction = (phoneName, phoneNum) =>
{
+ //鎵嬫満鍙锋娴�
+ if (this.CheckPhoneNumber("86", phoneNum, phoneName) == false)
+ {
+ return;
+ }
//淇濆瓨鑱旂郴浜�
this.SaveCoercePhoneNumber("86", phoneNum, phoneName);
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
index 9968b1e..4c293ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
@@ -27,6 +27,10 @@
/// 鍒楄〃鐨勬甯冩帶浠�
/// </summary>
private FrameLayout frameTable = null;
+ /// <summary>
+ /// 褰撳墠鐨勮仈绯讳汉鍒楄〃
+ /// </summary>
+ private List<ZigBee.Device.Safeguard.PushTargetInfo> listPhoneData = null;
#endregion
@@ -150,7 +154,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
- var listPhoneData = new List<ZigBee.Device.Safeguard.PushTargetInfo>();
+ this.listPhoneData = new List<ZigBee.Device.Safeguard.PushTargetInfo>();
//鑱旂郴浜�
var rowContact = new FrameRowControl(listview.rowSpace / 2);
rowContact.UseClickStatu = false;
@@ -257,6 +261,16 @@
if (result == true)
{
rowContact.RemoveFromParent();
+
+ //绉婚櫎缂撳瓨
+ string checkKeys = areaCode + "-" + phone;
+ for (int i = 0; i < this.listPhoneData.Count; i++)
+ {
+ if (listPhoneData[i].PushNumber == checkKeys)
+ {
+ listPhoneData.RemoveAt(i);
+ }
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index ebac787..37253bc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -65,30 +65,31 @@
/// </summary>
private void InitTabSwitchControl()
{
+ var frameBack = new FrameLayout();
+ frameBack.Height = Application.GetRealHeight(1300);
+ frameBack.Y = Application.GetRealHeight(444);
+ frameBack.BackgroundColor = 0xa1ffffff;
+ frameBack.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ bodyFrameLayout.AddChidren(frameBack);
+
//妗屽竷鎺т欢
frameLayoutDraw = new FrameLayout();
- frameLayoutDraw.Y = Application.GetRealHeight(590);
- frameLayoutDraw.Height = bodyFrameLayout.Height - Application.GetRealHeight(590);
- bodyFrameLayout.AddChidren(frameLayoutDraw);
-
- //涓存椂鐨勪竴涓笢瑗�,鐢ㄦ潵璁＄畻鐪熷疄鍊艰�屽凡
- var btnTemp = new NormalViewControl(100, false);
- int realLogWidth = btnTemp.GetRealWidthByText(16, Language.StringByID(R.MyInternationalizationString.uSecurityLog));
- int realSensorWidth = btnTemp.GetRealWidthByText(16, Language.StringByID(R.MyInternationalizationString.uSensorStatu));
- btnTemp = null;
+ frameLayoutDraw.Y = Application.GetRealHeight(181);
+ frameLayoutDraw.Height = frameBack.Height - Application.GetRealHeight(181);
+ frameBack.AddChidren(frameLayoutDraw);
//瀹夐槻璁板綍(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
var frameLog = new FrameLayoutControl();
frameLog.UseClickStatu = false;
frameLog.Height = Application.GetRealHeight(123);
- frameLog.Width = realLogWidth;
- frameLog.X = Application.GetRealWidth(489) - realLogWidth;
- frameLog.Y = Application.GetRealHeight(467);
- bodyFrameLayout.AddChidren(frameLog);
+ frameLog.Width = Application.GetRealWidth(273);
+ frameLog.X = Application.GetRealWidth(259);
+ frameLog.Y = Application.GetRealHeight(58);
+ frameBack.AddChidren(frameLog);
//鏍囬
var btnLog = new NormalViewControl(100, 63, true);
- btnLog.Width = realLogWidth;
- btnLog.TextAlignment = TextAlignment.CenterRight;
+ btnLog.Width = frameLog.Width;
+ btnLog.TextAlignment = TextAlignment.Center;
btnLog.TextID = R.MyInternationalizationString.uSecurityLog;
btnLog.TextColor = UserCenterColor.Current.TextGrayColor3;
frameLog.AddChidren(btnLog, ChidrenBindMode.BindEventOnly);
@@ -105,15 +106,16 @@
var frameSensor = new FrameLayoutControl();
frameSensor.UseClickStatu = false;
frameSensor.Height = frameLog.Height;
- frameSensor.Width = realSensorWidth;
- frameSensor.X = Application.GetRealWidth(550);
+ frameSensor.Width = frameLog.Width;
+ frameSensor.X = frameLog.Right;
frameSensor.Y = frameLog.Y;
- bodyFrameLayout.AddChidren(frameSensor);
+ frameBack.AddChidren(frameSensor);
//鏍囬
var btnSensor = new NormalViewControl(100, 63, true);
- btnSensor.Width = realSensorWidth;
+ btnSensor.Width = frameSensor.Width;
btnSensor.TextID = R.MyInternationalizationString.uSensorStatu;
btnSensor.TextSize = 16;
+ btnSensor.TextAlignment = TextAlignment.Center;
btnSensor.TextColor = UserCenterColor.Current.TextColor2;
frameSensor.AddChidren(btnSensor, ChidrenBindMode.BindEventOnly);
//搴曠嚎
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
index a1337aa..60082de 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
@@ -74,6 +74,7 @@
txtInput.PlaceholderTextColor = UserCenterColor.Current.TextGrayColor1;
txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uYouSuggestionMsg);
frameInput.AddChidren(txtInput);
+ txtInput.InitIosPlaceholderUILabelWithHeight(Application.GetRealHeight(60));
txtInput.TextChangeEventHandler += (sender, txtvalue) =>
{
if (this.suggestionCount <= 0)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
index 44d8fc4..b438cb5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
@@ -90,13 +90,18 @@
}
//浜屾瀹夊叏楠岃瘉灏嗙敤浜庝笅鍒楁搷浣�
- var btnTitle = new NormalViewControl(800, 49, true);
+ var btnTitle = new NormalViewControl(800, 50, true);
btnTitle.X = ControlCommonResourse.XXLeft;
- btnTitle.Y = frameTop.Bottom + Application.GetRealHeight(35);
+ btnTitle.Y = frameTop.Bottom + Application.GetRealHeight(34);
btnTitle.TextSize = 12;
btnTitle.TextColor = UserCenterColor.Current.TextGrayColor3;
btnTitle.TextID = R.MyInternationalizationString.uSecondarySecurityWillBeUsedForTheFollowingOperations;
bodyFrameLayout.AddChidren(btnTitle);
+ btnTitle.ButtonClickEvent += (sender, e) =>
+ {
+ //闅愬尶鍔熻兘鐐瑰嚮
+ this.HideOptionClick(btnTitle);
+ };
var frameButtom = new FrameListControl(12);
frameButtom.Y = btnTitle.Bottom + Application.GetRealHeight(23);
@@ -321,5 +326,52 @@
}
#endregion
+
+ #region 鈻� 闅愬尶鍔熻兘___________________________
+
+ /// <summary>
+ /// 鐐瑰嚮鍚堣
+ /// </summary>
+ private int clickCount = 0;
+ /// <summary>
+ /// 鐐瑰嚮鐨勯偅鐬棿鐨勬椂闂�
+ /// </summary>
+ private DateTime clickTime;
+ /// <summary>
+ /// 闅愬尶鍔熻兘
+ /// </summary>
+ private void HideOptionClick(NormalViewControl btnTitle)
+ {
+ if (clickCount == 0)
+ {
+ clickTime = DateTime.Now;
+ }
+ clickCount++;
+ if (clickCount >= 10)
+ {
+ if ((DateTime.Now - clickTime).TotalSeconds > 3)
+ {
+ clickCount = 0;
+ return;
+ }
+ btnTitle.CanClick = false;
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ this.ShowProgressBar();
+ var result = await HdlBackupLogic.Current.LoadHideOption();
+ this.CloseProgressBar();
+ if (result == true)
+ {
+ this.ShowMassage(ShowMsgType.Tip, "鍒锋柊闅愬尶閰嶇疆鎴愬姛");
+ }
+ else
+ {
+ this.ShowMassage(ShowMsgType.Tip, "鍒锋柊闅愬尶閰嶇疆澶辫触");
+ }
+ });
+ }
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index a6f1f12..008e1fd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -11,9 +11,13 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 鐧借壊鑳屾櫙妗�
+ /// 涓昏彍鍗曡儗鏅
/// </summary>
- private FrameLayout frameWhiteBack = null;
+ private FrameLayout frameMainMenuBack = null;
+ /// <summary>
+ /// 鍏朵粬鑿滃崟鐨勫鍣ㄦ帶浠�
+ /// </summary>
+ private FrameListControl frameOtherMenuContr = null;
/// <summary>
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
@@ -174,21 +178,21 @@
/// <param name="frameWhite">鑳屾櫙</param>
private void InitMainMenuInfoControl(FrameLayout frameWhite)
{
- if (frameWhiteBack != null)
+ if (frameMainMenuBack != null)
{
- frameWhiteBack.RemoveAll();
+ frameMainMenuBack.RemoveAll();
}
else
{
//鑳屾櫙妗�
- frameWhiteBack = new FrameLayout();
- frameWhiteBack.Y = Application.GetRealHeight(288);
- frameWhiteBack.Gravity = Gravity.CenterHorizontal;
- frameWhiteBack.Height = Application.GetRealHeight(371);
- frameWhiteBack.Width = frameWhite.Width - Application.GetRealWidth(29 * 2);
- frameWhiteBack.Radius = 10;
- frameWhiteBack.BackgroundColor = UserCenterColor.Current.White;
- frameWhite.AddChidren(frameWhiteBack);
+ frameMainMenuBack = new FrameLayout();
+ frameMainMenuBack.Y = Application.GetRealHeight(288);
+ frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
+ frameMainMenuBack.Height = Application.GetRealHeight(371);
+ frameMainMenuBack.Width = frameWhite.Width - Application.GetRealWidth(29 * 2);
+ frameMainMenuBack.Radius = 10;
+ frameMainMenuBack.BackgroundColor = UserCenterColor.Current.White;
+ frameWhite.AddChidren(frameMainMenuBack);
}
//鏍囬锛氱鐞�
@@ -197,7 +201,7 @@
frameTitle.Width = Application.GetRealWidth(907);
frameTitle.Height = Application.GetRealHeight(121);
frameTitle.Gravity = Gravity.CenterHorizontal;
- frameWhiteBack.AddChidren(frameTitle);
+ frameMainMenuBack.AddChidren(frameTitle);
var btnTitle = new NormalViewControl(500, 60, true);
btnTitle.Gravity = Gravity.CenterVertical;
btnTitle.TextID = R.MyInternationalizationString.uManagement;
@@ -208,7 +212,7 @@
frameTitle.AddChidren(btnLine);
//鍒涘缓鍏ㄩ儴鐨勪富鑿滃崟鎺т欢
- this.CreatAllMainMenuControl(frameWhiteBack);
+ this.CreatAllMainMenuControl(frameMainMenuBack);
}
/// <summary>
@@ -340,16 +344,23 @@
/// <param name="frameWhite">鑳屾櫙</param>
private void InitOtherMenuControl(FrameLayout frameWhite)
{
- var frameList = new FrameListControl(26);
- frameList.Y = Application.GetRealHeight(698);
- frameList.Height = ControlCommonResourse.ListViewRowHeight * 3 + Application.GetRealHeight(26 * 3);
- frameWhite.AddChidren(frameList);
+ if (this.frameOtherMenuContr != null)
+ {
+ frameOtherMenuContr.RemoveAll();
+ }
+ else
+ {
+ frameOtherMenuContr = new FrameListControl(26);
+ frameOtherMenuContr.Y = Application.GetRealHeight(698);
+ frameOtherMenuContr.Height = ControlCommonResourse.ListViewRowHeight * 4 + Application.GetRealHeight(26 * 4);
+ frameWhite.AddChidren(frameOtherMenuContr);
+ }
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鏁版嵁澶囦唤
- var rowback = new FrameRowControl(frameList.rowSpace / 2);
- frameList.AddChidren(rowback);
+ var rowback = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
+ frameOtherMenuContr.AddChidren(rowback);
//鍚戝彸鍥炬爣
var btnBackRight = rowback.AddRightArrow();
btnBackRight.X -= ControlCommonResourse.XXLeft / 2;
@@ -371,8 +382,8 @@
}
//鎰忚鍙嶉
- var rowSuggestion = new FrameRowControl(frameList.rowSpace / 2);
- frameList.AddChidren(rowSuggestion);
+ var rowSuggestion = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
+ frameOtherMenuContr.AddChidren(rowSuggestion);
//鍚戝彸鍥炬爣
var btnSuRight = rowSuggestion.AddRightArrow();
btnSuRight.X -= ControlCommonResourse.XXLeft / 2;
@@ -393,8 +404,8 @@
};
//鍏充簬鎴戜滑
- var rowAbount = new FrameRowControl(frameList.rowSpace / 2);
- frameList.AddChidren(rowAbount);
+ var rowAbount = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
+ frameOtherMenuContr.AddChidren(rowAbount);
//鍚戝彸鍥炬爣
var btnAbountRight = rowAbount.AddRightArrow();
btnAbountRight.X -= ControlCommonResourse.XXLeft / 2;
@@ -413,6 +424,31 @@
var form = new Abount.AbountForm();
form.AddForm();
};
+
+ if (UserCenterResourse.HideOption.CenterHideMenu == 1)
+ {
+ //闅愬尶鑿滃崟
+ var rowHide = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
+ frameOtherMenuContr.AddChidren(rowHide);
+ //鍚戝彸鍥炬爣
+ var btnHideRight = rowHide.AddRightArrow();
+ btnHideRight.X -= ControlCommonResourse.XXLeft / 2;
+ //鍥炬爣
+ var btnHideIcon = rowHide.AddLeftIcon();
+ btnHideIcon.X -= ControlCommonResourse.XXLeft / 2;
+ btnHideIcon.UnSelectedImagePath = "Center/Abount.png";
+ //搴曠嚎
+ var btnHideLine = rowHide.AddBottomLine();
+ btnHideLine.X -= ControlCommonResourse.XXLeft / 2;
+ //闅愬尶鑿滃崟View
+ var btnHideView = rowHide.AddLeftCaption("闅愬尶鑿滃崟", 300);
+ btnHideView.X -= ControlCommonResourse.XXLeft / 2;
+ rowHide.ButtonClickEvent += (sender, e) =>
+ {
+ var from = new HideOption.HideOptionMainForm();
+ from.AddForm();
+ };
+ }
}
#endregion
@@ -454,7 +490,9 @@
this.msgControl?.RefreshStatu();
//鍒濆鍖栦富鑿滃崟鐨勬帶浠�
- this.InitMainMenuInfoControl(frameWhiteBack);
+ this.InitMainMenuInfoControl(null);
+ //鍒濆鍖栧叾浠栬彍鍗曠殑鎺т欢
+ this.InitOtherMenuControl(null);
return 1;
}
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 24a92c3..3a4a75e 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -6,6 +6,7 @@
using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserCenter.DoorLock;
using System.Timers;
+using Shared.Phone.Device.DeviceLogic;
namespace Shared.Phone.UserView
{
@@ -475,7 +476,7 @@
var tempHomeBtn = send as Button;
if (Config.Instance.HomeFilePathList.Count == 0)
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
+ var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
alert.Show();
alert.ResultEventHandler += (senderHouse, eHouse) =>
{
@@ -502,7 +503,7 @@
Y = Application.GetRealHeight(248),
Width = Application.GetMinRealAverage(449),
Height = Application.GetMinRealAverage(478),
- UnSelectedImagePath = "Item/SelectHouse"
+ UnSelectedImagePath = "Item/SelectHouse.png"
};
closeBGview.AddChidren(bg);
@@ -510,8 +511,8 @@
{
X = Application.GetRealWidth(35),
Y = Application.GetRealHeight(271),
- Height = Application.GetRealHeight(449),
- Width = Application.GetRealWidth(440),
+ Height = Application.GetMinRealAverage(449),
+ Width = Application.GetMinRealAverage(440),
Radius = CommonPage.BigFormRadius,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
@@ -623,23 +624,25 @@
//娑堟伅
messageBtn.MouseUpEventHandler += (send, e) =>
{
-
+
};
#endregion
if (CanBindGateway() == false)
{
- var roomPageView = new PageLayout()
+
+ var roomPageView = new HorizontalPages()
{
Y = Application.GetRealHeight(302),
- Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
- Height = Application.GetMinRealAverage(roomPageView_Height),
- Radius = CommonPage.BigFormRadius,
- Gravity = Gravity.CenterHorizontal,
- IsShowPoint = false
+ Width = Application.GetRealWidth(CommonPage.AppRealWidth),
+ Height = Application.GetRealHeight(478),
};
AddChidren(roomPageView);
+ //涓庡睆骞曡竟妗嗙殑杈硅窛
+ roomPageView.RowPadding = Application.GetRealWidth(181);
+ //涓や釜page涔嬮棿鐨勯棿璺�
+ roomPageView.PagePadding = Application.GetRealWidth(69);
//褰撳墠鎴块棿
//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
@@ -647,50 +650,12 @@
Room.CurrentRoom = rList[0];
foreach (var room in rList)
{
- var roomBackView = new FrameLayout()
+ var roomView = new Device.CommonForm.RoomView(0, 0);
+ roomPageView.AddChidren(roomView);
+ roomView.Init(room);
+ roomView.action += () =>
{
- BackgroundImagePath = room.BackgroundImage
- };
- roomPageView.AddChidren(roomBackView);
- var roomBG = new Button()
- {
- UnSelectedImagePath = "Room/HomeBG.png",
- //UnSelectedImagePath = room.BackgroundImage
- };
- roomBackView.AddChidren(roomBG);
- var roomName = new Button()
- {
- X = Application.GetRealWidth(20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetRealWidth(500),
- Height = Application.GetRealHeight(80),
- Text = room.Name,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextSize = 18,
- };
- roomBackView.AddChidren(roomName);
- var roomListBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = roomPageView.Width - Application.GetRealWidth(100 + 20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(100),
- Height = Application.GetMinRealAverage(100),
- UnSelectedImagePath = "Item/List.png",
- };
- roomBackView.AddChidren(roomListBtn);
-
- roomListBtn.MouseUpEventHandler += (send, e) =>
- {
- CommonPage.Instance.IsDrawerLockMode = true;
- var editRoom = new Device.Room.EditRoom();
- HomePage.Instance.AddChidren(editRoom);
- HomePage.Instance.PageIndex += 1;
- editRoom.Show(room);
- editRoom.action += () =>
- {
- Show();
- };
+ Show();
};
}
@@ -714,7 +679,8 @@
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Scence,
- IsSelected = false
+ IsSelected = true,
+ TextSize=16
};
functionSceneView.AddChidren(sceneBtn);
@@ -728,7 +694,8 @@
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Function,
- IsSelected = false
+ IsSelected = false,
+ TextSize=14
};
functionSceneView.AddChidren(functionBtn);
@@ -747,6 +714,8 @@
{
sceneBtn.IsSelected = false;
functionBtn.IsSelected = true;
+ sceneBtn.TextSize = 14;
+ functionBtn.TextSize = 16;
RefreshBodyView();
};
//閫夋嫨鍦烘櫙鍒嗘爮
@@ -754,6 +723,8 @@
{
functionBtn.IsSelected = false;
sceneBtn.IsSelected = true;
+ sceneBtn.TextSize = 16;
+ functionBtn.TextSize = 14;
RefreshBodyView();
};
@@ -1019,14 +990,14 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
});
}
else
{
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - rollerShade.LastDateTime).TotalSeconds)
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
}
}
var lightView = new FunctionMainView(xx, yy);
@@ -1049,7 +1020,7 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
- (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
((sender as Button).Parent as FunctionMainView).IsSelected = true;
@@ -1075,7 +1046,7 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
- (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
((sender as Button).Parent as FunctionMainView).IsSelected = false;
@@ -1124,16 +1095,14 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
});
}
else
{
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
}
}
@@ -1259,8 +1228,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
ReadStatus(airSwitch, () =>
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
});
}
else
@@ -1268,8 +1236,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- airSwitch.ReadOnOffStatus();
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
}
}
@@ -1367,15 +1334,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
ReadStatus(ac, () =>
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
});
}
else
@@ -1383,15 +1342,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
}
}
var lightView = new FunctionMainView(xx, yy);
@@ -1486,8 +1437,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
ReadStatus(dimmableLight, () =>
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
});
}
else
@@ -1495,8 +1445,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
}
}
@@ -1596,20 +1545,6 @@
if (dimmableLight.Gateway == null)
{
continue;
- }
- if (dimmableLight.Gateway.IsVirtual)
- {
- ReadStatus(dimmableLight, () =>
- {
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- });
- }
- else
- {
- if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
- {
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- }
}
var lightView = new FunctionMainView(xx, yy);
@@ -1720,7 +1655,7 @@
for (int i = 0; i < sceneList.Count; i++)
{
var scene = sceneList[i];
- int xx = 43 + i % 2 * (20 + 487);
+ int xx = 33 + i % 2 * (40 + 487);
int yy = 14;
if (scene == null)
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index 93698ba..3fd043a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -50,7 +50,9 @@
try
{
if (string.IsNullOrEmpty(Shared.Common.Config.Instance.HomeId))
- {
+ {
+ //浣忓畢ID涓虹┖鍙湁涓�绉嶅彲鑳藉氨鏄��鍑轰簡鐧诲綍锛岃繖閲岀殑涓婁竴娆′綇瀹匢D瑕佹竻绌�
+ oldHomeID = "?";
System.Threading.Thread.Sleep(1000);
continue;
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index 4953b41..ebed365 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -317,6 +317,124 @@
/// <summary>
/// 瑙ｉ櫎缁戝畾
/// </summary>
+ //public async System.Threading.Tasks.Task<DelDeviceBindResponseAllData> DelDeviceBindAsync(DelDeviceBindData delDeviceBindData)
+ //{
+ // return await System.Threading.Tasks.Task.Run(async () =>
+ // {
+ // DelDeviceBindResponseAllData responseData = null;
+ // var mainGateway = ZbGateway.MainGateWay;
+ // if (mainGateway == null)
+ // {
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
+ // }
+
+ // Action<string, string> action = (topic, message) =>
+ // {
+ // var gatewayID = topic.Split('/')[0];
+ // var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+
+ // if (topic == gatewayID + "/" + "Error_Respon")
+ // {
+ // var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
+ // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+
+ // if (temp == null)
+ // {
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
+ // }
+ // else
+ // {
+ // responseData = new DelDeviceBindResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ // }
+ // }
+ // //鍦烘櫙绉婚櫎
+ // if (topic == gatewayID + "/" + "Bind/RemoveBind_Respon")
+ // {
+ // var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
+ // var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelDeviceBindResponseData>(jobject["Data"].ToString());
+
+ // if (tempData == null)
+ // {
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
+ // }
+ // else
+ // {
+ // responseData = new DelDeviceBindResponseAllData { delDeviceBindResponseData = tempData };
+ // System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
+ // }
+ // }
+ // //璁惧绉婚櫎
+ // if (topic == gatewayID + "/" + "Bind/RemoveBindResult")
+ // {
+ // var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
+ // var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveBindResultResponseData>(jobject["Data"].ToString());
+
+ // if (tempData != null)
+ // {
+ // responseData = new DelDeviceBindResponseAllData { removeBindResultResponseData = tempData };
+ // System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
+ // }
+ // }
+ // };
+ // mainGateway.Actions += action;
+ // System.Console.WriteLine("DeviceBind/DelBind_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
+ // try
+ // {
+ // if (delDeviceBindData != null)
+ // {
+ // var jObject = new JObject { { "DeviceAddr", delDeviceBindData.DeviceAddr }, { "Epoint", delDeviceBindData.Epoint }, { "Cluster_ID", 0 }, { "Command", 5003 } };
+ // var removeBindList = new JArray { };
+ // foreach (var removeBindInfo in delDeviceBindData.RemoveBindList)
+ // {
+ // if (removeBindInfo.BindType == 0)
+ // {
+ // var dInfo = new JObject{
+ // { "BindMacAddr",removeBindInfo.BindMacAddr},
+ // { "BindEpoint", removeBindInfo.BindEpoint} ,
+ // { "BindCluster", removeBindInfo.BindCluster} ,
+ // { "BindType",removeBindInfo.BindType}
+ // };
+ // removeBindList.Add(dInfo);
+ // }
+ // else if (removeBindInfo.BindType == 1)
+ // {
+ // var dInfo = new JObject{
+ // { "BindCluster", removeBindInfo.BindCluster} ,
+ // { "BindType",removeBindInfo.BindType},
+ // { "BindScenesId", removeBindInfo.BindScenesId}
+ // };
+ // removeBindList.Add(dInfo);
+ // }
+ // }
+ // var data = new JObject {
+ // {"RemoveBindList",removeBindList}
+ // };
+ // jObject.Add("Data", data);
+ // mainGateway.Send("Bind/RemoveBind", jObject.ToString());
+ // }
+ // }
+ // catch { }
+
+ // var dateTime = DateTime.Now;
+ // while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
+ // {
+ // await System.Threading.Tasks.Task.Delay(10);
+ // if (responseData != null)
+ // {
+ // break;
+ // }
+ // }
+ // if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
+ // {
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ // }
+ // mainGateway.Actions -= action;
+ // System.Console.WriteLine("DeviceBind/DelBind_Actions 閫�鍑�" + System.DateTime.Now.ToString());
+ // return responseData;
+ // });
+ //}
+
+ //涔嬪墠2绉嶆柟寮忓弽棣堢粨鏋�
public async System.Threading.Tasks.Task<DelDeviceBindResponseAllData> DelDeviceBindAsync(DelDeviceBindData delDeviceBindData)
{
return await System.Threading.Tasks.Task.Run(async () =>
@@ -441,7 +559,7 @@
break;
}
}
- else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 4).Count)
+ else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 2).Count)
{
if (responseData.removeBindResultResponseData != null)
{
@@ -1005,7 +1123,8 @@
break;
}
}
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
+ //涓�閿竻闄ょ洰鏍囷紝浼氬洜涓虹洰鏍囨暟閲忓鑰屽姞闀挎椂闂达紝鐩墠鏆傚畾10绉�
+ if ((DateTime.Now - dateTime).TotalMilliseconds > 10 * 1000)
{
d = new ClearBindInfoResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 695486f..dffdf80 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -603,7 +603,8 @@
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 82 } };
var data = new JObject { { "HomeId", homeId }, { "AccountId", accountId } };
jObject.Add("Data", data);
- Send("GwSetHomeId", jObject.ToString());
+ //浣忓畢ID鐨勮缃�,鍥哄畾浣跨敤灞�鍩熺綉,涓嶅瓨鍦ㄨ繙绋嬬殑璇存硶
+ SendLocation("GwSetHomeId", System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
}
catch { }
@@ -3631,6 +3632,7 @@
await StartLocalMqtt("ReConnect");
if (localIsConnected)
{
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
}
}
@@ -3657,8 +3659,58 @@
return;
}
await Send(topic, System.Text.Encoding.UTF8.GetBytes(message), retain);
+ }
+
+ /// <summary>
+ /// 寮哄埗鎸囧畾浣跨敤鏈湴灞�鍩熺綉鍙戦�佹秷鎭埌鏈嶅姟鍣�
+ /// </summary>
+ /// <returns></returns>
+ /// <param name="topic"></param>
+ /// <param name="message"></param>
+ /// <param name="retain"></param>
+ public async Task SendLocation(string topic, byte[] message, bool retain = false)
+ {
+ try
+ {
+ if (Shared.Common.Config.Instance.HomeId == "")
+ {
+ return;
+ }
+
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+
+ if (IsEncry)
+ {
+ //鏂囦欢娴佷笉鐢ㄥ姞瀵�
+ if (topic != "FileTransfer/SendFile")
+ {
+ message = SecuritySet.AesEncryptBytes(message, password);
+ }
+ }
+ if (localIsConnected)
+ {
+ try
+ {
+ await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
+ }
+ catch (Exception e)
+ {
+ DebugPrintLog($"Local涓诲姩鏂紑_{e.Message}");
+ await DisConnectLocalMqttClient(e.Message);
+ await StartLocalMqtt("ReConnect");
+ if (localIsConnected)
+ {
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+ await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ DebugPrintLog($"Send:{ex.Message}");
+ }
}
-
[Serializable]
public class CloudTimeResponse
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 5658982..aba0dce
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -715,7 +715,7 @@
/// </summary>
public const int USERNAMEORPWDERROR = 10131;
/// <summary>
- /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+ /// 璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
/// </summary>
public const int ACCOUNTNOEXISTS = 10132;
/// <summary>
@@ -726,16 +726,100 @@
/// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
/// </summary>
public const int LoginByWechat = 10134;
+ /// <summary>
+ /// 鐧诲綍涓�...
+ /// </summary>
+ public const int Logining = 10135;
+ /// <summary>
+ /// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
+ /// </summary>
+ public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
+ /// <summary>
+ /// 浣忓畢鍚嶇О涓虹┖
+ /// </summary>
+ public const int TheResidenceNameNull = 10137;
+ /// <summary>
+ /// 閭閿欒锛岃閲嶆柊杈撳叆
+ /// </summary>
+ public const int TheEmailError = 10138;
+ /// <summary>
+ /// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
+ /// </summary>
+ public const int ThePhoneError = 10139;
+ /// <summary>
+ /// 浣犲凡琚己鍒朵笅绾匡紒
+ /// </summary>
+ public const int YouHaveBeenSignOut = 10141;
- #endregion
+ /// <summary>
+ /// 鏀规埧闂村悕绉板凡瀛樺湪
+ /// </summary>
+ public const int HadSameRoom = 10150;
+ /// <summary>
+ /// 鍦烘櫙鍚嶄笉鑳戒负绌�
+ /// </summary>
+ public const int SceneNameCannotBeNull = 10151;
+ /// <summary>
+ /// 鎺у埗鍦烘櫙澶辫触
+ /// </summary>
+ public const int ControlSceneFail = 10152;
+ /// <summary>
+ /// 鍦烘櫙涓虹┖
+ /// </summary>
+ public const int TheSceneIsNull = 10153;
+ /// <summary>
+ /// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
+ /// </summary>
+ public const int ThisSceneHaveNoDevice = 10154;
+ /// <summary>
+ /// 鎿嶄綔澶辫触
+ /// </summary>
+ public const int FAIL = 10155;
+ /// <summary>
+ /// 鍙戦�侀獙璇佺爜澶辫触
+ /// </summary>
+ public const int SENDFAIL = 10156;
+ /// <summary>
+ /// 缃戝叧涓嶅湪绾�
+ /// </summary>
+ public const int TheMainGatewayIsNotOnLine = 10157;
- #region 鍒嗙被
- /// <summary>
- /// 鍔熻兘
- /// </summary>
- public const int Function = 11000;
+ /// <summary>
+ /// 宸叉槸鏈�鏂扮増鏈�
+ /// </summary>
+ public const int TheAppVersionIsNewest = 10160;
+ /// <summary>
+ /// 鏇存柊
+ /// </summary>
+ public const int Update = 10161;
+ /// <summary>
+ /// 鏇存柊鍐呭
+ /// </summary>
+ public const int UpdateContent = 10162;
+ /// <summary>
+ /// 鏇存柊澶辫触
+ /// </summary>
+ public const int UpdateAppFail = 10163;
+ /// <summary>
+ /// 鏇存柊涓�...
+ /// </summary>
+ public const int Updating = 10164;
+ /// <summary>
+ /// 鍙栨秷鏇存柊
+ /// </summary>
+ public const int CancelUpdating = 10165;
+
+
+ #endregion
+
+ #region 鍒嗙被
+
+ /// <summary>
+ /// 鍔熻兘
+ /// </summary>
+ public const int Function = 11000;
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -1140,301 +1224,9 @@
#endregion
+
-
-
-
- public static readonly int OK = 10005;
-
- public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
-
- public static readonly int IncorrectMailboxformat = 10008;
- public static readonly int PasswordLengthIsLessThanSix = 10009;
-
-
- public static readonly int ThePasswordIsEmpty = 10011;
- public static readonly int PleaseGoToTheMailboxToActivateTheAccountNumber = 10012;
- public static readonly int PleaseInputTheCorrectCellPhoneNumber = 10013;
- public static readonly int PleaseInputTheCorrectVerificationCode = 10014;
-
-
- public static readonly int ThePhoneNumberIsNotRegisteredYetPleaseRegisterFirst = 10017;
- public static readonly int LoginCodeError = 10018;
- public static readonly int ThisUserBelongsToDebugAccountAndIsNotEnabled = 10019;
- public static readonly int PleaseGoToTheMailboxToConfirmThePasswordChange = 10020;
-
- public static readonly int MailDeliveryFailedPleaseTryAgain = 10021;
- public static readonly int TheAccountIsNotAuthorized = 10022;
- public static readonly int Version = 10023;
- public static readonly int QuitAccount = 10024;
- public static readonly int InputNewPWD = 10025;
- public static readonly int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10026;
- public static readonly int ResidentialNameCannotBeEmpty = 10027;
- public static readonly int TheResidenceNameHasExist = 10028;
- public static readonly int DelResidence = 10029;
- public static readonly int PWDCannotBeNull = 10030;
-
- public static readonly int AddRoomBackgroundPicture = 10031;
- public static readonly int TheRoomNameCannotBeNUll = 10032;
- public static readonly int TheResidenceNameNull = 10033;
-
-
-
- public static readonly int PleaseInputPhoneNumberOrEmail = 11000;
-
- //*****public static readonly int ForgotPassword = 11002;
-
-
- public static readonly int Account = 11005;
- public static readonly int RegisterByPhone = 11006;
- public static readonly int RegisterByEmail = 11007;
- public static readonly int LoginHadAccountPWD = 11008;
-
-
-
-
-
-
- public static readonly int BackToLogin = 11015;
-
- public static readonly int FindPWDByPhone = 11017;
- public static readonly int FindPWDByEmail = 11018;
- public static readonly int PleaseInputThePhoneAndYouWillHaveVerificationCode = 11019;
- public static readonly int PleaseInputTheEmailAndYouWillHaveVerificatoinCode = 11020;
- public static readonly int ResetPWD = 11021;
- public static readonly int ResetPWDSuccessPleaseLoginAgain = 11022;
-
- public static readonly int Logining = 11024;
-
- public static readonly int AddRoom = 11026;
-
-
-
- public static readonly int SettingContent = 11031;
- public static readonly int PleaseInputRoomName = 11032;
- public static readonly int LocalPic = 11033;
- public static readonly int TakePhoto = 11034;
- public static readonly int SystemPic = 11035;
-
- public static readonly int HadSameRoom = 11037;
- //*****public static readonly int Function = 11038;
-
-
-
- public static readonly int AddFunction = 11042;
-
- public static readonly int Light = 11044;
- public static readonly int AddLight = 11045;
- public static readonly int DropLight = 11046;
- public static readonly int DownLight = 11047;
- public static readonly int SpotLight = 11048;
- public static readonly int DeviceName = 11049;
-
-
- public static readonly int ConfirmAdd = 11052;
-
- public static readonly int Add = 11054;
- public static readonly int DeviceSetting = 11055;
-
- public static readonly int AddDeviceSuccess = 11058;
-
- public static readonly int Device = 11060;
-
- public static readonly int ConfirmDeleteThisRoom = 11062;
-
-
-
-
-
-
-
-
- public static readonly int NextStep = 11071;
- public static readonly int SelectRoom = 11072;
- public static readonly int SelectDevice = 11073;
-
- /// <summary>
- /// 璋冨厜
- /// </summary>
- public static readonly int Dimming = 11075;
- public static readonly int ThisSceneHadTheDevice = 11076;
- public static readonly int SceneNameCannotBeNull = 11077;
- public static readonly int ModifyScene = 11078;
-
-
-
-
-
- public static readonly int YourPWDIsTooSample = 11088;
- public static readonly int PleaseInputTheCorrectEmail = 11089;
- /// <summary>
- /// 鎿嶄綔澶辫触
- /// </summary>
- public static readonly int FAIL = 11090;
- /// <summary>
- /// 鍙戦�侀獙璇佺爜澶辫触
- /// </summary>
- public static readonly int SENDFAIL = 11091;
- /// <summary>
- /// 杩炴帴缃戝叧鎴栬�呰幏鍙栨暟鎹け璐�
- /// </summary>
- public static readonly int ConnectGWFail = 11092;
- /// <summary>
- /// 鏃堕棿闂撮殧
- /// </summary>
- public static readonly int TimeSpan = 11093;
-
-
-
-
- /// <summary>
- /// 鑷畾涔�
- /// </summary>
- public static readonly int Custom = 11098;
-
- /// <summary>
- /// 鍙栨秷鏀惰棌
- /// </summary>
- public static readonly int CancelCollect = 11101;
- /// <summary>
- /// 淇敼淇℃伅
- /// </summary>
- public static readonly int ChangeDeviceInfo = 11102;
- /// <summary>
- /// 鐧惧垎姣�
- /// </summary>
- public static readonly int Percent = 11103;
-
-
- /// <summary>
- /// The please confirm new password.
- /// </summary>
- public readonly static int PleaseConfirmNewPassword = 11106;
- /// <summary>
- /// 楠岃瘉鐮佸け鏁�
- /// </summary>
- public readonly static int NORECORD = 11107;
-
- public static readonly int TheMainGatewayIsNotOnLine = 12000;
-
- public static readonly int TheSceneIsNull = 12002;
- /// <summary>
- /// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
- /// </summary>
- public static readonly int ThisSceneHaveNoDevice = 12003;
- public static readonly int TheAppVersionIsNewest = 12004;
- public static readonly int Update = 12005;
- public static readonly int UpdateContent = 12006;
- public static readonly int UpdateAppFail = 12007;
- public static readonly int ControlSceneFail = 12008;
- public static readonly int DeleteSceneFail = 12009;
- public static readonly int SaveTheNewRoomOrNo = 12010;
- public static readonly int Updating = 12011;
- public static readonly int CancelUpdating = 12012;
- /// <summary>
- /// 鏂瑰悜涓庨檺浣�
- /// </summary>
- public static readonly int DirectionLimit = 12013;
- /// <summary>
- /// 缁存姢妯″紡
- /// </summary>
- public static readonly int MaintenanceMode = 12014;
- /// <summary>
- /// 鍚姩/绂佹鎵嬫媺寮�鍏�
- /// </summary>
- public static readonly int Start_Forbid_Hand_Pull_Switch = 12015;
- /// <summary>
- /// 璧峰鏂瑰悜
- /// </summary>
- public static readonly int InitialDirection = 12016;
- /// <summary>
- /// 姝ｅ悜
- /// </summary>
- public static readonly int ForwardDirection = 12017;
- /// <summary>
- /// 鍙嶅悜
- /// </summary>
- public static readonly int ReverseDirection = 12018;
- /// <summary>
- /// 闄愪綅
- /// </summary>
- public static readonly int Limit = 12019;
- /// <summary>
- /// 寮�濮�
- /// </summary>
- public static readonly int Start = 12020;
- /// <summary>
- /// 缁撴潫
- /// </summary>
- public static readonly int End = 12021;
- /// <summary>
- /// 鎭㈠琛岀▼璁剧疆
- /// </summary>
- public static readonly int RestoreTravelSettings = 12022;
- /// <summary>
- /// 鎭㈠琛岀▼璁剧疆鍚庯紝褰撳墠璁剧疆灏嗚鍒濆鍖栵紝纭畾缁х画鍚楋紵
- /// </summary>
- public static readonly int IsCancelRestoreTravelSettings = 12023;
- /// <summary>
- /// 鍒囨崲缁存姢妯″紡澶辫触
- /// </summary>
- public static readonly int ChangeMaintenanceMode_Fail = 12024;
- /// <summary>
- /// 鏄惁璁剧疆褰撳墠浣嶇疆涓哄紑濮嬮檺浣嶏紵
- /// </summary>
- public static readonly int SettingStartLimit = 12025;
- /// <summary>
- /// 鏄惁璁剧疆褰撳墠浣嶇疆涓虹粨鏉熼檺浣嶏紵
- /// </summary>
- public static readonly int SettingEndLimit = 12026;
- /// <summary>
- /// 璁剧疆寮�濮嬮檺浣�
- /// </summary>
- public static readonly int SetStartLimit = 12027;
- /// <summary>
- /// 璁剧疆缁撴潫闄愪綅
- /// </summary>
- public static readonly int SetEndLimit = 12028;
- /// <summary>
- /// 瀵艰建绉诲姩涓紝璇风瓑寰呫�傘�傘��
- /// </summary>
- public static readonly int PleaseWaitWhileTheGuidewayIsMoving = 12029;
- /// <summary>
- /// 鎮ㄧ殑璐﹀彿宸插湪鍙︿竴鍙拌澶囩櫥褰曪紝鎮ㄥ凡琚己鍒朵笅绾�
- /// </summary>
- public static readonly int YouHaveBeenSignOut = 12030;
-
- /// <summary>
- /// 鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
- /// </summary>
- public static readonly int ThisSceneHadTheScene = 12032;
- /// <summary>
- /// 褰撳墠娌℃悳绱㈠埌缃戝叧锛岃鍏堟坊鍔犵綉鍏�
- /// </summary>
- public static readonly int NoGateway = 12033;
- /// <summary>
- ///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
- /// </summary>
- public static readonly int NoDeviceCanAddToRoom = 12034;
-
-
-
-
-
- /// <summary>
- /// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
- /// </summary>
- public static readonly int TheRoomNoDeviceAddToScene = 12500;
-
- /// <summary>
- /// 寰�涓婄Щ鍔�
- /// </summary>
- public static readonly int RollerShadeUp = 12501;
- /// <summary>
- /// 寰�涓嬬Щ鍔�
- /// </summary>
- public static readonly int RollerShadeDown = 12502;
/// <summary>
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 35d1714..c36a795 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -21,6 +21,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\UserLoginLocalRegionRes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Pad\MainPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\AccountForgetPWD.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\AccountLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\AccountRegister.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\AccountRegisterSuccess.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\AccountResetPWDSuccess.cs" />
@@ -55,6 +56,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\Line.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomMainView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomNoNameMainView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RowLayoutDeleteButton.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RowLayoutEditButton.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SceneCategoryView.cs" />
@@ -70,6 +72,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectTime.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectZone.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\TopFrameLayout.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\DeviceLogic\ReadDeviceAttributeLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\AirSwitchControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\DimmableLightControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\LightControl.cs" />
@@ -204,6 +207,8 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayVirtualDriveInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlAutoBackupForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlBackupListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMainForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberNotEsixtForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewPhoneForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckOldPhoneForm.cs" />
--
Gitblit v1.8.0