From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs | 17
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 42
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 9780 ++++++++++++++++++++++++-------------------
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 3
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs | 105
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn_2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 61
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs | 24
ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 35
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 35
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs | 128
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs | 42
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 52
ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 1
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/AddGatewayHelpForm.cs | 272 +
ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs | 1
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs | 41
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 140
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs | 8
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 19
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 48
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 4
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 6
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs | 31
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 31
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs | 16
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs | 33
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 10
ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs | 13
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 52
ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs | 3
ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 16
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn_2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 22
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 6
ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 248
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs | 7
ZigbeeApp/Shared/Shared.projitems | 2
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 14
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs | 450 +
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs | 153
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 34
ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection1Form.cs | 7
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 32
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 15
ZigbeeApp/Shared/Common/SendDataToServer.cs | 4
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 112
ZigbeeApp/Home.Ios/Resources/Phone/Item/SeekBarIcon.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 30
ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs | 1
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 12
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 18
ZigbeeApp/Shared/Common/CommonPage.cs | 5
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 25
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs | 33
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 4
ZigbeeApp/GateWay.Droid/Application.cs | 3
ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 3
ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs | 9
ZigbeeApp/Home.Ios/Resources/Phone/AC/Swing_5Selected.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SeekBarIcon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs | 2
ZigbeeApp/Shared/DLL/Android/Xamarin.Android.Support.Design.dll | 0
ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs | 1
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 14
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs | 11
ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs | 19
ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs | 49
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs | 256
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 50
ZigbeeApp/Home.Ios/Resources/Language.ini | 46
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn2.png | 0
ZigbeeApp/Home.Ios/Home.IOS.csproj | 7
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs | 5
ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs | 19
ZigbeeApp/Shared/R.cs | 104
ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 5
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs | 17
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs | 4
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 4
ZigbeeApp/Shared/Common/Device.cs | 88
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 5
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs | 1
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn2.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 9
ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs | 1
ZigbeeApp/Shared/Common/Room.cs | 44
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs | 7
127 files changed, 7,735 insertions(+), 5,486 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 0a7f5d4..2cdce88 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -97,7 +97,8 @@
var req = new SendAuth.Req { Scope = "snsapi_userinfo", State = "ZigbeeApp" };
api.SendReq(req);
}
- /// <summary>鈥� /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜扳�� /// </summary>鈥� void initAll()鈥� {鈥� BaseActivity.IsEnnableGPS = false;
+ /// <summary>鈥� /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜扳�� /// </summary>鈥� void initAll()鈥� {
+ Shared.Application.IsGpsEnable = false;
//璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
// System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
#if Release鈥� JPushInterface.SetDebugMode(false);
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 25d3bc8..0408330 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -603,7 +603,10 @@
5366=鑱斿姩浜嬩欢
5367=褰撳墠
5368=閫夋嫨妤煎眰
-
+5369=璇烽�夋嫨寤舵椂鏃堕棿锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5370=璇烽�夋嫨鐢ㄦ埛锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5371=璇烽�夋嫨鍦烘櫙锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5372=璇烽�夋嫨瀹夐槻妯″紡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
@@ -778,7 +781,8 @@
13506=5鎸�
13511=璇锋竻娲佹护缃�
-
+13600=娌″姛鑳� {\r\n} 璇峰厛娣诲姞
+13601=娌″満鏅� {\r\n} 璇峰厛娣诲姞
@@ -835,7 +839,7 @@
15050=鍋滄鎼滅储
15051=姝ｅ湪鎼滅储缃戝叧鈥�
15052=璇风◢鍊櫬仿仿�
-15053=璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+15053=璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
15054=缃戝叧鍚嶇О
15055=浣忓畢鍚嶇О
15056=瀹屾垚
@@ -1495,9 +1499,9 @@
15776=杩樻病鏈夊叡浜尯鍩熺粰鎴愬憳{0}鍙偣鍑诲彸涓婅鈥�+鈥濇坊鍔�
15777=纭鍒犻櫎鍏变韩鎴块棿锛�
15778=杩樻病缁戝畾缃戝叧鍝�
-15779=瑙ｅ喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
-15780=1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
-15781=2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+15779=瑙ｅ喅鏂规硶,鍙�夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
+15780=1.鐭寜HID/WCFG鎸夐敭,绯荤粺鎸囩ず鐏揩闂�3绉�,缃戝叧杩涘叆鎹㈢粦妯″紡,寮哄埗缃戝叧缁戝畾鍒板綋鍓岮PP
+15781=2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓�,鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏�,鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
15782=3.璇烽噸璇曪紝閲嶆柊娣诲姞缃戝叧銆�
15783=4.杩斿洖缃戝叧绠＄悊銆�
15784=閲嶈瘯
@@ -1623,12 +1627,12 @@
15904=AP妯″紡
15905=璺宠浆鍒扮Щ鍔ㄨ澶�
15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
-15907=闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
-15908=闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
-15909=璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15907=缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
+15908=璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
+15909=鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
15910=璇疯緭鍏ュ搴璚IFI璐﹀彿
-15911=璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
-15912=绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+15911=鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
+15912=缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
15915=閫夋嫨鍦扮偣
15916=鎮ㄧ殑鍙嶉鍜屾剰瑙佷細璁╂垜浠彉寰楁洿濂�
15917=鍙嶉绫诲瀷
@@ -1698,6 +1702,22 @@
15981=閫夋嫨hdlZigbeeGW-xxxx缃戠粶
15982=璇疯繛鎺ュ搴璚iFi
15983=姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
+15984=璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+15985=缃戝叧娣诲姞鎸囧紩
+15986=1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒,骞惰瀵熺綉鍙ED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+15987=2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓,杩欐椂瑙傚療澶栧３绯荤粺鎸囩ず鐏�,濡傛灉1绉掗棯鐑�,琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯�,鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+15988=缃戝叧纭欢闂甯姪
+15989=1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+15990=2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+15991=绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+15992=2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+15993=1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+15994=1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+15995=1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+15996=2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+15997=3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+15998=璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+15999=鏈煡妤煎眰
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png
index e794a92..0451429 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SeekBarIcon.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SeekBarIcon.png
new file mode 100755
index 0000000..44571e0
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SeekBarIcon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn2.png
new file mode 100755
index 0000000..589a226
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn_2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn_2.png
new file mode 100755
index 0000000..3bb5739
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn_2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 64dab1f..9981784 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -159,6 +159,9 @@
<Reference Include="Xamarin.Android.Support.Core.Utils">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.Utils.dll</HintPath>
</Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>
+ </Reference>
<Reference Include="Xamarin.Android.Support.Fragment">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Fragment.dll</HintPath>
</Reference>
@@ -1296,6 +1299,15 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\sensor0.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SeekBarIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn_2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn2.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/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 703272a..bcf64c2 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -34,221 +34,233 @@
public partial class Animation
{
- // aapt resource value: 0x7F010000
- public const int abc_fade_in = 2130771968;
+ // aapt resource value: 0x7f050000
+ public const int abc_fade_in = 2131034112;
- // aapt resource value: 0x7F010001
- public const int abc_fade_out = 2130771969;
+ // aapt resource value: 0x7f050001
+ public const int abc_fade_out = 2131034113;
- // aapt resource value: 0x7F010002
- public const int abc_grow_fade_in_from_bottom = 2130771970;
+ // aapt resource value: 0x7f050002
+ public const int abc_grow_fade_in_from_bottom = 2131034114;
- // aapt resource value: 0x7F010003
- public const int abc_popup_enter = 2130771971;
+ // aapt resource value: 0x7f050003
+ public const int abc_popup_enter = 2131034115;
- // aapt resource value: 0x7F010004
- public const int abc_popup_exit = 2130771972;
+ // aapt resource value: 0x7f050004
+ public const int abc_popup_exit = 2131034116;
- // aapt resource value: 0x7F010005
- public const int abc_shrink_fade_out_from_bottom = 2130771973;
+ // aapt resource value: 0x7f050005
+ public const int abc_shrink_fade_out_from_bottom = 2131034117;
- // aapt resource value: 0x7F010006
- public const int abc_slide_in_bottom = 2130771974;
+ // aapt resource value: 0x7f050006
+ public const int abc_slide_in_bottom = 2131034118;
- // aapt resource value: 0x7F010007
- public const int abc_slide_in_top = 2130771975;
+ // aapt resource value: 0x7f050007
+ public const int abc_slide_in_top = 2131034119;
- // aapt resource value: 0x7F010008
- public const int abc_slide_out_bottom = 2130771976;
+ // aapt resource value: 0x7f050008
+ public const int abc_slide_out_bottom = 2131034120;
- // aapt resource value: 0x7F010009
- public const int abc_slide_out_top = 2130771977;
+ // aapt resource value: 0x7f050009
+ public const int abc_slide_out_top = 2131034121;
- // aapt resource value: 0x7F01000A
- public const int fingerprint_draw_off_animation_interpolator_0 = 2130771978;
+ // aapt resource value: 0x7f05000a
+ public const int design_bottom_sheet_slide_in = 2131034122;
- // aapt resource value: 0x7F01000B
- public const int fingerprint_draw_off_animation_interpolator_1 = 2130771979;
+ // aapt resource value: 0x7f05000b
+ public const int design_bottom_sheet_slide_out = 2131034123;
- // aapt resource value: 0x7F01000C
- public const int fingerprint_draw_off_ridge_1_path_animation = 2130771980;
+ // aapt resource value: 0x7f05000c
+ public const int design_snackbar_in = 2131034124;
- // aapt resource value: 0x7F01000D
- public const int fingerprint_draw_off_ridge_2_path_animation = 2130771981;
+ // aapt resource value: 0x7f05000d
+ public const int design_snackbar_out = 2131034125;
- // aapt resource value: 0x7F01000E
- public const int fingerprint_draw_off_ridge_5_path_animation = 2130771982;
+ // aapt resource value: 0x7f05000e
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
- // aapt resource value: 0x7F01000F
- public const int fingerprint_draw_off_ridge_6_path_animation = 2130771983;
+ // aapt resource value: 0x7f05000f
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
- // aapt resource value: 0x7F010010
- public const int fingerprint_draw_off_ridge_7_path_animation = 2130771984;
+ // aapt resource value: 0x7f050010
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
- // aapt resource value: 0x7F010011
- public const int fingerprint_draw_on_animation_interpolator_0 = 2130771985;
+ // aapt resource value: 0x7f050011
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
- // aapt resource value: 0x7F010012
- public const int fingerprint_draw_on_animation_interpolator_1 = 2130771986;
+ // aapt resource value: 0x7f050012
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
- // aapt resource value: 0x7F010013
- public const int fingerprint_draw_on_ridge_1_path_animation = 2130771987;
+ // aapt resource value: 0x7f050013
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
- // aapt resource value: 0x7F010014
- public const int fingerprint_draw_on_ridge_2_path_animation = 2130771988;
+ // aapt resource value: 0x7f050014
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
- // aapt resource value: 0x7F010015
- public const int fingerprint_draw_on_ridge_5_path_animation = 2130771989;
+ // aapt resource value: 0x7f050015
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
- // aapt resource value: 0x7F010016
- public const int fingerprint_draw_on_ridge_6_path_animation = 2130771990;
+ // aapt resource value: 0x7f050016
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
- // aapt resource value: 0x7F010017
- public const int fingerprint_draw_on_ridge_7_path_animation = 2130771991;
+ // aapt resource value: 0x7f050017
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
- // aapt resource value: 0x7F010018
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771992;
+ // aapt resource value: 0x7f050018
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
- // aapt resource value: 0x7F010019
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771993;
+ // aapt resource value: 0x7f050019
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
- // aapt resource value: 0x7F01001A
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771994;
+ // aapt resource value: 0x7f05001a
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
- // aapt resource value: 0x7F01001B
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771995;
+ // aapt resource value: 0x7f05001b
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
- // aapt resource value: 0x7F01001C
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130771996;
+ // aapt resource value: 0x7f05001c
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
- // aapt resource value: 0x7F01001D
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130771997;
+ // aapt resource value: 0x7f05001d
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
- // aapt resource value: 0x7F01001E
- public const int fingerprint_error_state_to_fp_group_1_animation = 2130771998;
+ // aapt resource value: 0x7f05001e
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
- // aapt resource value: 0x7F01001F
- public const int fingerprint_error_state_to_fp_group_2_animation = 2130771999;
+ // aapt resource value: 0x7f05001f
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
- // aapt resource value: 0x7F010020
- public const int fingerprint_error_state_to_fp_path_1_animation = 2130772000;
+ // aapt resource value: 0x7f050020
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
- // aapt resource value: 0x7F010021
- public const int fingerprint_error_state_to_fp_path_2_animation = 2130772001;
+ // aapt resource value: 0x7f050021
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
- // aapt resource value: 0x7F010022
- public const int fingerprint_error_state_to_fp_path_3_animation = 2130772002;
+ // aapt resource value: 0x7f050022
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
+
+ // aapt resource value: 0x7f050023
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
+
+ // aapt resource value: 0x7f050024
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
+
+ // aapt resource value: 0x7f050025
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
+
+ // aapt resource value: 0x7f050026
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
- // aapt resource value: 0x7F010023
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772003;
+ // aapt resource value: 0x7f050027
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
- // aapt resource value: 0x7F010024
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772004;
+ // aapt resource value: 0x7f050028
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
- // aapt resource value: 0x7F010025
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772005;
+ // aapt resource value: 0x7f050029
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
- // aapt resource value: 0x7F010026
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772006;
+ // aapt resource value: 0x7f05002a
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
- // aapt resource value: 0x7F010027
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772007;
+ // aapt resource value: 0x7f05002b
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
- // aapt resource value: 0x7F010028
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772008;
+ // aapt resource value: 0x7f05002c
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
- // aapt resource value: 0x7F010029
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772009;
+ // aapt resource value: 0x7f05002d
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
- // aapt resource value: 0x7F01002A
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772010;
+ // aapt resource value: 0x7f05002e
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
- // aapt resource value: 0x7F01002B
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772011;
+ // aapt resource value: 0x7f05002f
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
- // aapt resource value: 0x7F01002C
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772012;
+ // aapt resource value: 0x7f050030
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
- // aapt resource value: 0x7F01002D
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772013;
+ // aapt resource value: 0x7f050031
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
- // aapt resource value: 0x7F01002E
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772014;
+ // aapt resource value: 0x7f050032
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
- // aapt resource value: 0x7F01002F
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772015;
+ // aapt resource value: 0x7f050033
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
- // aapt resource value: 0x7F010030
- public const int fingerprint_fp_to_error_state_group_1_animation = 2130772016;
+ // aapt resource value: 0x7f050034
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
- // aapt resource value: 0x7F010031
- public const int fingerprint_fp_to_error_state_group_2_animation = 2130772017;
+ // aapt resource value: 0x7f050035
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
- // aapt resource value: 0x7F010032
- public const int fingerprint_fp_to_error_state_path_1_animation = 2130772018;
+ // aapt resource value: 0x7f050036
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
- // aapt resource value: 0x7F010033
- public const int fingerprint_fp_to_error_state_path_2_animation = 2130772019;
+ // aapt resource value: 0x7f050037
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
- // aapt resource value: 0x7F010034
- public const int fingerprint_fp_to_error_state_path_3_animation = 2130772020;
+ // aapt resource value: 0x7f050038
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
- // aapt resource value: 0x7F010035
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772021;
+ // aapt resource value: 0x7f050039
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
- // aapt resource value: 0x7F010036
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772022;
+ // aapt resource value: 0x7f05003a
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
- // aapt resource value: 0x7F010037
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772023;
+ // aapt resource value: 0x7f05003b
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
- // aapt resource value: 0x7F010038
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772024;
+ // aapt resource value: 0x7f05003c
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
- // aapt resource value: 0x7F010039
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772025;
+ // aapt resource value: 0x7f05003d
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
- // aapt resource value: 0x7F01003A
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772026;
+ // aapt resource value: 0x7f05003e
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
- // aapt resource value: 0x7F01003B
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772027;
+ // aapt resource value: 0x7f05003f
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
- // aapt resource value: 0x7F01003C
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772028;
+ // aapt resource value: 0x7f050040
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
- // aapt resource value: 0x7F01003D
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772029;
+ // aapt resource value: 0x7f050041
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
- // aapt resource value: 0x7F01003E
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772030;
+ // aapt resource value: 0x7f050042
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
- // aapt resource value: 0x7F01003F
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772031;
+ // aapt resource value: 0x7f050043
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
- // aapt resource value: 0x7F010040
- public const int move_in = 2130772032;
+ // aapt resource value: 0x7f050044
+ public const int move_in = 2131034180;
- // aapt resource value: 0x7F010041
- public const int move_out = 2130772033;
+ // aapt resource value: 0x7f050045
+ public const int move_out = 2131034181;
- // aapt resource value: 0x7F010042
- public const int pickerview_dialog_scale_in = 2130772034;
+ // aapt resource value: 0x7f050046
+ public const int pickerview_dialog_scale_in = 2131034182;
- // aapt resource value: 0x7F010043
- public const int pickerview_dialog_scale_out = 2130772035;
+ // aapt resource value: 0x7f050047
+ public const int pickerview_dialog_scale_out = 2131034183;
- // aapt resource value: 0x7F010044
- public const int pickerview_slide_in_bottom = 2130772036;
+ // aapt resource value: 0x7f050048
+ public const int pickerview_slide_in_bottom = 2131034184;
- // aapt resource value: 0x7F010045
- public const int pickerview_slide_out_bottom = 2130772037;
+ // aapt resource value: 0x7f050049
+ public const int pickerview_slide_out_bottom = 2131034185;
- // aapt resource value: 0x7F010046
- public const int tooltip_enter = 2130772038;
+ // aapt resource value: 0x7f05004a
+ public const int tooltip_enter = 2131034186;
- // aapt resource value: 0x7F010047
- public const int tooltip_exit = 2130772039;
+ // aapt resource value: 0x7f05004b
+ public const int tooltip_exit = 2131034187;
static Animation()
{
@@ -260,11 +272,27 @@
}
}
+ public partial class Animator
+ {
+
+ // aapt resource value: 0x7f060000
+ public const int design_appbar_state_list_animator = 2131099648;
+
+ static Animator()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Animator()
+ {
+ }
+ }
+
public partial class Array
{
- // aapt resource value: 0x7F020000
- public const int arc_colors_default = 2130837504;
+ // aapt resource value: 0x7f0f0000
+ public const int arc_colors_default = 2131689472;
static Array()
{
@@ -279,1109 +307,1355 @@
public partial class Attribute
{
- // aapt resource value: 0x7F030000
- public const int actionBarDivider = 2130903040;
+ // aapt resource value: 0x7f010052
+ public const int actionBarDivider = 2130772050;
- // aapt resource value: 0x7F030001
- public const int actionBarItemBackground = 2130903041;
+ // aapt resource value: 0x7f010053
+ public const int actionBarItemBackground = 2130772051;
- // aapt resource value: 0x7F030002
- public const int actionBarPopupTheme = 2130903042;
+ // aapt resource value: 0x7f01004c
+ public const int actionBarPopupTheme = 2130772044;
- // aapt resource value: 0x7F030003
- public const int actionBarSize = 2130903043;
+ // aapt resource value: 0x7f010051
+ public const int actionBarSize = 2130772049;
- // aapt resource value: 0x7F030004
- public const int actionBarSplitStyle = 2130903044;
+ // aapt resource value: 0x7f01004e
+ public const int actionBarSplitStyle = 2130772046;
- // aapt resource value: 0x7F030005
- public const int actionBarStyle = 2130903045;
+ // aapt resource value: 0x7f01004d
+ public const int actionBarStyle = 2130772045;
- // aapt resource value: 0x7F030006
- public const int actionBarTabBarStyle = 2130903046;
+ // aapt resource value: 0x7f010048
+ public const int actionBarTabBarStyle = 2130772040;
- // aapt resource value: 0x7F030007
- public const int actionBarTabStyle = 2130903047;
+ // aapt resource value: 0x7f010047
+ public const int actionBarTabStyle = 2130772039;
- // aapt resource value: 0x7F030008
- public const int actionBarTabTextStyle = 2130903048;
+ // aapt resource value: 0x7f010049
+ public const int actionBarTabTextStyle = 2130772041;
- // aapt resource value: 0x7F030009
- public const int actionBarTheme = 2130903049;
+ // aapt resource value: 0x7f01004f
+ public const int actionBarTheme = 2130772047;
- // aapt resource value: 0x7F03000A
- public const int actionBarWidgetTheme = 2130903050;
+ // aapt resource value: 0x7f010050
+ public const int actionBarWidgetTheme = 2130772048;
- // aapt resource value: 0x7F03000B
- public const int actionButtonStyle = 2130903051;
+ // aapt resource value: 0x7f01006d
+ public const int actionButtonStyle = 2130772077;
- // aapt resource value: 0x7F03000C
- public const int actionDropDownStyle = 2130903052;
+ // aapt resource value: 0x7f010069
+ public const int actionDropDownStyle = 2130772073;
- // aapt resource value: 0x7F03000D
- public const int actionLayout = 2130903053;
+ // aapt resource value: 0x7f0100c4
+ public const int actionLayout = 2130772164;
- // aapt resource value: 0x7F03000E
- public const int actionMenuTextAppearance = 2130903054;
+ // aapt resource value: 0x7f010054
+ public const int actionMenuTextAppearance = 2130772052;
- // aapt resource value: 0x7F03000F
- public const int actionMenuTextColor = 2130903055;
+ // aapt resource value: 0x7f010055
+ public const int actionMenuTextColor = 2130772053;
- // aapt resource value: 0x7F030010
- public const int actionModeBackground = 2130903056;
+ // aapt resource value: 0x7f010058
+ public const int actionModeBackground = 2130772056;
- // aapt resource value: 0x7F030011
- public const int actionModeCloseButtonStyle = 2130903057;
+ // aapt resource value: 0x7f010057
+ public const int actionModeCloseButtonStyle = 2130772055;
- // aapt resource value: 0x7F030012
- public const int actionModeCloseDrawable = 2130903058;
+ // aapt resource value: 0x7f01005a
+ public const int actionModeCloseDrawable = 2130772058;
- // aapt resource value: 0x7F030013
- public const int actionModeCopyDrawable = 2130903059;
+ // aapt resource value: 0x7f01005c
+ public const int actionModeCopyDrawable = 2130772060;
- // aapt resource value: 0x7F030014
- public const int actionModeCutDrawable = 2130903060;
+ // aapt resource value: 0x7f01005b
+ public const int actionModeCutDrawable = 2130772059;
- // aapt resource value: 0x7F030015
- public const int actionModeFindDrawable = 2130903061;
+ // aapt resource value: 0x7f010060
+ public const int actionModeFindDrawable = 2130772064;
- // aapt resource value: 0x7F030016
- public const int actionModePasteDrawable = 2130903062;
+ // aapt resource value: 0x7f01005d
+ public const int actionModePasteDrawable = 2130772061;
- // aapt resource value: 0x7F030017
- public const int actionModePopupWindowStyle = 2130903063;
+ // aapt resource value: 0x7f010062
+ public const int actionModePopupWindowStyle = 2130772066;
- // aapt resource value: 0x7F030018
- public const int actionModeSelectAllDrawable = 2130903064;
+ // aapt resource value: 0x7f01005e
+ public const int actionModeSelectAllDrawable = 2130772062;
- // aapt resource value: 0x7F030019
- public const int actionModeShareDrawable = 2130903065;
+ // aapt resource value: 0x7f01005f
+ public const int actionModeShareDrawable = 2130772063;
- // aapt resource value: 0x7F03001A
- public const int actionModeSplitBackground = 2130903066;
+ // aapt resource value: 0x7f010059
+ public const int actionModeSplitBackground = 2130772057;
- // aapt resource value: 0x7F03001B
- public const int actionModeStyle = 2130903067;
+ // aapt resource value: 0x7f010056
+ public const int actionModeStyle = 2130772054;
- // aapt resource value: 0x7F03001C
- public const int actionModeWebSearchDrawable = 2130903068;
+ // aapt resource value: 0x7f010061
+ public const int actionModeWebSearchDrawable = 2130772065;
- // aapt resource value: 0x7F03001D
- public const int actionOverflowButtonStyle = 2130903069;
+ // aapt resource value: 0x7f01004a
+ public const int actionOverflowButtonStyle = 2130772042;
- // aapt resource value: 0x7F03001E
- public const int actionOverflowMenuStyle = 2130903070;
+ // aapt resource value: 0x7f01004b
+ public const int actionOverflowMenuStyle = 2130772043;
- // aapt resource value: 0x7F03001F
- public const int actionProviderClass = 2130903071;
+ // aapt resource value: 0x7f0100c6
+ public const int actionProviderClass = 2130772166;
- // aapt resource value: 0x7F030020
- public const int actionViewClass = 2130903072;
+ // aapt resource value: 0x7f0100c5
+ public const int actionViewClass = 2130772165;
- // aapt resource value: 0x7F030021
- public const int activityChooserViewStyle = 2130903073;
+ // aapt resource value: 0x7f010075
+ public const int activityChooserViewStyle = 2130772085;
- // aapt resource value: 0x7F030022
- public const int alertDialogButtonGroupStyle = 2130903074;
+ // aapt resource value: 0x7f01009a
+ public const int alertDialogButtonGroupStyle = 2130772122;
- // aapt resource value: 0x7F030023
- public const int alertDialogCenterButtons = 2130903075;
+ // aapt resource value: 0x7f01009b
+ public const int alertDialogCenterButtons = 2130772123;
- // aapt resource value: 0x7F030024
- public const int alertDialogStyle = 2130903076;
+ // aapt resource value: 0x7f010099
+ public const int alertDialogStyle = 2130772121;
- // aapt resource value: 0x7F030025
- public const int alertDialogTheme = 2130903077;
+ // aapt resource value: 0x7f01009c
+ public const int alertDialogTheme = 2130772124;
- // aapt resource value: 0x7F030026
- public const int allowStacking = 2130903078;
+ // aapt resource value: 0x7f0100b2
+ public const int allowStacking = 2130772146;
- // aapt resource value: 0x7F030027
- public const int alpha = 2130903079;
+ // aapt resource value: 0x7f0100b3
+ public const int alpha = 2130772147;
- // aapt resource value: 0x7F030028
- public const int alphabeticModifiers = 2130903080;
+ // aapt resource value: 0x7f0100c1
+ public const int alphabeticModifiers = 2130772161;
- // aapt resource value: 0x7F030029
- public const int arc_border_color = 2130903081;
+ // aapt resource value: 0x7f0101a3
+ public const int arc_border_color = 2130772387;
- // aapt resource value: 0x7F03002A
- public const int arc_border_width = 2130903082;
+ // aapt resource value: 0x7f0101a2
+ public const int arc_border_width = 2130772386;
- // aapt resource value: 0x7F03002B
- public const int arc_colors = 2130903083;
+ // aapt resource value: 0x7f0101a1
+ public const int arc_colors = 2130772385;
- // aapt resource value: 0x7F03002C
- public const int arc_max = 2130903084;
+ // aapt resource value: 0x7f0101a4
+ public const int arc_max = 2130772388;
- // aapt resource value: 0x7F03002D
- public const int arc_min = 2130903085;
+ // aapt resource value: 0x7f0101a5
+ public const int arc_min = 2130772389;
- // aapt resource value: 0x7F03002E
- public const int arc_open_angle = 2130903086;
+ // aapt resource value: 0x7f01019f
+ public const int arc_open_angle = 2130772383;
- // aapt resource value: 0x7F03002F
- public const int arc_progress = 2130903087;
+ // aapt resource value: 0x7f0101a6
+ public const int arc_progress = 2130772390;
- // aapt resource value: 0x7F030030
- public const int arc_progress_bar_color = 2130903088;
+ // aapt resource value: 0x7f0101ae
+ public const int arc_progress_bar_color = 2130772398;
- // aapt resource value: 0x7F030031
- public const int arc_progress_bar_text_unit = 2130903089;
+ // aapt resource value: 0x7f0101af
+ public const int arc_progress_bar_text_unit = 2130772399;
- // aapt resource value: 0x7F030032
- public const int arc_rotate_angle = 2130903090;
+ // aapt resource value: 0x7f0101a0
+ public const int arc_rotate_angle = 2130772384;
- // aapt resource value: 0x7F030033
- public const int arc_shadow_radius = 2130903091;
+ // aapt resource value: 0x7f0101ad
+ public const int arc_shadow_radius = 2130772397;
- // aapt resource value: 0x7F030034
- public const int arc_thumb_color = 2130903092;
+ // aapt resource value: 0x7f0101a8
+ public const int arc_thumb_color = 2130772392;
- // aapt resource value: 0x7F030035
- public const int arc_thumb_radius = 2130903093;
+ // aapt resource value: 0x7f0101a9
+ public const int arc_thumb_radius = 2130772393;
- // aapt resource value: 0x7F030036
- public const int arc_thumb_shadow_color = 2130903094;
+ // aapt resource value: 0x7f0101ab
+ public const int arc_thumb_shadow_color = 2130772395;
- // aapt resource value: 0x7F030037
- public const int arc_thumb_shadow_radius = 2130903095;
+ // aapt resource value: 0x7f0101aa
+ public const int arc_thumb_shadow_radius = 2130772394;
- // aapt resource value: 0x7F030038
- public const int arc_thumb_width = 2130903096;
+ // aapt resource value: 0x7f0101a7
+ public const int arc_thumb_width = 2130772391;
- // aapt resource value: 0x7F030039
- public const int arc_width = 2130903097;
+ // aapt resource value: 0x7f01019e
+ public const int arc_width = 2130772382;
- // aapt resource value: 0x7F03003A
- public const int arrowHeadLength = 2130903098;
+ // aapt resource value: 0x7f0100ba
+ public const int arrowHeadLength = 2130772154;
- // aapt resource value: 0x7F03003B
- public const int arrowShaftLength = 2130903099;
+ // aapt resource value: 0x7f0100bb
+ public const int arrowShaftLength = 2130772155;
- // aapt resource value: 0x7F03003C
- public const int autoCompleteTextViewStyle = 2130903100;
+ // aapt resource value: 0x7f0100a1
+ public const int autoCompleteTextViewStyle = 2130772129;
- // aapt resource value: 0x7F03003D
- public const int autoSizeMaxTextSize = 2130903101;
+ // aapt resource value: 0x7f01003b
+ public const int autoSizeMaxTextSize = 2130772027;
- // aapt resource value: 0x7F03003E
- public const int autoSizeMinTextSize = 2130903102;
+ // aapt resource value: 0x7f01003a
+ public const int autoSizeMinTextSize = 2130772026;
- // aapt resource value: 0x7F03003F
- public const int autoSizePresetSizes = 2130903103;
+ // aapt resource value: 0x7f010039
+ public const int autoSizePresetSizes = 2130772025;
- // aapt resource value: 0x7F030040
- public const int autoSizeStepGranularity = 2130903104;
+ // aapt resource value: 0x7f010038
+ public const int autoSizeStepGranularity = 2130772024;
- // aapt resource value: 0x7F030041
- public const int autoSizeTextType = 2130903105;
+ // aapt resource value: 0x7f010037
+ public const int autoSizeTextType = 2130772023;
- // aapt resource value: 0x7F030042
- public const int background = 2130903106;
+ // aapt resource value: 0x7f010015
+ public const int background = 2130771989;
- // aapt resource value: 0x7F030043
- public const int backgroundSplit = 2130903107;
+ // aapt resource value: 0x7f010017
+ public const int backgroundSplit = 2130771991;
- // aapt resource value: 0x7F030044
- public const int backgroundStacked = 2130903108;
+ // aapt resource value: 0x7f010016
+ public const int backgroundStacked = 2130771990;
- // aapt resource value: 0x7F030045
- public const int backgroundTint = 2130903109;
+ // aapt resource value: 0x7f0100fd
+ public const int backgroundTint = 2130772221;
- // aapt resource value: 0x7F030046
- public const int backgroundTintMode = 2130903110;
+ // aapt resource value: 0x7f0100fe
+ public const int backgroundTintMode = 2130772222;
- // aapt resource value: 0x7F030047
- public const int barLength = 2130903111;
+ // aapt resource value: 0x7f0100bc
+ public const int barLength = 2130772156;
- // aapt resource value: 0x7F030048
- public const int biometricPromptDialogTheme = 2130903112;
+ // aapt resource value: 0x7f010128
+ public const int behavior_autoHide = 2130772264;
- // aapt resource value: 0x7F030049
- public const int borderlessButtonStyle = 2130903113;
+ // aapt resource value: 0x7f010105
+ public const int behavior_hideable = 2130772229;
- // aapt resource value: 0x7F03004A
- public const int buttonBarButtonStyle = 2130903114;
+ // aapt resource value: 0x7f010131
+ public const int behavior_overlapTop = 2130772273;
- // aapt resource value: 0x7F03004B
- public const int buttonBarNegativeButtonStyle = 2130903115;
+ // aapt resource value: 0x7f010104
+ public const int behavior_peekHeight = 2130772228;
- // aapt resource value: 0x7F03004C
- public const int buttonBarNeutralButtonStyle = 2130903116;
+ // aapt resource value: 0x7f010106
+ public const int behavior_skipCollapsed = 2130772230;
- // aapt resource value: 0x7F03004D
- public const int buttonBarPositiveButtonStyle = 2130903117;
+ // aapt resource value: 0x7f01015a
+ public const int biometricPromptDialogTheme = 2130772314;
- // aapt resource value: 0x7F03004E
- public const int buttonBarStyle = 2130903118;
+ // aapt resource value: 0x7f010126
+ public const int borderWidth = 2130772262;
- // aapt resource value: 0x7F03004F
- public const int buttonGravity = 2130903119;
+ // aapt resource value: 0x7f010072
+ public const int borderlessButtonStyle = 2130772082;
- // aapt resource value: 0x7F030050
- public const int buttonPanelSideLayout = 2130903120;
+ // aapt resource value: 0x7f010120
+ public const int bottomSheetDialogTheme = 2130772256;
- // aapt resource value: 0x7F030051
- public const int buttonStyle = 2130903121;
+ // aapt resource value: 0x7f010121
+ public const int bottomSheetStyle = 2130772257;
- // aapt resource value: 0x7F030052
- public const int buttonStyleSmall = 2130903122;
+ // aapt resource value: 0x7f01006f
+ public const int buttonBarButtonStyle = 2130772079;
- // aapt resource value: 0x7F030053
- public const int buttonTint = 2130903123;
+ // aapt resource value: 0x7f01009f
+ public const int buttonBarNegativeButtonStyle = 2130772127;
- // aapt resource value: 0x7F030054
- public const int buttonTintMode = 2130903124;
+ // aapt resource value: 0x7f0100a0
+ public const int buttonBarNeutralButtonStyle = 2130772128;
- // aapt resource value: 0x7F030055
- public const int checkboxStyle = 2130903125;
+ // aapt resource value: 0x7f01009e
+ public const int buttonBarPositiveButtonStyle = 2130772126;
- // aapt resource value: 0x7F030056
- public const int checkedTextViewStyle = 2130903126;
+ // aapt resource value: 0x7f01006e
+ public const int buttonBarStyle = 2130772078;
- // aapt resource value: 0x7F030057
- public const int closeIcon = 2130903127;
+ // aapt resource value: 0x7f0100f2
+ public const int buttonGravity = 2130772210;
- // aapt resource value: 0x7F030058
- public const int closeItemLayout = 2130903128;
+ // aapt resource value: 0x7f01002a
+ public const int buttonPanelSideLayout = 2130772010;
- // aapt resource value: 0x7F030059
- public const int collapseContentDescription = 2130903129;
+ // aapt resource value: 0x7f0100a2
+ public const int buttonStyle = 2130772130;
- // aapt resource value: 0x7F03005A
- public const int collapseIcon = 2130903130;
+ // aapt resource value: 0x7f0100a3
+ public const int buttonStyleSmall = 2130772131;
- // aapt resource value: 0x7F03005B
- public const int color = 2130903131;
+ // aapt resource value: 0x7f0100b4
+ public const int buttonTint = 2130772148;
- // aapt resource value: 0x7F03005C
- public const int colorAccent = 2130903132;
+ // aapt resource value: 0x7f0100b5
+ public const int buttonTintMode = 2130772149;
- // aapt resource value: 0x7F03005D
- public const int colorBackgroundFloating = 2130903133;
+ // aapt resource value: 0x7f0100a4
+ public const int checkboxStyle = 2130772132;
- // aapt resource value: 0x7F03005E
- public const int colorButtonNormal = 2130903134;
+ // aapt resource value: 0x7f0100a5
+ public const int checkedTextViewStyle = 2130772133;
- // aapt resource value: 0x7F03005F
- public const int colorControlActivated = 2130903135;
+ // aapt resource value: 0x7f0100d5
+ public const int closeIcon = 2130772181;
- // aapt resource value: 0x7F030060
- public const int colorControlHighlight = 2130903136;
+ // aapt resource value: 0x7f010027
+ public const int closeItemLayout = 2130772007;
- // aapt resource value: 0x7F030061
- public const int colorControlNormal = 2130903137;
+ // aapt resource value: 0x7f0100f4
+ public const int collapseContentDescription = 2130772212;
- // aapt resource value: 0x7F030062
- public const int colorError = 2130903138;
+ // aapt resource value: 0x7f0100f3
+ public const int collapseIcon = 2130772211;
- // aapt resource value: 0x7F030063
- public const int colorPrimary = 2130903139;
+ // aapt resource value: 0x7f010113
+ public const int collapsedTitleGravity = 2130772243;
- // aapt resource value: 0x7F030064
- public const int colorPrimaryDark = 2130903140;
+ // aapt resource value: 0x7f01010d
+ public const int collapsedTitleTextAppearance = 2130772237;
- // aapt resource value: 0x7F030065
- public const int colorSwitchThumbNormal = 2130903141;
+ // aapt resource value: 0x7f0100b6
+ public const int color = 2130772150;
- // aapt resource value: 0x7F030066
- public const int commitIcon = 2130903142;
+ // aapt resource value: 0x7f010091
+ public const int colorAccent = 2130772113;
- // aapt resource value: 0x7F030067
- public const int contentDescription = 2130903143;
+ // aapt resource value: 0x7f010098
+ public const int colorBackgroundFloating = 2130772120;
- // aapt resource value: 0x7F030068
- public const int contentInsetEnd = 2130903144;
+ // aapt resource value: 0x7f010095
+ public const int colorButtonNormal = 2130772117;
- // aapt resource value: 0x7F030069
- public const int contentInsetEndWithActions = 2130903145;
+ // aapt resource value: 0x7f010093
+ public const int colorControlActivated = 2130772115;
- // aapt resource value: 0x7F03006A
- public const int contentInsetLeft = 2130903146;
+ // aapt resource value: 0x7f010094
+ public const int colorControlHighlight = 2130772116;
- // aapt resource value: 0x7F03006B
- public const int contentInsetRight = 2130903147;
+ // aapt resource value: 0x7f010092
+ public const int colorControlNormal = 2130772114;
- // aapt resource value: 0x7F03006C
- public const int contentInsetStart = 2130903148;
+ // aapt resource value: 0x7f0100b1
+ public const int colorError = 2130772145;
- // aapt resource value: 0x7F03006D
- public const int contentInsetStartWithNavigation = 2130903149;
+ // aapt resource value: 0x7f01008f
+ public const int colorPrimary = 2130772111;
- // aapt resource value: 0x7F03006E
- public const int controlBackground = 2130903150;
+ // aapt resource value: 0x7f010090
+ public const int colorPrimaryDark = 2130772112;
- // aapt resource value: 0x7F03006F
- public const int curtain_bar_bg_color = 2130903151;
+ // aapt resource value: 0x7f010096
+ public const int colorSwitchThumbNormal = 2130772118;
- // aapt resource value: 0x7F030070
- public const int curtain_bar_border_color = 2130903152;
+ // aapt resource value: 0x7f0100da
+ public const int commitIcon = 2130772186;
- // aapt resource value: 0x7F030071
- public const int curtain_bar_color = 2130903153;
+ // aapt resource value: 0x7f0100c7
+ public const int contentDescription = 2130772167;
- // aapt resource value: 0x7F030072
- public const int curtain_bar_height = 2130903154;
+ // aapt resource value: 0x7f010020
+ public const int contentInsetEnd = 2130772000;
- // aapt resource value: 0x7F030073
- public const int curtain_bar_width = 2130903155;
+ // aapt resource value: 0x7f010024
+ public const int contentInsetEndWithActions = 2130772004;
- // aapt resource value: 0x7F030074
- public const int customNavigationLayout = 2130903156;
+ // aapt resource value: 0x7f010021
+ public const int contentInsetLeft = 2130772001;
- // aapt resource value: 0x7F030075
- public const int defaultQueryHint = 2130903157;
+ // aapt resource value: 0x7f010022
+ public const int contentInsetRight = 2130772002;
- // aapt resource value: 0x7F030076
- public const int dialogPreferredPadding = 2130903158;
+ // aapt resource value: 0x7f01001f
+ public const int contentInsetStart = 2130771999;
- // aapt resource value: 0x7F030077
- public const int dialogTheme = 2130903159;
+ // aapt resource value: 0x7f010023
+ public const int contentInsetStartWithNavigation = 2130772003;
- // aapt resource value: 0x7F030078
- public const int displayOptions = 2130903160;
+ // aapt resource value: 0x7f01010e
+ public const int contentScrim = 2130772238;
- // aapt resource value: 0x7F030079
- public const int divider = 2130903161;
+ // aapt resource value: 0x7f010097
+ public const int controlBackground = 2130772119;
- // aapt resource value: 0x7F03007A
- public const int dividerHorizontal = 2130903162;
+ // aapt resource value: 0x7f010147
+ public const int counterEnabled = 2130772295;
- // aapt resource value: 0x7F03007B
- public const int dividerPadding = 2130903163;
+ // aapt resource value: 0x7f010148
+ public const int counterMaxLength = 2130772296;
- // aapt resource value: 0x7F03007C
- public const int dividerVertical = 2130903164;
+ // aapt resource value: 0x7f01014a
+ public const int counterOverflowTextAppearance = 2130772298;
- // aapt resource value: 0x7F03007D
- public const int drawableSize = 2130903165;
+ // aapt resource value: 0x7f010149
+ public const int counterTextAppearance = 2130772297;
- // aapt resource value: 0x7F03007E
- public const int drawerArrowStyle = 2130903166;
+ // aapt resource value: 0x7f0101b2
+ public const int curtain_bar_bg_color = 2130772402;
- // aapt resource value: 0x7F030080
- public const int dropdownListPreferredItemHeight = 2130903168;
+ // aapt resource value: 0x7f0101b3
+ public const int curtain_bar_border_color = 2130772403;
- // aapt resource value: 0x7F03007F
- public const int dropDownListViewStyle = 2130903167;
+ // aapt resource value: 0x7f0101b0
+ public const int curtain_bar_color = 2130772400;
- // aapt resource value: 0x7F030081
- public const int editTextBackground = 2130903169;
+ // aapt resource value: 0x7f0101b5
+ public const int curtain_bar_height = 2130772405;
- // aapt resource value: 0x7F030082
- public const int editTextColor = 2130903170;
+ // aapt resource value: 0x7f0101b4
+ public const int curtain_bar_width = 2130772404;
- // aapt resource value: 0x7F030083
- public const int editTextStyle = 2130903171;
+ // aapt resource value: 0x7f010018
+ public const int customNavigationLayout = 2130771992;
- // aapt resource value: 0x7F030084
- public const int elevation = 2130903172;
+ // aapt resource value: 0x7f0100d4
+ public const int defaultQueryHint = 2130772180;
- // aapt resource value: 0x7F030085
- public const int expandActivityOverflowButtonDrawable = 2130903173;
+ // aapt resource value: 0x7f010067
+ public const int dialogPreferredPadding = 2130772071;
- // aapt resource value: 0x7F030086
- public const int fastScrollEnabled = 2130903174;
+ // aapt resource value: 0x7f010066
+ public const int dialogTheme = 2130772070;
- // aapt resource value: 0x7F030087
- public const int fastScrollHorizontalThumbDrawable = 2130903175;
+ // aapt resource value: 0x7f01000e
+ public const int displayOptions = 2130771982;
- // aapt resource value: 0x7F030088
- public const int fastScrollHorizontalTrackDrawable = 2130903176;
+ // aapt resource value: 0x7f010014
+ public const int divider = 2130771988;
- // aapt resource value: 0x7F030089
- public const int fastScrollVerticalThumbDrawable = 2130903177;
+ // aapt resource value: 0x7f010074
+ public const int dividerHorizontal = 2130772084;
- // aapt resource value: 0x7F03008A
- public const int fastScrollVerticalTrackDrawable = 2130903178;
+ // aapt resource value: 0x7f0100c0
+ public const int dividerPadding = 2130772160;
- // aapt resource value: 0x7F03008B
- public const int font = 2130903179;
+ // aapt resource value: 0x7f010073
+ public const int dividerVertical = 2130772083;
- // aapt resource value: 0x7F03008C
- public const int fontFamily = 2130903180;
+ // aapt resource value: 0x7f0100b8
+ public const int drawableSize = 2130772152;
- // aapt resource value: 0x7F03008D
- public const int fontProviderAuthority = 2130903181;
+ // aapt resource value: 0x7f010009
+ public const int drawerArrowStyle = 2130771977;
- // aapt resource value: 0x7F03008E
- public const int fontProviderCerts = 2130903182;
+ // aapt resource value: 0x7f010086
+ public const int dropDownListViewStyle = 2130772102;
- // aapt resource value: 0x7F03008F
- public const int fontProviderFetchStrategy = 2130903183;
+ // aapt resource value: 0x7f01006a
+ public const int dropdownListPreferredItemHeight = 2130772074;
- // aapt resource value: 0x7F030090
- public const int fontProviderFetchTimeout = 2130903184;
+ // aapt resource value: 0x7f01007b
+ public const int editTextBackground = 2130772091;
- // aapt resource value: 0x7F030091
- public const int fontProviderPackage = 2130903185;
+ // aapt resource value: 0x7f01007a
+ public const int editTextColor = 2130772090;
- // aapt resource value: 0x7F030092
- public const int fontProviderQuery = 2130903186;
+ // aapt resource value: 0x7f0100a6
+ public const int editTextStyle = 2130772134;
- // aapt resource value: 0x7F030093
- public const int fontStyle = 2130903187;
+ // aapt resource value: 0x7f010025
+ public const int elevation = 2130772005;
- // aapt resource value: 0x7F030094
- public const int fontWeight = 2130903188;
+ // aapt resource value: 0x7f010145
+ public const int errorEnabled = 2130772293;
- // aapt resource value: 0x7F030095
- public const int gapBetweenBars = 2130903189;
+ // aapt resource value: 0x7f010146
+ public const int errorTextAppearance = 2130772294;
- // aapt resource value: 0x7F030096
- public const int goIcon = 2130903190;
+ // aapt resource value: 0x7f010029
+ public const int expandActivityOverflowButtonDrawable = 2130772009;
- // aapt resource value: 0x7F030097
- public const int hdl_arc_thumb_mode = 2130903191;
+ // aapt resource value: 0x7f0100ff
+ public const int expanded = 2130772223;
- // aapt resource value: 0x7F030098
- public const int height = 2130903192;
+ // aapt resource value: 0x7f010114
+ public const int expandedTitleGravity = 2130772244;
- // aapt resource value: 0x7F030099
- public const int hideOnContentScroll = 2130903193;
+ // aapt resource value: 0x7f010107
+ public const int expandedTitleMargin = 2130772231;
+
+ // aapt resource value: 0x7f01010b
+ public const int expandedTitleMarginBottom = 2130772235;
+
+ // aapt resource value: 0x7f01010a
+ public const int expandedTitleMarginEnd = 2130772234;
+
+ // aapt resource value: 0x7f010108
+ public const int expandedTitleMarginStart = 2130772232;
+
+ // aapt resource value: 0x7f010109
+ public const int expandedTitleMarginTop = 2130772233;
+
+ // aapt resource value: 0x7f01010c
+ public const int expandedTitleTextAppearance = 2130772236;
+
+ // aapt resource value: 0x7f010124
+ public const int fabSize = 2130772260;
+
+ // aapt resource value: 0x7f010004
+ public const int fastScrollEnabled = 2130771972;
+
+ // aapt resource value: 0x7f010007
+ public const int fastScrollHorizontalThumbDrawable = 2130771975;
+
+ // aapt resource value: 0x7f010008
+ public const int fastScrollHorizontalTrackDrawable = 2130771976;
+
+ // aapt resource value: 0x7f010005
+ public const int fastScrollVerticalThumbDrawable = 2130771973;
+
+ // aapt resource value: 0x7f010006
+ public const int fastScrollVerticalTrackDrawable = 2130771974;
+
+ // aapt resource value: 0x7f010158
+ public const int font = 2130772312;
+
+ // aapt resource value: 0x7f01003c
+ public const int fontFamily = 2130772028;
+
+ // aapt resource value: 0x7f010151
+ public const int fontProviderAuthority = 2130772305;
+
+ // aapt resource value: 0x7f010154
+ public const int fontProviderCerts = 2130772308;
+
+ // aapt resource value: 0x7f010155
+ public const int fontProviderFetchStrategy = 2130772309;
+
+ // aapt resource value: 0x7f010156
+ public const int fontProviderFetchTimeout = 2130772310;
+
+ // aapt resource value: 0x7f010152
+ public const int fontProviderPackage = 2130772306;
+
+ // aapt resource value: 0x7f010153
+ public const int fontProviderQuery = 2130772307;
+
+ // aapt resource value: 0x7f010157
+ public const int fontStyle = 2130772311;
+
+ // aapt resource value: 0x7f010159
+ public const int fontWeight = 2130772313;
+
+ // aapt resource value: 0x7f010129
+ public const int foregroundInsidePadding = 2130772265;
+
+ // aapt resource value: 0x7f0100b9
+ public const int gapBetweenBars = 2130772153;
+
+ // aapt resource value: 0x7f0100d6
+ public const int goIcon = 2130772182;
+
+ // aapt resource value: 0x7f0101ac
+ public const int hdl_arc_thumb_mode = 2130772396;
+
+ // aapt resource value: 0x7f01012f
+ public const int headerLayout = 2130772271;
+
+ // aapt resource value: 0x7f01000a
+ public const int height = 2130771978;
+
+ // aapt resource value: 0x7f01001e
+ public const int hideOnContentScroll = 2130771998;
+
+ // aapt resource value: 0x7f01014b
+ public const int hintAnimationEnabled = 2130772299;
+
+ // aapt resource value: 0x7f010144
+ public const int hintEnabled = 2130772292;
+
+ // aapt resource value: 0x7f010143
+ public const int hintTextAppearance = 2130772291;
+
+ // aapt resource value: 0x7f01006c
+ public const int homeAsUpIndicator = 2130772076;
+
+ // aapt resource value: 0x7f010019
+ public const int homeLayout = 2130771993;
+
+ // aapt resource value: 0x7f010012
+ public const int icon = 2130771986;
+
+ // aapt resource value: 0x7f0100c9
+ public const int iconTint = 2130772169;
+
+ // aapt resource value: 0x7f0100ca
+ public const int iconTintMode = 2130772170;
+
+ // aapt resource value: 0x7f0100d2
+ public const int iconifiedByDefault = 2130772178;
+
+ // aapt resource value: 0x7f01007c
+ public const int imageButtonStyle = 2130772092;
+
+ // aapt resource value: 0x7f01001b
+ public const int indeterminateProgressStyle = 2130771995;
+
+ // aapt resource value: 0x7f010028
+ public const int initialActivityCount = 2130772008;
+
+ // aapt resource value: 0x7f010130
+ public const int insetForeground = 2130772272;
+
+ // aapt resource value: 0x7f01000b
+ public const int isLightTheme = 2130771979;
+
+ // aapt resource value: 0x7f01012d
+ public const int itemBackground = 2130772269;
+
+ // aapt resource value: 0x7f01012b
+ public const int itemIconTint = 2130772267;
+
+ // aapt resource value: 0x7f01001d
+ public const int itemPadding = 2130771997;
+
+ // aapt resource value: 0x7f01012e
+ public const int itemTextAppearance = 2130772270;
+
+ // aapt resource value: 0x7f01012c
+ public const int itemTextColor = 2130772268;
+
+ // aapt resource value: 0x7f010118
+ public const int keylines = 2130772248;
+
+ // aapt resource value: 0x7f0100d1
+ public const int layout = 2130772177;
+
+ // aapt resource value: 0x7f010000
+ public const int layoutManager = 2130771968;
+
+ // aapt resource value: 0x7f01011b
+ public const int layout_anchor = 2130772251;
+
+ // aapt resource value: 0x7f01011d
+ public const int layout_anchorGravity = 2130772253;
+
+ // aapt resource value: 0x7f01011a
+ public const int layout_behavior = 2130772250;
+
+ // aapt resource value: 0x7f010116
+ public const int layout_collapseMode = 2130772246;
+
+ // aapt resource value: 0x7f010117
+ public const int layout_collapseParallaxMultiplier = 2130772247;
+
+ // aapt resource value: 0x7f01011f
+ public const int layout_dodgeInsetEdges = 2130772255;
+
+ // aapt resource value: 0x7f01011e
+ public const int layout_insetEdge = 2130772254;
+
+ // aapt resource value: 0x7f01011c
+ public const int layout_keyline = 2130772252;
+
+ // aapt resource value: 0x7f010102
+ public const int layout_scrollFlags = 2130772226;
+
+ // aapt resource value: 0x7f010103
+ public const int layout_scrollInterpolator = 2130772227;
+
+ // aapt resource value: 0x7f010197
+ public const int layout_srlBackgroundColor = 2130772375;
+
+ // aapt resource value: 0x7f01015b
+ public const int layout_srlSpinnerStyle = 2130772315;
+
+ // aapt resource value: 0x7f01008e
+ public const int listChoiceBackgroundIndicator = 2130772110;
+
+ // aapt resource value: 0x7f010068
+ public const int listDividerAlertDialog = 2130772072;
+
+ // aapt resource value: 0x7f01002e
+ public const int listItemLayout = 2130772014;
+
+ // aapt resource value: 0x7f01002b
+ public const int listLayout = 2130772011;
+
+ // aapt resource value: 0x7f0100ae
+ public const int listMenuViewStyle = 2130772142;
+
+ // aapt resource value: 0x7f010087
+ public const int listPopupWindowStyle = 2130772103;
+
+ // aapt resource value: 0x7f010081
+ public const int listPreferredItemHeight = 2130772097;
+
+ // aapt resource value: 0x7f010083
+ public const int listPreferredItemHeightLarge = 2130772099;
+
+ // aapt resource value: 0x7f010082
+ public const int listPreferredItemHeightSmall = 2130772098;
+
+ // aapt resource value: 0x7f010084
+ public const int listPreferredItemPaddingLeft = 2130772100;
+
+ // aapt resource value: 0x7f010085
+ public const int listPreferredItemPaddingRight = 2130772101;
+
+ // aapt resource value: 0x7f010013
+ public const int logo = 2130771987;
+
+ // aapt resource value: 0x7f0100f7
+ public const int logoDescription = 2130772215;
+
+ // aapt resource value: 0x7f010132
+ public const int maxActionInlineWidth = 2130772274;
+
+ // aapt resource value: 0x7f0100f1
+ public const int maxButtonHeight = 2130772209;
+
+ // aapt resource value: 0x7f0100be
+ public const int measureWithLargestChild = 2130772158;
+
+ // aapt resource value: 0x7f01012a
+ public const int menu = 2130772266;
+
+ // aapt resource value: 0x7f01002c
+ public const int multiChoiceItemLayout = 2130772012;
+
+ // aapt resource value: 0x7f0100f6
+ public const int navigationContentDescription = 2130772214;
+
+ // aapt resource value: 0x7f0100f5
+ public const int navigationIcon = 2130772213;
- // aapt resource value: 0x7F03009A
- public const int homeAsUpIndicator = 2130903194;
+ // aapt resource value: 0x7f01000d
+ public const int navigationMode = 2130771981;
- // aapt resource value: 0x7F03009B
- public const int homeLayout = 2130903195;
+ // aapt resource value: 0x7f0100c2
+ public const int numericModifiers = 2130772162;
- // aapt resource value: 0x7F03009C
- public const int icon = 2130903196;
+ // aapt resource value: 0x7f0100cd
+ public const int overlapAnchor = 2130772173;
- // aapt resource value: 0x7F03009F
- public const int iconifiedByDefault = 2130903199;
+ // aapt resource value: 0x7f0100cf
+ public const int paddingBottomNoButtons = 2130772175;
- // aapt resource value: 0x7F03009D
- public const int iconTint = 2130903197;
+ // aapt resource value: 0x7f0100fb
+ public const int paddingEnd = 2130772219;
- // aapt resource value: 0x7F03009E
- public const int iconTintMode = 2130903198;
+ // aapt resource value: 0x7f0100fa
+ public const int paddingStart = 2130772218;
- // aapt resource value: 0x7F0300A0
- public const int imageButtonStyle = 2130903200;
+ // aapt resource value: 0x7f0100d0
+ public const int paddingTopNoTitle = 2130772176;
- // aapt resource value: 0x7F0300A1
- public const int indeterminateProgressStyle = 2130903201;
+ // aapt resource value: 0x7f01008b
+ public const int panelBackground = 2130772107;
- // aapt resource value: 0x7F0300A2
- public const int initialActivityCount = 2130903202;
+ // aapt resource value: 0x7f01008d
+ public const int panelMenuListTheme = 2130772109;
- // aapt resource value: 0x7F0300A3
- public const int isLightTheme = 2130903203;
+ // aapt resource value: 0x7f01008c
+ public const int panelMenuListWidth = 2130772108;
- // aapt resource value: 0x7F0300A4
- public const int itemPadding = 2130903204;
+ // aapt resource value: 0x7f01014e
+ public const int passwordToggleContentDescription = 2130772302;
- // aapt resource value: 0x7F0300A5
- public const int layout = 2130903205;
+ // aapt resource value: 0x7f01014d
+ public const int passwordToggleDrawable = 2130772301;
- // aapt resource value: 0x7F0300A6
- public const int layoutManager = 2130903206;
+ // aapt resource value: 0x7f01014c
+ public const int passwordToggleEnabled = 2130772300;
- // aapt resource value: 0x7F0300A7
- public const int layout_srlBackgroundColor = 2130903207;
+ // aapt resource value: 0x7f01014f
+ public const int passwordToggleTint = 2130772303;
- // aapt resource value: 0x7F0300A8
- public const int layout_srlSpinnerStyle = 2130903208;
+ // aapt resource value: 0x7f010150
+ public const int passwordToggleTintMode = 2130772304;
- // aapt resource value: 0x7F0300A9
- public const int listChoiceBackgroundIndicator = 2130903209;
+ // aapt resource value: 0x7f010078
+ public const int popupMenuStyle = 2130772088;
- // aapt resource value: 0x7F0300AA
- public const int listDividerAlertDialog = 2130903210;
+ // aapt resource value: 0x7f010026
+ public const int popupTheme = 2130772006;
- // aapt resource value: 0x7F0300AB
- public const int listItemLayout = 2130903211;
+ // aapt resource value: 0x7f010079
+ public const int popupWindowStyle = 2130772089;
- // aapt resource value: 0x7F0300AC
- public const int listLayout = 2130903212;
+ // aapt resource value: 0x7f0100cb
+ public const int preserveIconSpacing = 2130772171;
- // aapt resource value: 0x7F0300AD
- public const int listMenuViewStyle = 2130903213;
+ // aapt resource value: 0x7f010125
+ public const int pressedTranslationZ = 2130772261;
- // aapt resource value: 0x7F0300AE
- public const int listPopupWindowStyle = 2130903214;
+ // aapt resource value: 0x7f01001c
+ public const int progressBarPadding = 2130771996;
- // aapt resource value: 0x7F0300AF
- public const int listPreferredItemHeight = 2130903215;
+ // aapt resource value: 0x7f01001a
+ public const int progressBarStyle = 2130771994;
- // aapt resource value: 0x7F0300B0
- public const int listPreferredItemHeightLarge = 2130903216;
+ // aapt resource value: 0x7f0100dc
+ public const int queryBackground = 2130772188;
- // aapt resource value: 0x7F0300B1
- public const int listPreferredItemHeightSmall = 2130903217;
+ // aapt resource value: 0x7f0100d3
+ public const int queryHint = 2130772179;
- // aapt resource value: 0x7F0300B2
- public const int listPreferredItemPaddingLeft = 2130903218;
+ // aapt resource value: 0x7f0100a7
+ public const int radioButtonStyle = 2130772135;
- // aapt resource value: 0x7F0300B3
- public const int listPreferredItemPaddingRight = 2130903219;
+ // aapt resource value: 0x7f0100a8
+ public const int ratingBarStyle = 2130772136;
- // aapt resource value: 0x7F0300B4
- public const int logo = 2130903220;
+ // aapt resource value: 0x7f0100a9
+ public const int ratingBarStyleIndicator = 2130772137;
- // aapt resource value: 0x7F0300B5
- public const int logoDescription = 2130903221;
+ // aapt resource value: 0x7f0100aa
+ public const int ratingBarStyleSmall = 2130772138;
- // aapt resource value: 0x7F0300B6
- public const int maxButtonHeight = 2130903222;
+ // aapt resource value: 0x7f010002
+ public const int reverseLayout = 2130771970;
- // aapt resource value: 0x7F0300B7
- public const int measureWithLargestChild = 2130903223;
+ // aapt resource value: 0x7f010123
+ public const int rippleColor = 2130772259;
- // aapt resource value: 0x7F0300B8
- public const int multiChoiceItemLayout = 2130903224;
+ // aapt resource value: 0x7f010112
+ public const int scrimAnimationDuration = 2130772242;
- // aapt resource value: 0x7F0300B9
- public const int navigationContentDescription = 2130903225;
+ // aapt resource value: 0x7f010111
+ public const int scrimVisibleHeightTrigger = 2130772241;
- // aapt resource value: 0x7F0300BA
- public const int navigationIcon = 2130903226;
+ // aapt resource value: 0x7f0100d8
+ public const int searchHintIcon = 2130772184;
- // aapt resource value: 0x7F0300BB
- public const int navigationMode = 2130903227;
+ // aapt resource value: 0x7f0100d7
+ public const int searchIcon = 2130772183;
- // aapt resource value: 0x7F0300BC
- public const int numericModifiers = 2130903228;
+ // aapt resource value: 0x7f010080
+ public const int searchViewStyle = 2130772096;
- // aapt resource value: 0x7F0300BD
- public const int overlapAnchor = 2130903229;
+ // aapt resource value: 0x7f0101b1
+ public const int second_curtain_bar_color = 2130772401;
- // aapt resource value: 0x7F0300BE
- public const int paddingBottomNoButtons = 2130903230;
+ // aapt resource value: 0x7f0101b7
+ public const int second_wave_color = 2130772407;
- // aapt resource value: 0x7F0300BF
- public const int paddingEnd = 2130903231;
+ // aapt resource value: 0x7f0100ab
+ public const int seekBarStyle = 2130772139;
- // aapt resource value: 0x7F0300C0
- public const int paddingStart = 2130903232;
+ // aapt resource value: 0x7f010070
+ public const int selectableItemBackground = 2130772080;
- // aapt resource value: 0x7F0300C1
- public const int paddingTopNoTitle = 2130903233;
+ // aapt resource value: 0x7f010071
+ public const int selectableItemBackgroundBorderless = 2130772081;
- // aapt resource value: 0x7F0300C2
- public const int panelBackground = 2130903234;
+ // aapt resource value: 0x7f0100c3
+ public const int showAsAction = 2130772163;
- // aapt resource value: 0x7F0300C3
- public const int panelMenuListTheme = 2130903235;
+ // aapt resource value: 0x7f0100bf
+ public const int showDividers = 2130772159;
- // aapt resource value: 0x7F0300C4
- public const int panelMenuListWidth = 2130903236;
+ // aapt resource value: 0x7f0100e8
+ public const int showText = 2130772200;
- // aapt resource value: 0x7F0300C5
- public const int popupMenuStyle = 2130903237;
+ // aapt resource value: 0x7f01002f
+ public const int showTitle = 2130772015;
- // aapt resource value: 0x7F0300C6
- public const int popupTheme = 2130903238;
+ // aapt resource value: 0x7f01002d
+ public const int singleChoiceItemLayout = 2130772013;
- // aapt resource value: 0x7F0300C7
- public const int popupWindowStyle = 2130903239;
+ // aapt resource value: 0x7f010001
+ public const int spanCount = 2130771969;
- // aapt resource value: 0x7F0300C8
- public const int preserveIconSpacing = 2130903240;
+ // aapt resource value: 0x7f0100b7
+ public const int spinBars = 2130772151;
- // aapt resource value: 0x7F0300C9
- public const int progressBarPadding = 2130903241;
+ // aapt resource value: 0x7f01006b
+ public const int spinnerDropDownItemStyle = 2130772075;
- // aapt resource value: 0x7F0300CA
- public const int progressBarStyle = 2130903242;
+ // aapt resource value: 0x7f0100ac
+ public const int spinnerStyle = 2130772140;
- // aapt resource value: 0x7F0300CB
- public const int queryBackground = 2130903243;
+ // aapt resource value: 0x7f0100e7
+ public const int splitTrack = 2130772199;
- // aapt resource value: 0x7F0300CC
- public const int queryHint = 2130903244;
+ // aapt resource value: 0x7f010030
+ public const int srcCompat = 2130772016;
- // aapt resource value: 0x7F0300CD
- public const int radioButtonStyle = 2130903245;
+ // aapt resource value: 0x7f01015c
+ public const int srlAccentColor = 2130772316;
- // aapt resource value: 0x7F0300CE
- public const int ratingBarStyle = 2130903246;
+ // aapt resource value: 0x7f010172
+ public const int srlAnimatingColor = 2130772338;
- // aapt resource value: 0x7F0300CF
- public const int ratingBarStyleIndicator = 2130903247;
+ // aapt resource value: 0x7f01015d
+ public const int srlClassicsSpinnerStyle = 2130772317;
- // aapt resource value: 0x7F0300D0
- public const int ratingBarStyleSmall = 2130903248;
+ // aapt resource value: 0x7f010194
+ public const int srlDisableContentWhenLoading = 2130772372;
- // aapt resource value: 0x7F0300D1
- public const int reverseLayout = 2130903249;
+ // aapt resource value: 0x7f010193
+ public const int srlDisableContentWhenRefresh = 2130772371;
- // aapt resource value: 0x7F0300D2
- public const int searchHintIcon = 2130903250;
+ // aapt resource value: 0x7f01017b
+ public const int srlDragRate = 2130772347;
- // aapt resource value: 0x7F0300D3
- public const int searchIcon = 2130903251;
+ // aapt resource value: 0x7f01015e
+ public const int srlDrawableArrow = 2130772318;
- // aapt resource value: 0x7F0300D4
- public const int searchViewStyle = 2130903252;
+ // aapt resource value: 0x7f01015f
+ public const int srlDrawableArrowSize = 2130772319;
- // aapt resource value: 0x7F0300D5
- public const int second_curtain_bar_color = 2130903253;
+ // aapt resource value: 0x7f010160
+ public const int srlDrawableMarginRight = 2130772320;
- // aapt resource value: 0x7F0300D6
- public const int second_wave_color = 2130903254;
+ // aapt resource value: 0x7f010161
+ public const int srlDrawableProgress = 2130772321;
- // aapt resource value: 0x7F0300D7
- public const int seekBarStyle = 2130903255;
+ // aapt resource value: 0x7f010162
+ public const int srlDrawableProgressSize = 2130772322;
- // aapt resource value: 0x7F0300D8
- public const int selectableItemBackground = 2130903256;
+ // aapt resource value: 0x7f010163
+ public const int srlDrawableSize = 2130772323;
- // aapt resource value: 0x7F0300D9
- public const int selectableItemBackgroundBorderless = 2130903257;
+ // aapt resource value: 0x7f010187
+ public const int srlEnableAutoLoadMore = 2130772359;
- // aapt resource value: 0x7F0300DA
- public const int showAsAction = 2130903258;
+ // aapt resource value: 0x7f010191
+ public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
- // aapt resource value: 0x7F0300DB
- public const int showDividers = 2130903259;
+ // aapt resource value: 0x7f010190
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
- // aapt resource value: 0x7F0300DC
- public const int showText = 2130903260;
+ // aapt resource value: 0x7f01018e
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
- // aapt resource value: 0x7F0300DD
- public const int showTitle = 2130903261;
+ // aapt resource value: 0x7f01018f
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
- // aapt resource value: 0x7F0300DE
- public const int singleChoiceItemLayout = 2130903262;
+ // aapt resource value: 0x7f010183
+ public const int srlEnableFooterTranslationContent = 2130772355;
- // aapt resource value: 0x7F0300DF
- public const int spanCount = 2130903263;
+ // aapt resource value: 0x7f010182
+ public const int srlEnableHeaderTranslationContent = 2130772354;
- // aapt resource value: 0x7F0300E0
- public const int spinBars = 2130903264;
+ // aapt resource value: 0x7f010164
+ public const int srlEnableHorizontalDrag = 2130772324;
- // aapt resource value: 0x7F0300E1
- public const int spinnerDropDownItemStyle = 2130903265;
+ // aapt resource value: 0x7f010175
+ public const int srlEnableLastTime = 2130772341;
- // aapt resource value: 0x7F0300E2
- public const int spinnerStyle = 2130903266;
+ // aapt resource value: 0x7f010181
+ public const int srlEnableLoadMore = 2130772353;
- // aapt resource value: 0x7F0300E3
- public const int splitTrack = 2130903267;
+ // aapt resource value: 0x7f01018d
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
- // aapt resource value: 0x7F0300E4
- public const int srcCompat = 2130903268;
+ // aapt resource value: 0x7f01018a
+ public const int srlEnableNestedScrolling = 2130772362;
- // aapt resource value: 0x7F0300E5
- public const int srlAccentColor = 2130903269;
+ // aapt resource value: 0x7f010188
+ public const int srlEnableOverScrollBounce = 2130772360;
- // aapt resource value: 0x7F0300E6
- public const int srlAnimatingColor = 2130903270;
+ // aapt resource value: 0x7f010192
+ public const int srlEnableOverScrollDrag = 2130772370;
- // aapt resource value: 0x7F0300E7
- public const int srlClassicsSpinnerStyle = 2130903271;
+ // aapt resource value: 0x7f010186
+ public const int srlEnablePreviewInEditMode = 2130772358;
- // aapt resource value: 0x7F0300E8
- public const int srlDisableContentWhenLoading = 2130903272;
+ // aapt resource value: 0x7f01019d
+ public const int srlEnablePullToCloseTwoLevel = 2130772381;
- // aapt resource value: 0x7F0300E9
- public const int srlDisableContentWhenRefresh = 2130903273;
+ // aapt resource value: 0x7f010189
+ public const int srlEnablePureScrollMode = 2130772361;
- // aapt resource value: 0x7F0300EA
- public const int srlDragRate = 2130903274;
+ // aapt resource value: 0x7f010180
+ public const int srlEnableRefresh = 2130772352;
- // aapt resource value: 0x7F0300EB
- public const int srlDrawableArrow = 2130903275;
+ // aapt resource value: 0x7f01018b
+ public const int srlEnableScrollContentWhenLoaded = 2130772363;
- // aapt resource value: 0x7F0300EC
- public const int srlDrawableArrowSize = 2130903276;
+ // aapt resource value: 0x7f01018c
+ public const int srlEnableScrollContentWhenRefreshed = 2130772364;
- // aapt resource value: 0x7F0300ED
- public const int srlDrawableMarginRight = 2130903277;
+ // aapt resource value: 0x7f01019c
+ public const int srlEnableTwoLevel = 2130772380;
- // aapt resource value: 0x7F0300EE
- public const int srlDrawableProgress = 2130903278;
+ // aapt resource value: 0x7f010165
+ public const int srlFinishDuration = 2130772325;
- // aapt resource value: 0x7F0300EF
- public const int srlDrawableProgressSize = 2130903279;
+ // aapt resource value: 0x7f010196
+ public const int srlFixedFooterViewId = 2130772374;
- // aapt resource value: 0x7F0300F0
- public const int srlDrawableSize = 2130903280;
+ // aapt resource value: 0x7f010195
+ public const int srlFixedHeaderViewId = 2130772373;
- // aapt resource value: 0x7F0300F1
- public const int srlEnableAutoLoadMore = 2130903281;
+ // aapt resource value: 0x7f01019b
+ public const int srlFloorDuration = 2130772379;
- // aapt resource value: 0x7F0300F2
- public const int srlEnableClipFooterWhenFixedBehind = 2130903282;
+ // aapt resource value: 0x7f010199
+ public const int srlFloorRage = 2130772377;
- // aapt resource value: 0x7F0300F3
- public const int srlEnableClipHeaderWhenFixedBehind = 2130903283;
+ // aapt resource value: 0x7f010178
+ public const int srlFooterHeight = 2130772344;
- // aapt resource value: 0x7F0300F4
- public const int srlEnableFooterFollowWhenLoadFinished = 2130903284;
+ // aapt resource value: 0x7f01017a
+ public const int srlFooterInsetStart = 2130772346;
- // aapt resource value: 0x7F0300F5
- public const int srlEnableFooterFollowWhenNoMoreData = 2130903285;
+ // aapt resource value: 0x7f01017d
+ public const int srlFooterMaxDragRate = 2130772349;
- // aapt resource value: 0x7F0300F6
- public const int srlEnableFooterTranslationContent = 2130903286;
+ // aapt resource value: 0x7f010185
+ public const int srlFooterTranslationViewId = 2130772357;
- // aapt resource value: 0x7F0300F7
- public const int srlEnableHeaderTranslationContent = 2130903287;
+ // aapt resource value: 0x7f01017f
+ public const int srlFooterTriggerRate = 2130772351;
- // aapt resource value: 0x7F0300F8
- public const int srlEnableHorizontalDrag = 2130903288;
+ // aapt resource value: 0x7f010177
+ public const int srlHeaderHeight = 2130772343;
- // aapt resource value: 0x7F0300F9
- public const int srlEnableLastTime = 2130903289;
+ // aapt resource value: 0x7f010179
+ public const int srlHeaderInsetStart = 2130772345;
- // aapt resource value: 0x7F0300FA
- public const int srlEnableLoadMore = 2130903290;
+ // aapt resource value: 0x7f01017c
+ public const int srlHeaderMaxDragRate = 2130772348;
- // aapt resource value: 0x7F0300FB
- public const int srlEnableLoadMoreWhenContentNotFull = 2130903291;
+ // aapt resource value: 0x7f010184
+ public const int srlHeaderTranslationViewId = 2130772356;
- // aapt resource value: 0x7F0300FC
- public const int srlEnableNestedScrolling = 2130903292;
+ // aapt resource value: 0x7f01017e
+ public const int srlHeaderTriggerRate = 2130772350;
- // aapt resource value: 0x7F0300FD
- public const int srlEnableOverScrollBounce = 2130903293;
+ // aapt resource value: 0x7f010198
+ public const int srlMaxRage = 2130772376;
- // aapt resource value: 0x7F0300FE
- public const int srlEnableOverScrollDrag = 2130903294;
+ // aapt resource value: 0x7f010173
+ public const int srlNormalColor = 2130772339;
- // aapt resource value: 0x7F0300FF
- public const int srlEnablePreviewInEditMode = 2130903295;
+ // aapt resource value: 0x7f010166
+ public const int srlPrimaryColor = 2130772326;
- // aapt resource value: 0x7F030100
- public const int srlEnablePullToCloseTwoLevel = 2130903296;
+ // aapt resource value: 0x7f010176
+ public const int srlReboundDuration = 2130772342;
- // aapt resource value: 0x7F030101
- public const int srlEnablePureScrollMode = 2130903297;
+ // aapt resource value: 0x7f01019a
+ public const int srlRefreshRage = 2130772378;
- // aapt resource value: 0x7F030102
- public const int srlEnableRefresh = 2130903298;
+ // aapt resource value: 0x7f010167
+ public const int srlTextFailed = 2130772327;
- // aapt resource value: 0x7F030103
- public const int srlEnableScrollContentWhenLoaded = 2130903299;
+ // aapt resource value: 0x7f010168
+ public const int srlTextFinish = 2130772328;
- // aapt resource value: 0x7F030104
- public const int srlEnableScrollContentWhenRefreshed = 2130903300;
+ // aapt resource value: 0x7f010169
+ public const int srlTextLoading = 2130772329;
- // aapt resource value: 0x7F030105
- public const int srlEnableTwoLevel = 2130903301;
+ // aapt resource value: 0x7f01016a
+ public const int srlTextNothing = 2130772330;
- // aapt resource value: 0x7F030106
- public const int srlFinishDuration = 2130903302;
+ // aapt resource value: 0x7f01016b
+ public const int srlTextPulling = 2130772331;
- // aapt resource value: 0x7F030107
- public const int srlFixedFooterViewId = 2130903303;
+ // aapt resource value: 0x7f01016c
+ public const int srlTextRefreshing = 2130772332;
- // aapt resource value: 0x7F030108
- public const int srlFixedHeaderViewId = 2130903304;
+ // aapt resource value: 0x7f01016d
+ public const int srlTextRelease = 2130772333;
- // aapt resource value: 0x7F030109
- public const int srlFloorDuration = 2130903305;
+ // aapt resource value: 0x7f01016e
+ public const int srlTextSecondary = 2130772334;
- // aapt resource value: 0x7F03010A
- public const int srlFloorRage = 2130903306;
+ // aapt resource value: 0x7f01016f
+ public const int srlTextSizeTime = 2130772335;
- // aapt resource value: 0x7F03010B
- public const int srlFooterHeight = 2130903307;
+ // aapt resource value: 0x7f010170
+ public const int srlTextSizeTitle = 2130772336;
- // aapt resource value: 0x7F03010C
- public const int srlFooterInsetStart = 2130903308;
+ // aapt resource value: 0x7f010174
+ public const int srlTextTimeMarginTop = 2130772340;
- // aapt resource value: 0x7F03010D
- public const int srlFooterMaxDragRate = 2130903309;
+ // aapt resource value: 0x7f010171
+ public const int srlTextUpdate = 2130772337;
- // aapt resource value: 0x7F03010E
- public const int srlFooterTranslationViewId = 2130903310;
+ // aapt resource value: 0x7f010003
+ public const int stackFromEnd = 2130771971;
- // aapt resource value: 0x7F03010F
- public const int srlFooterTriggerRate = 2130903311;
+ // aapt resource value: 0x7f0100ce
+ public const int state_above_anchor = 2130772174;
- // aapt resource value: 0x7F030110
- public const int srlHeaderHeight = 2130903312;
+ // aapt resource value: 0x7f010100
+ public const int state_collapsed = 2130772224;
- // aapt resource value: 0x7F030111
- public const int srlHeaderInsetStart = 2130903313;
+ // aapt resource value: 0x7f010101
+ public const int state_collapsible = 2130772225;
- // aapt resource value: 0x7F030112
- public const int srlHeaderMaxDragRate = 2130903314;
+ // aapt resource value: 0x7f010119
+ public const int statusBarBackground = 2130772249;
- // aapt resource value: 0x7F030113
- public const int srlHeaderTranslationViewId = 2130903315;
+ // aapt resource value: 0x7f01010f
+ public const int statusBarScrim = 2130772239;
- // aapt resource value: 0x7F030114
- public const int srlHeaderTriggerRate = 2130903316;
+ // aapt resource value: 0x7f0100cc
+ public const int subMenuArrow = 2130772172;
- // aapt resource value: 0x7F030115
- public const int srlMaxRage = 2130903317;
+ // aapt resource value: 0x7f0100dd
+ public const int submitBackground = 2130772189;
- // aapt resource value: 0x7F030116
- public const int srlNormalColor = 2130903318;
+ // aapt resource value: 0x7f01000f
+ public const int subtitle = 2130771983;
- // aapt resource value: 0x7F030117
- public const int srlPrimaryColor = 2130903319;
+ // aapt resource value: 0x7f0100ea
+ public const int subtitleTextAppearance = 2130772202;
- // aapt resource value: 0x7F030118
- public const int srlReboundDuration = 2130903320;
+ // aapt resource value: 0x7f0100f9
+ public const int subtitleTextColor = 2130772217;
- // aapt resource value: 0x7F030119
- public const int srlRefreshRage = 2130903321;
+ // aapt resource value: 0x7f010011
+ public const int subtitleTextStyle = 2130771985;
- // aapt resource value: 0x7F03011A
- public const int srlTextFailed = 2130903322;
+ // aapt resource value: 0x7f0100db
+ public const int suggestionRowLayout = 2130772187;
- // aapt resource value: 0x7F03011B
- public const int srlTextFinish = 2130903323;
+ // aapt resource value: 0x7f0100e5
+ public const int switchMinWidth = 2130772197;
- // aapt resource value: 0x7F03011C
- public const int srlTextLoading = 2130903324;
+ // aapt resource value: 0x7f0100e6
+ public const int switchPadding = 2130772198;
- // aapt resource value: 0x7F03011D
- public const int srlTextNothing = 2130903325;
+ // aapt resource value: 0x7f0100ad
+ public const int switchStyle = 2130772141;
- // aapt resource value: 0x7F03011E
- public const int srlTextPulling = 2130903326;
+ // aapt resource value: 0x7f0100e4
+ public const int switchTextAppearance = 2130772196;
- // aapt resource value: 0x7F03011F
- public const int srlTextRefreshing = 2130903327;
+ // aapt resource value: 0x7f010136
+ public const int tabBackground = 2130772278;
- // aapt resource value: 0x7F030120
- public const int srlTextRelease = 2130903328;
+ // aapt resource value: 0x7f010135
+ public const int tabContentStart = 2130772277;
- // aapt resource value: 0x7F030121
- public const int srlTextSecondary = 2130903329;
+ // aapt resource value: 0x7f010138
+ public const int tabGravity = 2130772280;
- // aapt resource value: 0x7F030122
- public const int srlTextSizeTime = 2130903330;
+ // aapt resource value: 0x7f010133
+ public const int tabIndicatorColor = 2130772275;
- // aapt resource value: 0x7F030123
- public const int srlTextSizeTitle = 2130903331;
+ // aapt resource value: 0x7f010134
+ public const int tabIndicatorHeight = 2130772276;
- // aapt resource value: 0x7F030124
- public const int srlTextTimeMarginTop = 2130903332;
+ // aapt resource value: 0x7f01013a
+ public const int tabMaxWidth = 2130772282;
- // aapt resource value: 0x7F030125
- public const int srlTextUpdate = 2130903333;
+ // aapt resource value: 0x7f010139
+ public const int tabMinWidth = 2130772281;
- // aapt resource value: 0x7F030126
- public const int stackFromEnd = 2130903334;
+ // aapt resource value: 0x7f010137
+ public const int tabMode = 2130772279;
- // aapt resource value: 0x7F030127
- public const int state_above_anchor = 2130903335;
+ // aapt resource value: 0x7f010142
+ public const int tabPadding = 2130772290;
- // aapt resource value: 0x7F030128
- public const int subMenuArrow = 2130903336;
+ // aapt resource value: 0x7f010141
+ public const int tabPaddingBottom = 2130772289;
- // aapt resource value: 0x7F030129
- public const int submitBackground = 2130903337;
+ // aapt resource value: 0x7f010140
+ public const int tabPaddingEnd = 2130772288;
- // aapt resource value: 0x7F03012A
- public const int subtitle = 2130903338;
+ // aapt resource value: 0x7f01013e
+ public const int tabPaddingStart = 2130772286;
- // aapt resource value: 0x7F03012B
- public const int subtitleTextAppearance = 2130903339;
+ // aapt resource value: 0x7f01013f
+ public const int tabPaddingTop = 2130772287;
- // aapt resource value: 0x7F03012C
- public const int subtitleTextColor = 2130903340;
+ // aapt resource value: 0x7f01013d
+ public const int tabSelectedTextColor = 2130772285;
- // aapt resource value: 0x7F03012D
- public const int subtitleTextStyle = 2130903341;
+ // aapt resource value: 0x7f01013b
+ public const int tabTextAppearance = 2130772283;
- // aapt resource value: 0x7F03012E
- public const int suggestionRowLayout = 2130903342;
+ // aapt resource value: 0x7f01013c
+ public const int tabTextColor = 2130772284;
- // aapt resource value: 0x7F03012F
- public const int switchMinWidth = 2130903343;
+ // aapt resource value: 0x7f010036
+ public const int textAllCaps = 2130772022;
- // aapt resource value: 0x7F030130
- public const int switchPadding = 2130903344;
+ // aapt resource value: 0x7f010063
+ public const int textAppearanceLargePopupMenu = 2130772067;
- // aapt resource value: 0x7F030131
- public const int switchStyle = 2130903345;
+ // aapt resource value: 0x7f010088
+ public const int textAppearanceListItem = 2130772104;
- // aapt resource value: 0x7F030132
- public const int switchTextAppearance = 2130903346;
+ // aapt resource value: 0x7f010089
+ public const int textAppearanceListItemSecondary = 2130772105;
- // aapt resource value: 0x7F030133
- public const int textAllCaps = 2130903347;
+ // aapt resource value: 0x7f01008a
+ public const int textAppearanceListItemSmall = 2130772106;
- // aapt resource value: 0x7F030134
- public const int textAppearanceLargePopupMenu = 2130903348;
+ // aapt resource value: 0x7f010065
+ public const int textAppearancePopupMenuHeader = 2130772069;
- // aapt resource value: 0x7F030135
- public const int textAppearanceListItem = 2130903349;
+ // aapt resource value: 0x7f01007e
+ public const int textAppearanceSearchResultSubtitle = 2130772094;
- // aapt resource value: 0x7F030136
- public const int textAppearanceListItemSecondary = 2130903350;
+ // aapt resource value: 0x7f01007d
+ public const int textAppearanceSearchResultTitle = 2130772093;
- // aapt resource value: 0x7F030137
- public const int textAppearanceListItemSmall = 2130903351;
+ // aapt resource value: 0x7f010064
+ public const int textAppearanceSmallPopupMenu = 2130772068;
- // aapt resource value: 0x7F030138
- public const int textAppearancePopupMenuHeader = 2130903352;
+ // aapt resource value: 0x7f01009d
+ public const int textColorAlertDialogListItem = 2130772125;
- // aapt resource value: 0x7F030139
- public const int textAppearanceSearchResultSubtitle = 2130903353;
+ // aapt resource value: 0x7f010122
+ public const int textColorError = 2130772258;
- // aapt resource value: 0x7F03013A
- public const int textAppearanceSearchResultTitle = 2130903354;
+ // aapt resource value: 0x7f01007f
+ public const int textColorSearchUrl = 2130772095;
- // aapt resource value: 0x7F03013B
- public const int textAppearanceSmallPopupMenu = 2130903355;
+ // aapt resource value: 0x7f0100fc
+ public const int theme = 2130772220;
- // aapt resource value: 0x7F03013C
- public const int textColorAlertDialogListItem = 2130903356;
+ // aapt resource value: 0x7f0100bd
+ public const int thickness = 2130772157;
- // aapt resource value: 0x7F03013D
- public const int textColorSearchUrl = 2130903357;
+ // aapt resource value: 0x7f0100e3
+ public const int thumbTextPadding = 2130772195;
- // aapt resource value: 0x7F03013E
- public const int theme = 2130903358;
+ // aapt resource value: 0x7f0100de
+ public const int thumbTint = 2130772190;
- // aapt resource value: 0x7F03013F
- public const int thickness = 2130903359;
+ // aapt resource value: 0x7f0100df
+ public const int thumbTintMode = 2130772191;
- // aapt resource value: 0x7F030140
- public const int thumbTextPadding = 2130903360;
+ // aapt resource value: 0x7f010033
+ public const int tickMark = 2130772019;
- // aapt resource value: 0x7F030141
- public const int thumbTint = 2130903361;
+ // aapt resource value: 0x7f010034
+ public const int tickMarkTint = 2130772020;
- // aapt resource value: 0x7F030142
- public const int thumbTintMode = 2130903362;
+ // aapt resource value: 0x7f010035
+ public const int tickMarkTintMode = 2130772021;
- // aapt resource value: 0x7F030143
- public const int tickMark = 2130903363;
+ // aapt resource value: 0x7f010031
+ public const int tint = 2130772017;
- // aapt resource value: 0x7F030144
- public const int tickMarkTint = 2130903364;
+ // aapt resource value: 0x7f010032
+ public const int tintMode = 2130772018;
- // aapt resource value: 0x7F030145
- public const int tickMarkTintMode = 2130903365;
+ // aapt resource value: 0x7f01000c
+ public const int title = 2130771980;
- // aapt resource value: 0x7F030146
- public const int tint = 2130903366;
+ // aapt resource value: 0x7f010115
+ public const int titleEnabled = 2130772245;
- // aapt resource value: 0x7F030147
- public const int tintMode = 2130903367;
+ // aapt resource value: 0x7f0100eb
+ public const int titleMargin = 2130772203;
- // aapt resource value: 0x7F030148
- public const int title = 2130903368;
+ // aapt resource value: 0x7f0100ef
+ public const int titleMarginBottom = 2130772207;
- // aapt resource value: 0x7F030149
- public const int titleMargin = 2130903369;
+ // aapt resource value: 0x7f0100ed
+ public const int titleMarginEnd = 2130772205;
- // aapt resource value: 0x7F03014A
- public const int titleMarginBottom = 2130903370;
+ // aapt resource value: 0x7f0100ec
+ public const int titleMarginStart = 2130772204;
- // aapt resource value: 0x7F03014B
- public const int titleMarginEnd = 2130903371;
+ // aapt resource value: 0x7f0100ee
+ public const int titleMarginTop = 2130772206;
- // aapt resource value: 0x7F03014E
- public const int titleMargins = 2130903374;
+ // aapt resource value: 0x7f0100f0
+ public const int titleMargins = 2130772208;
- // aapt resource value: 0x7F03014C
- public const int titleMarginStart = 2130903372;
+ // aapt resource value: 0x7f0100e9
+ public const int titleTextAppearance = 2130772201;
- // aapt resource value: 0x7F03014D
- public const int titleMarginTop = 2130903373;
+ // aapt resource value: 0x7f0100f8
+ public const int titleTextColor = 2130772216;
- // aapt resource value: 0x7F03014F
- public const int titleTextAppearance = 2130903375;
+ // aapt resource value: 0x7f010010
+ public const int titleTextStyle = 2130771984;
- // aapt resource value: 0x7F030150
- public const int titleTextColor = 2130903376;
+ // aapt resource value: 0x7f010110
+ public const int toolbarId = 2130772240;
- // 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: 0x7f010127
+ public const int useCompatPadding = 2130772263;
- // aapt resource value: 0x7F03015A
- public const int voiceIcon = 2130903386;
+ // aapt resource value: 0x7f0100d9
+ public const int voiceIcon = 2130772185;
- // aapt resource value: 0x7F03015B
- public const int wave_bg_color = 2130903387;
+ // aapt resource value: 0x7f0101b8
+ public const int wave_bg_color = 2130772408;
- // aapt resource value: 0x7F03015C
- public const int wave_border_color = 2130903388;
+ // aapt resource value: 0x7f0101b9
+ public const int wave_border_color = 2130772409;
- // aapt resource value: 0x7F03015D
- public const int wave_color = 2130903389;
+ // aapt resource value: 0x7f0101b6
+ public const int wave_color = 2130772406;
- // aapt resource value: 0x7F03015E
- public const int wave_height = 2130903390;
+ // aapt resource value: 0x7f0101bb
+ public const int wave_height = 2130772411;
- // aapt resource value: 0x7F03015F
- public const int wave_width = 2130903391;
+ // aapt resource value: 0x7f0101ba
+ public const int wave_width = 2130772410;
- // aapt resource value: 0x7F030160
- public const int wheelview_dividerColor = 2130903392;
+ // aapt resource value: 0x7f0101c0
+ public const int wheelview_dividerColor = 2130772416;
- // aapt resource value: 0x7F030161
- public const int wheelview_gravity = 2130903393;
+ // aapt resource value: 0x7f0101bc
+ public const int wheelview_gravity = 2130772412;
- // aapt resource value: 0x7F030162
- public const int wheelview_lineSpacingMultiplier = 2130903394;
+ // aapt resource value: 0x7f0101c1
+ public const int wheelview_lineSpacingMultiplier = 2130772417;
- // aapt resource value: 0x7F030163
- public const int wheelview_textColorCenter = 2130903395;
+ // aapt resource value: 0x7f0101bf
+ public const int wheelview_textColorCenter = 2130772415;
- // aapt resource value: 0x7F030164
- public const int wheelview_textColorOut = 2130903396;
+ // aapt resource value: 0x7f0101be
+ public const int wheelview_textColorOut = 2130772414;
- // aapt resource value: 0x7F030165
- public const int wheelview_textSize = 2130903397;
+ // aapt resource value: 0x7f0101bd
+ public const int wheelview_textSize = 2130772413;
- // aapt resource value: 0x7F030166
- public const int windowActionBar = 2130903398;
+ // aapt resource value: 0x7f01003d
+ public const int windowActionBar = 2130772029;
- // aapt resource value: 0x7F030167
- public const int windowActionBarOverlay = 2130903399;
+ // aapt resource value: 0x7f01003f
+ public const int windowActionBarOverlay = 2130772031;
- // aapt resource value: 0x7F030168
- public const int windowActionModeOverlay = 2130903400;
+ // aapt resource value: 0x7f010040
+ public const int windowActionModeOverlay = 2130772032;
- // aapt resource value: 0x7F030169
- public const int windowFixedHeightMajor = 2130903401;
+ // aapt resource value: 0x7f010044
+ public const int windowFixedHeightMajor = 2130772036;
- // aapt resource value: 0x7F03016A
- public const int windowFixedHeightMinor = 2130903402;
+ // aapt resource value: 0x7f010042
+ public const int windowFixedHeightMinor = 2130772034;
- // aapt resource value: 0x7F03016B
- public const int windowFixedWidthMajor = 2130903403;
+ // aapt resource value: 0x7f010041
+ public const int windowFixedWidthMajor = 2130772033;
- // aapt resource value: 0x7F03016C
- public const int windowFixedWidthMinor = 2130903404;
+ // aapt resource value: 0x7f010043
+ public const int windowFixedWidthMinor = 2130772035;
- // aapt resource value: 0x7F03016D
- public const int windowMinWidthMajor = 2130903405;
+ // aapt resource value: 0x7f010045
+ public const int windowMinWidthMajor = 2130772037;
- // aapt resource value: 0x7F03016E
- public const int windowMinWidthMinor = 2130903406;
+ // aapt resource value: 0x7f010046
+ public const int windowMinWidthMinor = 2130772038;
- // aapt resource value: 0x7F03016F
- public const int windowNoTitle = 2130903407;
+ // aapt resource value: 0x7f01003e
+ public const int windowNoTitle = 2130772030;
static Attribute()
{
@@ -1396,20 +1670,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7F040000
- public const int abc_action_bar_embed_tabs = 2130968576;
+ // aapt resource value: 0x7f0c0000
+ public const int abc_action_bar_embed_tabs = 2131492864;
- // aapt resource value: 0x7F040001
- public const int abc_allow_stacked_button_bar = 2130968577;
+ // aapt resource value: 0x7f0c0001
+ public const int abc_allow_stacked_button_bar = 2131492865;
- // aapt resource value: 0x7F040002
- public const int abc_config_actionMenuItemAllCaps = 2130968578;
+ // aapt resource value: 0x7f0c0002
+ public const int abc_config_actionMenuItemAllCaps = 2131492866;
- // aapt resource value: 0x7F040003
- public const int abc_config_closeDialogWhenTouchOutside = 2130968579;
+ // aapt resource value: 0x7f0c0003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
- // aapt resource value: 0x7F040004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2130968580;
+ // aapt resource value: 0x7f0c0004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
static Boolean()
{
@@ -1424,287 +1698,320 @@
public partial class Color
{
- // aapt resource value: 0x7F050000
- public const int abc_background_cache_hint_selector_material_dark = 2131034112;
+ // aapt resource value: 0x7f0d0051
+ public const int abc_background_cache_hint_selector_material_dark = 2131558481;
- // aapt resource value: 0x7F050001
- public const int abc_background_cache_hint_selector_material_light = 2131034113;
+ // aapt resource value: 0x7f0d0052
+ public const int abc_background_cache_hint_selector_material_light = 2131558482;
- // aapt resource value: 0x7F050002
- public const int abc_btn_colored_borderless_text_material = 2131034114;
+ // aapt resource value: 0x7f0d0053
+ public const int abc_btn_colored_borderless_text_material = 2131558483;
- // aapt resource value: 0x7F050003
- public const int abc_btn_colored_text_material = 2131034115;
+ // aapt resource value: 0x7f0d0054
+ public const int abc_btn_colored_text_material = 2131558484;
- // aapt resource value: 0x7F050004
- public const int abc_color_highlight_material = 2131034116;
+ // aapt resource value: 0x7f0d0055
+ public const int abc_color_highlight_material = 2131558485;
- // aapt resource value: 0x7F050005
- public const int abc_hint_foreground_material_dark = 2131034117;
+ // aapt resource value: 0x7f0d0056
+ public const int abc_hint_foreground_material_dark = 2131558486;
- // aapt resource value: 0x7F050006
- public const int abc_hint_foreground_material_light = 2131034118;
+ // aapt resource value: 0x7f0d0057
+ public const int abc_hint_foreground_material_light = 2131558487;
- // aapt resource value: 0x7F050007
- public const int abc_input_method_navigation_guard = 2131034119;
+ // aapt resource value: 0x7f0d0000
+ public const int abc_input_method_navigation_guard = 2131558400;
- // aapt resource value: 0x7F050008
- public const int abc_primary_text_disable_only_material_dark = 2131034120;
+ // aapt resource value: 0x7f0d0058
+ public const int abc_primary_text_disable_only_material_dark = 2131558488;
- // aapt resource value: 0x7F050009
- public const int abc_primary_text_disable_only_material_light = 2131034121;
+ // aapt resource value: 0x7f0d0059
+ public const int abc_primary_text_disable_only_material_light = 2131558489;
- // aapt resource value: 0x7F05000A
- public const int abc_primary_text_material_dark = 2131034122;
+ // aapt resource value: 0x7f0d005a
+ public const int abc_primary_text_material_dark = 2131558490;
- // aapt resource value: 0x7F05000B
- public const int abc_primary_text_material_light = 2131034123;
+ // aapt resource value: 0x7f0d005b
+ public const int abc_primary_text_material_light = 2131558491;
- // aapt resource value: 0x7F05000C
- public const int abc_search_url_text = 2131034124;
+ // aapt resource value: 0x7f0d005c
+ public const int abc_search_url_text = 2131558492;
- // aapt resource value: 0x7F05000D
- public const int abc_search_url_text_normal = 2131034125;
+ // aapt resource value: 0x7f0d0001
+ public const int abc_search_url_text_normal = 2131558401;
- // aapt resource value: 0x7F05000E
- public const int abc_search_url_text_pressed = 2131034126;
+ // aapt resource value: 0x7f0d0002
+ public const int abc_search_url_text_pressed = 2131558402;
- // aapt resource value: 0x7F05000F
- public const int abc_search_url_text_selected = 2131034127;
+ // aapt resource value: 0x7f0d0003
+ public const int abc_search_url_text_selected = 2131558403;
- // aapt resource value: 0x7F050010
- public const int abc_secondary_text_material_dark = 2131034128;
+ // aapt resource value: 0x7f0d005d
+ public const int abc_secondary_text_material_dark = 2131558493;
- // aapt resource value: 0x7F050011
- public const int abc_secondary_text_material_light = 2131034129;
+ // aapt resource value: 0x7f0d005e
+ public const int abc_secondary_text_material_light = 2131558494;
- // aapt resource value: 0x7F050012
- public const int abc_tint_btn_checkable = 2131034130;
+ // aapt resource value: 0x7f0d005f
+ public const int abc_tint_btn_checkable = 2131558495;
- // aapt resource value: 0x7F050013
- public const int abc_tint_default = 2131034131;
+ // aapt resource value: 0x7f0d0060
+ public const int abc_tint_default = 2131558496;
- // aapt resource value: 0x7F050014
- public const int abc_tint_edittext = 2131034132;
+ // aapt resource value: 0x7f0d0061
+ public const int abc_tint_edittext = 2131558497;
- // aapt resource value: 0x7F050015
- public const int abc_tint_seek_thumb = 2131034133;
+ // aapt resource value: 0x7f0d0062
+ public const int abc_tint_seek_thumb = 2131558498;
- // aapt resource value: 0x7F050016
- public const int abc_tint_spinner = 2131034134;
+ // aapt resource value: 0x7f0d0063
+ public const int abc_tint_spinner = 2131558499;
- // aapt resource value: 0x7F050017
- public const int abc_tint_switch_track = 2131034135;
+ // aapt resource value: 0x7f0d0064
+ public const int abc_tint_switch_track = 2131558500;
- // aapt resource value: 0x7F050018
- public const int accent_material_dark = 2131034136;
+ // aapt resource value: 0x7f0d0004
+ public const int accent_material_dark = 2131558404;
- // aapt resource value: 0x7F050019
- public const int accent_material_light = 2131034137;
+ // aapt resource value: 0x7f0d0005
+ public const int accent_material_light = 2131558405;
- // aapt resource value: 0x7F05001A
- public const int background_floating_material_dark = 2131034138;
+ // aapt resource value: 0x7f0d0006
+ public const int background_floating_material_dark = 2131558406;
- // aapt resource value: 0x7F05001B
- public const int background_floating_material_light = 2131034139;
+ // aapt resource value: 0x7f0d0007
+ public const int background_floating_material_light = 2131558407;
- // aapt resource value: 0x7F05001C
- public const int background_material_dark = 2131034140;
+ // aapt resource value: 0x7f0d0008
+ public const int background_material_dark = 2131558408;
- // aapt resource value: 0x7F05001D
- public const int background_material_light = 2131034141;
+ // aapt resource value: 0x7f0d0009
+ public const int background_material_light = 2131558409;
- // aapt resource value: 0x7F05001E
- public const int bright_foreground_disabled_material_dark = 2131034142;
+ // aapt resource value: 0x7f0d000a
+ public const int bright_foreground_disabled_material_dark = 2131558410;
- // aapt resource value: 0x7F05001F
- public const int bright_foreground_disabled_material_light = 2131034143;
+ // aapt resource value: 0x7f0d000b
+ public const int bright_foreground_disabled_material_light = 2131558411;
- // aapt resource value: 0x7F050020
- public const int bright_foreground_inverse_material_dark = 2131034144;
+ // aapt resource value: 0x7f0d000c
+ public const int bright_foreground_inverse_material_dark = 2131558412;
- // aapt resource value: 0x7F050021
- public const int bright_foreground_inverse_material_light = 2131034145;
+ // aapt resource value: 0x7f0d000d
+ public const int bright_foreground_inverse_material_light = 2131558413;
- // aapt resource value: 0x7F050022
- public const int bright_foreground_material_dark = 2131034146;
+ // aapt resource value: 0x7f0d000e
+ public const int bright_foreground_material_dark = 2131558414;
- // aapt resource value: 0x7F050023
- public const int bright_foreground_material_light = 2131034147;
+ // aapt resource value: 0x7f0d000f
+ public const int bright_foreground_material_light = 2131558415;
- // aapt resource value: 0x7F050024
- public const int button_material_dark = 2131034148;
+ // aapt resource value: 0x7f0d0010
+ public const int button_material_dark = 2131558416;
- // aapt resource value: 0x7F050025
- public const int button_material_light = 2131034149;
+ // aapt resource value: 0x7f0d0011
+ public const int button_material_light = 2131558417;
- // aapt resource value: 0x7F050026
- public const int dim_foreground_disabled_material_dark = 2131034150;
+ // aapt resource value: 0x7f0d003c
+ public const int design_bottom_navigation_shadow_color = 2131558460;
- // aapt resource value: 0x7F050027
- public const int dim_foreground_disabled_material_light = 2131034151;
+ // aapt resource value: 0x7f0d0065
+ public const int design_error = 2131558501;
- // aapt resource value: 0x7F050028
- public const int dim_foreground_material_dark = 2131034152;
+ // aapt resource value: 0x7f0d003d
+ public const int design_fab_shadow_end_color = 2131558461;
- // aapt resource value: 0x7F050029
- public const int dim_foreground_material_light = 2131034153;
+ // aapt resource value: 0x7f0d003e
+ public const int design_fab_shadow_mid_color = 2131558462;
- // aapt resource value: 0x7F05002A
- public const int error_color_material = 2131034154;
+ // aapt resource value: 0x7f0d003f
+ public const int design_fab_shadow_start_color = 2131558463;
- // aapt resource value: 0x7F05002B
- public const int foreground_material_dark = 2131034155;
+ // aapt resource value: 0x7f0d0040
+ public const int design_fab_stroke_end_inner_color = 2131558464;
+
+ // aapt resource value: 0x7f0d0041
+ public const int design_fab_stroke_end_outer_color = 2131558465;
+
+ // aapt resource value: 0x7f0d0042
+ public const int design_fab_stroke_top_inner_color = 2131558466;
+
+ // aapt resource value: 0x7f0d0043
+ public const int design_fab_stroke_top_outer_color = 2131558467;
+
+ // aapt resource value: 0x7f0d0044
+ public const int design_snackbar_background_color = 2131558468;
+
+ // aapt resource value: 0x7f0d0066
+ public const int design_tint_password_toggle = 2131558502;
+
+ // aapt resource value: 0x7f0d0012
+ public const int dim_foreground_disabled_material_dark = 2131558418;
+
+ // aapt resource value: 0x7f0d0013
+ public const int dim_foreground_disabled_material_light = 2131558419;
+
+ // aapt resource value: 0x7f0d0014
+ public const int dim_foreground_material_dark = 2131558420;
+
+ // aapt resource value: 0x7f0d0015
+ public const int dim_foreground_material_light = 2131558421;
+
+ // aapt resource value: 0x7f0d0016
+ public const int error_color_material = 2131558422;
+
+ // aapt resource value: 0x7f0d0017
+ public const int foreground_material_dark = 2131558423;
- // aapt resource value: 0x7F05002C
- public const int foreground_material_light = 2131034156;
+ // aapt resource value: 0x7f0d0018
+ public const int foreground_material_light = 2131558424;
- // aapt resource value: 0x7F05002D
- public const int highlighted_text_material_dark = 2131034157;
+ // aapt resource value: 0x7f0d0019
+ public const int highlighted_text_material_dark = 2131558425;
- // aapt resource value: 0x7F05002E
- public const int highlighted_text_material_light = 2131034158;
+ // aapt resource value: 0x7f0d001a
+ public const int highlighted_text_material_light = 2131558426;
- // aapt resource value: 0x7F05002F
- public const int material_blue_grey_800 = 2131034159;
+ // aapt resource value: 0x7f0d001b
+ public const int material_blue_grey_800 = 2131558427;
- // aapt resource value: 0x7F050030
- public const int material_blue_grey_900 = 2131034160;
+ // aapt resource value: 0x7f0d001c
+ public const int material_blue_grey_900 = 2131558428;
- // aapt resource value: 0x7F050031
- public const int material_blue_grey_950 = 2131034161;
+ // aapt resource value: 0x7f0d001d
+ public const int material_blue_grey_950 = 2131558429;
- // aapt resource value: 0x7F050032
- public const int material_deep_teal_200 = 2131034162;
+ // aapt resource value: 0x7f0d001e
+ public const int material_deep_teal_200 = 2131558430;
- // aapt resource value: 0x7F050033
- public const int material_deep_teal_500 = 2131034163;
+ // aapt resource value: 0x7f0d001f
+ public const int material_deep_teal_500 = 2131558431;
- // aapt resource value: 0x7F050034
- public const int material_grey_100 = 2131034164;
+ // aapt resource value: 0x7f0d0020
+ public const int material_grey_100 = 2131558432;
- // aapt resource value: 0x7F050035
- public const int material_grey_300 = 2131034165;
+ // aapt resource value: 0x7f0d0021
+ public const int material_grey_300 = 2131558433;
- // aapt resource value: 0x7F050036
- public const int material_grey_50 = 2131034166;
+ // aapt resource value: 0x7f0d0022
+ public const int material_grey_50 = 2131558434;
- // aapt resource value: 0x7F050037
- public const int material_grey_600 = 2131034167;
+ // aapt resource value: 0x7f0d0023
+ public const int material_grey_600 = 2131558435;
- // aapt resource value: 0x7F050038
- public const int material_grey_800 = 2131034168;
+ // aapt resource value: 0x7f0d0024
+ public const int material_grey_800 = 2131558436;
- // aapt resource value: 0x7F050039
- public const int material_grey_850 = 2131034169;
+ // aapt resource value: 0x7f0d0025
+ public const int material_grey_850 = 2131558437;
- // aapt resource value: 0x7F05003A
- public const int material_grey_900 = 2131034170;
+ // aapt resource value: 0x7f0d0026
+ public const int material_grey_900 = 2131558438;
- // aapt resource value: 0x7F05003B
- public const int material_red_500 = 2131034171;
+ // aapt resource value: 0x7f0d0047
+ public const int material_red_500 = 2131558471;
- // aapt resource value: 0x7F05003C
- public const int notification_action_color_filter = 2131034172;
+ // aapt resource value: 0x7f0d0045
+ public const int notification_action_color_filter = 2131558469;
- // aapt resource value: 0x7F05003D
- public const int notification_icon_bg_color = 2131034173;
+ // aapt resource value: 0x7f0d0046
+ public const int notification_icon_bg_color = 2131558470;
- // aapt resource value: 0x7F05003E
- public const int notification_material_background_media_default_color = 2131034174;
+ // aapt resource value: 0x7f0d003b
+ public const int notification_material_background_media_default_color = 2131558459;
- // aapt resource value: 0x7F05003F
- public const int pickerview_bgColor_default = 2131034175;
+ // aapt resource value: 0x7f0d0048
+ public const int pickerview_bgColor_default = 2131558472;
- // aapt resource value: 0x7F050040
- public const int pickerview_bgColor_overlay = 2131034176;
+ // aapt resource value: 0x7f0d0049
+ public const int pickerview_bgColor_overlay = 2131558473;
- // aapt resource value: 0x7F050041
- public const int pickerview_bg_topbar = 2131034177;
+ // aapt resource value: 0x7f0d004a
+ public const int pickerview_bg_topbar = 2131558474;
- // aapt resource value: 0x7F050042
- public const int pickerview_timebtn_nor = 2131034178;
+ // aapt resource value: 0x7f0d004b
+ public const int pickerview_timebtn_nor = 2131558475;
- // aapt resource value: 0x7F050043
- public const int pickerview_timebtn_pre = 2131034179;
+ // aapt resource value: 0x7f0d004c
+ public const int pickerview_timebtn_pre = 2131558476;
- // aapt resource value: 0x7F050044
- public const int pickerview_topbar_title = 2131034180;
+ // aapt resource value: 0x7f0d004d
+ public const int pickerview_topbar_title = 2131558477;
- // aapt resource value: 0x7F050045
- public const int pickerview_wheelview_textcolor_center = 2131034181;
+ // aapt resource value: 0x7f0d004e
+ public const int pickerview_wheelview_textcolor_center = 2131558478;
- // aapt resource value: 0x7F050046
- public const int pickerview_wheelview_textcolor_divider = 2131034182;
+ // aapt resource value: 0x7f0d004f
+ public const int pickerview_wheelview_textcolor_divider = 2131558479;
- // aapt resource value: 0x7F050047
- public const int pickerview_wheelview_textcolor_out = 2131034183;
+ // aapt resource value: 0x7f0d0050
+ public const int pickerview_wheelview_textcolor_out = 2131558480;
- // aapt resource value: 0x7F050048
- public const int primary_dark_material_dark = 2131034184;
+ // aapt resource value: 0x7f0d0027
+ public const int primary_dark_material_dark = 2131558439;
- // aapt resource value: 0x7F050049
- public const int primary_dark_material_light = 2131034185;
+ // aapt resource value: 0x7f0d0028
+ public const int primary_dark_material_light = 2131558440;
- // aapt resource value: 0x7F05004A
- public const int primary_material_dark = 2131034186;
+ // aapt resource value: 0x7f0d0029
+ public const int primary_material_dark = 2131558441;
- // aapt resource value: 0x7F05004B
- public const int primary_material_light = 2131034187;
+ // aapt resource value: 0x7f0d002a
+ public const int primary_material_light = 2131558442;
- // aapt resource value: 0x7F05004C
- public const int primary_text_default_material_dark = 2131034188;
+ // aapt resource value: 0x7f0d002b
+ public const int primary_text_default_material_dark = 2131558443;
- // aapt resource value: 0x7F05004D
- public const int primary_text_default_material_light = 2131034189;
+ // aapt resource value: 0x7f0d002c
+ public const int primary_text_default_material_light = 2131558444;
- // aapt resource value: 0x7F05004E
- public const int primary_text_disabled_material_dark = 2131034190;
+ // aapt resource value: 0x7f0d002d
+ public const int primary_text_disabled_material_dark = 2131558445;
- // aapt resource value: 0x7F05004F
- public const int primary_text_disabled_material_light = 2131034191;
+ // aapt resource value: 0x7f0d002e
+ public const int primary_text_disabled_material_light = 2131558446;
- // aapt resource value: 0x7F050050
- public const int ripple_material_dark = 2131034192;
+ // aapt resource value: 0x7f0d002f
+ public const int ripple_material_dark = 2131558447;
- // aapt resource value: 0x7F050051
- public const int ripple_material_light = 2131034193;
+ // aapt resource value: 0x7f0d0030
+ public const int ripple_material_light = 2131558448;
- // aapt resource value: 0x7F050052
- public const int secondary_text_default_material_dark = 2131034194;
+ // aapt resource value: 0x7f0d0031
+ public const int secondary_text_default_material_dark = 2131558449;
- // aapt resource value: 0x7F050053
- public const int secondary_text_default_material_light = 2131034195;
+ // aapt resource value: 0x7f0d0032
+ public const int secondary_text_default_material_light = 2131558450;
- // aapt resource value: 0x7F050054
- public const int secondary_text_disabled_material_dark = 2131034196;
+ // aapt resource value: 0x7f0d0033
+ public const int secondary_text_disabled_material_dark = 2131558451;
- // aapt resource value: 0x7F050055
- public const int secondary_text_disabled_material_light = 2131034197;
+ // aapt resource value: 0x7f0d0034
+ public const int secondary_text_disabled_material_light = 2131558452;
- // aapt resource value: 0x7F050056
- public const int switch_thumb_disabled_material_dark = 2131034198;
+ // aapt resource value: 0x7f0d0035
+ public const int switch_thumb_disabled_material_dark = 2131558453;
- // aapt resource value: 0x7F050057
- public const int switch_thumb_disabled_material_light = 2131034199;
+ // aapt resource value: 0x7f0d0036
+ public const int switch_thumb_disabled_material_light = 2131558454;
- // aapt resource value: 0x7F050058
- public const int switch_thumb_material_dark = 2131034200;
+ // aapt resource value: 0x7f0d0067
+ public const int switch_thumb_material_dark = 2131558503;
- // aapt resource value: 0x7F050059
- public const int switch_thumb_material_light = 2131034201;
+ // aapt resource value: 0x7f0d0068
+ public const int switch_thumb_material_light = 2131558504;
- // aapt resource value: 0x7F05005A
- public const int switch_thumb_normal_material_dark = 2131034202;
+ // aapt resource value: 0x7f0d0037
+ public const int switch_thumb_normal_material_dark = 2131558455;
- // aapt resource value: 0x7F05005B
- public const int switch_thumb_normal_material_light = 2131034203;
+ // aapt resource value: 0x7f0d0038
+ public const int switch_thumb_normal_material_light = 2131558456;
- // aapt resource value: 0x7F05005C
- public const int tooltip_background_dark = 2131034204;
+ // aapt resource value: 0x7f0d0039
+ public const int tooltip_background_dark = 2131558457;
- // aapt resource value: 0x7F05005D
- public const int tooltip_background_light = 2131034205;
+ // aapt resource value: 0x7f0d003a
+ public const int tooltip_background_light = 2131558458;
static Color()
{
@@ -1719,377 +2026,491 @@
public partial class Dimension
{
- // aapt resource value: 0x7F060000
- public const int abc_action_bar_content_inset_material = 2131099648;
+ // aapt resource value: 0x7f080012
+ public const int abc_action_bar_content_inset_material = 2131230738;
- // aapt resource value: 0x7F060001
- public const int abc_action_bar_content_inset_with_nav = 2131099649;
+ // aapt resource value: 0x7f080013
+ public const int abc_action_bar_content_inset_with_nav = 2131230739;
- // aapt resource value: 0x7F060002
- public const int abc_action_bar_default_height_material = 2131099650;
+ // aapt resource value: 0x7f080007
+ public const int abc_action_bar_default_height_material = 2131230727;
- // aapt resource value: 0x7F060003
- public const int abc_action_bar_default_padding_end_material = 2131099651;
+ // aapt resource value: 0x7f080014
+ public const int abc_action_bar_default_padding_end_material = 2131230740;
- // aapt resource value: 0x7F060004
- public const int abc_action_bar_default_padding_start_material = 2131099652;
+ // aapt resource value: 0x7f080015
+ public const int abc_action_bar_default_padding_start_material = 2131230741;
- // aapt resource value: 0x7F060005
- public const int abc_action_bar_elevation_material = 2131099653;
+ // aapt resource value: 0x7f080017
+ public const int abc_action_bar_elevation_material = 2131230743;
- // aapt resource value: 0x7F060006
- public const int abc_action_bar_icon_vertical_padding_material = 2131099654;
+ // aapt resource value: 0x7f080018
+ public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
- // aapt resource value: 0x7F060007
- public const int abc_action_bar_overflow_padding_end_material = 2131099655;
+ // aapt resource value: 0x7f080019
+ public const int abc_action_bar_overflow_padding_end_material = 2131230745;
- // aapt resource value: 0x7F060008
- public const int abc_action_bar_overflow_padding_start_material = 2131099656;
+ // aapt resource value: 0x7f08001a
+ public const int abc_action_bar_overflow_padding_start_material = 2131230746;
- // aapt resource value: 0x7F060009
- public const int abc_action_bar_progress_bar_size = 2131099657;
+ // aapt resource value: 0x7f080008
+ public const int abc_action_bar_progress_bar_size = 2131230728;
- // aapt resource value: 0x7F06000A
- public const int abc_action_bar_stacked_max_height = 2131099658;
+ // aapt resource value: 0x7f08001b
+ public const int abc_action_bar_stacked_max_height = 2131230747;
- // aapt resource value: 0x7F06000B
- public const int abc_action_bar_stacked_tab_max_width = 2131099659;
+ // aapt resource value: 0x7f08001c
+ public const int abc_action_bar_stacked_tab_max_width = 2131230748;
- // aapt resource value: 0x7F06000C
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131099660;
+ // aapt resource value: 0x7f08001d
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
- // aapt resource value: 0x7F06000D
- public const int abc_action_bar_subtitle_top_margin_material = 2131099661;
+ // aapt resource value: 0x7f08001e
+ public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
- // aapt resource value: 0x7F06000E
- public const int abc_action_button_min_height_material = 2131099662;
+ // aapt resource value: 0x7f08001f
+ public const int abc_action_button_min_height_material = 2131230751;
- // aapt resource value: 0x7F06000F
- public const int abc_action_button_min_width_material = 2131099663;
+ // aapt resource value: 0x7f080020
+ public const int abc_action_button_min_width_material = 2131230752;
- // aapt resource value: 0x7F060010
- public const int abc_action_button_min_width_overflow_material = 2131099664;
+ // aapt resource value: 0x7f080021
+ public const int abc_action_button_min_width_overflow_material = 2131230753;
- // aapt resource value: 0x7F060011
- public const int abc_alert_dialog_button_bar_height = 2131099665;
+ // aapt resource value: 0x7f080006
+ public const int abc_alert_dialog_button_bar_height = 2131230726;
- // aapt resource value: 0x7F060012
- public const int abc_button_inset_horizontal_material = 2131099666;
+ // aapt resource value: 0x7f080022
+ public const int abc_button_inset_horizontal_material = 2131230754;
- // aapt resource value: 0x7F060013
- public const int abc_button_inset_vertical_material = 2131099667;
+ // aapt resource value: 0x7f080023
+ public const int abc_button_inset_vertical_material = 2131230755;
- // aapt resource value: 0x7F060014
- public const int abc_button_padding_horizontal_material = 2131099668;
+ // aapt resource value: 0x7f080024
+ public const int abc_button_padding_horizontal_material = 2131230756;
- // aapt resource value: 0x7F060015
- public const int abc_button_padding_vertical_material = 2131099669;
+ // aapt resource value: 0x7f080025
+ public const int abc_button_padding_vertical_material = 2131230757;
- // aapt resource value: 0x7F060016
- public const int abc_cascading_menus_min_smallest_width = 2131099670;
+ // aapt resource value: 0x7f080026
+ public const int abc_cascading_menus_min_smallest_width = 2131230758;
- // aapt resource value: 0x7F060017
- public const int abc_config_prefDialogWidth = 2131099671;
+ // aapt resource value: 0x7f08000b
+ public const int abc_config_prefDialogWidth = 2131230731;
- // aapt resource value: 0x7F060018
- public const int abc_control_corner_material = 2131099672;
+ // aapt resource value: 0x7f080027
+ public const int abc_control_corner_material = 2131230759;
- // aapt resource value: 0x7F060019
- public const int abc_control_inset_material = 2131099673;
+ // aapt resource value: 0x7f080028
+ public const int abc_control_inset_material = 2131230760;
- // aapt resource value: 0x7F06001A
- public const int abc_control_padding_material = 2131099674;
+ // aapt resource value: 0x7f080029
+ public const int abc_control_padding_material = 2131230761;
- // aapt resource value: 0x7F06001B
- public const int abc_dialog_fixed_height_major = 2131099675;
+ // aapt resource value: 0x7f08000c
+ public const int abc_dialog_fixed_height_major = 2131230732;
- // aapt resource value: 0x7F06001C
- public const int abc_dialog_fixed_height_minor = 2131099676;
+ // aapt resource value: 0x7f08000d
+ public const int abc_dialog_fixed_height_minor = 2131230733;
- // aapt resource value: 0x7F06001D
- public const int abc_dialog_fixed_width_major = 2131099677;
+ // aapt resource value: 0x7f08000e
+ public const int abc_dialog_fixed_width_major = 2131230734;
- // aapt resource value: 0x7F06001E
- public const int abc_dialog_fixed_width_minor = 2131099678;
+ // aapt resource value: 0x7f08000f
+ public const int abc_dialog_fixed_width_minor = 2131230735;
- // aapt resource value: 0x7F06001F
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131099679;
+ // aapt resource value: 0x7f08002a
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
- // aapt resource value: 0x7F060020
- public const int abc_dialog_list_padding_top_no_title = 2131099680;
+ // aapt resource value: 0x7f08002b
+ public const int abc_dialog_list_padding_top_no_title = 2131230763;
- // aapt resource value: 0x7F060021
- public const int abc_dialog_min_width_major = 2131099681;
+ // aapt resource value: 0x7f080010
+ public const int abc_dialog_min_width_major = 2131230736;
- // aapt resource value: 0x7F060022
- public const int abc_dialog_min_width_minor = 2131099682;
+ // aapt resource value: 0x7f080011
+ public const int abc_dialog_min_width_minor = 2131230737;
- // aapt resource value: 0x7F060023
- public const int abc_dialog_padding_material = 2131099683;
+ // aapt resource value: 0x7f08002c
+ public const int abc_dialog_padding_material = 2131230764;
- // aapt resource value: 0x7F060024
- public const int abc_dialog_padding_top_material = 2131099684;
+ // aapt resource value: 0x7f08002d
+ public const int abc_dialog_padding_top_material = 2131230765;
- // aapt resource value: 0x7F060025
- public const int abc_dialog_title_divider_material = 2131099685;
+ // aapt resource value: 0x7f08002e
+ public const int abc_dialog_title_divider_material = 2131230766;
- // aapt resource value: 0x7F060026
- public const int abc_disabled_alpha_material_dark = 2131099686;
+ // aapt resource value: 0x7f08002f
+ public const int abc_disabled_alpha_material_dark = 2131230767;
- // aapt resource value: 0x7F060027
- public const int abc_disabled_alpha_material_light = 2131099687;
+ // aapt resource value: 0x7f080030
+ public const int abc_disabled_alpha_material_light = 2131230768;
- // aapt resource value: 0x7F060028
- public const int abc_dropdownitem_icon_width = 2131099688;
+ // aapt resource value: 0x7f080031
+ public const int abc_dropdownitem_icon_width = 2131230769;
- // aapt resource value: 0x7F060029
- public const int abc_dropdownitem_text_padding_left = 2131099689;
+ // aapt resource value: 0x7f080032
+ public const int abc_dropdownitem_text_padding_left = 2131230770;
- // aapt resource value: 0x7F06002A
- public const int abc_dropdownitem_text_padding_right = 2131099690;
+ // aapt resource value: 0x7f080033
+ public const int abc_dropdownitem_text_padding_right = 2131230771;
- // aapt resource value: 0x7F06002B
- public const int abc_edit_text_inset_bottom_material = 2131099691;
+ // aapt resource value: 0x7f080034
+ public const int abc_edit_text_inset_bottom_material = 2131230772;
- // aapt resource value: 0x7F06002C
- public const int abc_edit_text_inset_horizontal_material = 2131099692;
+ // aapt resource value: 0x7f080035
+ public const int abc_edit_text_inset_horizontal_material = 2131230773;
- // aapt resource value: 0x7F06002D
- public const int abc_edit_text_inset_top_material = 2131099693;
+ // aapt resource value: 0x7f080036
+ public const int abc_edit_text_inset_top_material = 2131230774;
- // aapt resource value: 0x7F06002E
- public const int abc_floating_window_z = 2131099694;
+ // aapt resource value: 0x7f080037
+ public const int abc_floating_window_z = 2131230775;
- // aapt resource value: 0x7F06002F
- public const int abc_list_item_padding_horizontal_material = 2131099695;
+ // aapt resource value: 0x7f080038
+ public const int abc_list_item_padding_horizontal_material = 2131230776;
+
+ // aapt resource value: 0x7f080039
+ public const int abc_panel_menu_list_width = 2131230777;
+
+ // aapt resource value: 0x7f08003a
+ public const int abc_progress_bar_height_material = 2131230778;
+
+ // aapt resource value: 0x7f08003b
+ public const int abc_search_view_preferred_height = 2131230779;
+
+ // aapt resource value: 0x7f08003c
+ public const int abc_search_view_preferred_width = 2131230780;
+
+ // aapt resource value: 0x7f08003d
+ public const int abc_seekbar_track_background_height_material = 2131230781;
+
+ // aapt resource value: 0x7f08003e
+ public const int abc_seekbar_track_progress_height_material = 2131230782;
+
+ // aapt resource value: 0x7f08003f
+ public const int abc_select_dialog_padding_start_material = 2131230783;
+
+ // aapt resource value: 0x7f080016
+ public const int abc_switch_padding = 2131230742;
+
+ // aapt resource value: 0x7f080040
+ public const int abc_text_size_body_1_material = 2131230784;
+
+ // aapt resource value: 0x7f080041
+ public const int abc_text_size_body_2_material = 2131230785;
+
+ // aapt resource value: 0x7f080042
+ public const int abc_text_size_button_material = 2131230786;
+
+ // aapt resource value: 0x7f080043
+ public const int abc_text_size_caption_material = 2131230787;
+
+ // aapt resource value: 0x7f080044
+ public const int abc_text_size_display_1_material = 2131230788;
+
+ // aapt resource value: 0x7f080045
+ public const int abc_text_size_display_2_material = 2131230789;
+
+ // aapt resource value: 0x7f080046
+ public const int abc_text_size_display_3_material = 2131230790;
+
+ // aapt resource value: 0x7f080047
+ public const int abc_text_size_display_4_material = 2131230791;
+
+ // aapt resource value: 0x7f080048
+ public const int abc_text_size_headline_material = 2131230792;
+
+ // aapt resource value: 0x7f080049
+ public const int abc_text_size_large_material = 2131230793;
+
+ // aapt resource value: 0x7f08004a
+ public const int abc_text_size_medium_material = 2131230794;
+
+ // aapt resource value: 0x7f08004b
+ public const int abc_text_size_menu_header_material = 2131230795;
+
+ // aapt resource value: 0x7f08004c
+ public const int abc_text_size_menu_material = 2131230796;
+
+ // aapt resource value: 0x7f08004d
+ public const int abc_text_size_small_material = 2131230797;
+
+ // aapt resource value: 0x7f08004e
+ public const int abc_text_size_subhead_material = 2131230798;
+
+ // aapt resource value: 0x7f080009
+ public const int abc_text_size_subtitle_material_toolbar = 2131230729;
+
+ // aapt resource value: 0x7f08004f
+ public const int abc_text_size_title_material = 2131230799;
+
+ // aapt resource value: 0x7f08000a
+ public const int abc_text_size_title_material_toolbar = 2131230730;
+
+ // aapt resource value: 0x7f08008b
+ public const int compat_button_inset_horizontal_material = 2131230859;
+
+ // aapt resource value: 0x7f08008c
+ public const int compat_button_inset_vertical_material = 2131230860;
+
+ // aapt resource value: 0x7f08008d
+ public const int compat_button_padding_horizontal_material = 2131230861;
+
+ // aapt resource value: 0x7f08008e
+ public const int compat_button_padding_vertical_material = 2131230862;
+
+ // aapt resource value: 0x7f08008f
+ public const int compat_control_corner_material = 2131230863;
+
+ // aapt resource value: 0x7f080069
+ public const int design_appbar_elevation = 2131230825;
+
+ // aapt resource value: 0x7f08006a
+ public const int design_bottom_navigation_active_item_max_width = 2131230826;
+
+ // aapt resource value: 0x7f08006b
+ public const int design_bottom_navigation_active_text_size = 2131230827;
+
+ // aapt resource value: 0x7f08006c
+ public const int design_bottom_navigation_elevation = 2131230828;
+
+ // aapt resource value: 0x7f08006d
+ public const int design_bottom_navigation_height = 2131230829;
+
+ // aapt resource value: 0x7f08006e
+ public const int design_bottom_navigation_item_max_width = 2131230830;
+
+ // aapt resource value: 0x7f08006f
+ public const int design_bottom_navigation_item_min_width = 2131230831;
- // aapt resource value: 0x7F060030
- public const int abc_panel_menu_list_width = 2131099696;
+ // aapt resource value: 0x7f080070
+ public const int design_bottom_navigation_margin = 2131230832;
- // aapt resource value: 0x7F060031
- public const int abc_progress_bar_height_material = 2131099697;
+ // aapt resource value: 0x7f080071
+ public const int design_bottom_navigation_shadow_height = 2131230833;
- // aapt resource value: 0x7F060032
- public const int abc_search_view_preferred_height = 2131099698;
+ // aapt resource value: 0x7f080072
+ public const int design_bottom_navigation_text_size = 2131230834;
- // aapt resource value: 0x7F060033
- public const int abc_search_view_preferred_width = 2131099699;
+ // aapt resource value: 0x7f080073
+ public const int design_bottom_sheet_modal_elevation = 2131230835;
- // aapt resource value: 0x7F060034
- public const int abc_seekbar_track_background_height_material = 2131099700;
+ // aapt resource value: 0x7f080074
+ public const int design_bottom_sheet_peek_height_min = 2131230836;
- // aapt resource value: 0x7F060035
- public const int abc_seekbar_track_progress_height_material = 2131099701;
+ // aapt resource value: 0x7f080075
+ public const int design_fab_border_width = 2131230837;
- // aapt resource value: 0x7F060036
- public const int abc_select_dialog_padding_start_material = 2131099702;
+ // aapt resource value: 0x7f080076
+ public const int design_fab_elevation = 2131230838;
- // aapt resource value: 0x7F060037
- public const int abc_switch_padding = 2131099703;
+ // aapt resource value: 0x7f080077
+ public const int design_fab_image_size = 2131230839;
- // aapt resource value: 0x7F060038
- public const int abc_text_size_body_1_material = 2131099704;
+ // aapt resource value: 0x7f080078
+ public const int design_fab_size_mini = 2131230840;
- // aapt resource value: 0x7F060039
- public const int abc_text_size_body_2_material = 2131099705;
+ // aapt resource value: 0x7f080079
+ public const int design_fab_size_normal = 2131230841;
- // aapt resource value: 0x7F06003A
- public const int abc_text_size_button_material = 2131099706;
+ // aapt resource value: 0x7f08007a
+ public const int design_fab_translation_z_pressed = 2131230842;
- // aapt resource value: 0x7F06003B
- public const int abc_text_size_caption_material = 2131099707;
+ // aapt resource value: 0x7f08007b
+ public const int design_navigation_elevation = 2131230843;
- // aapt resource value: 0x7F06003C
- public const int abc_text_size_display_1_material = 2131099708;
+ // aapt resource value: 0x7f08007c
+ public const int design_navigation_icon_padding = 2131230844;
- // aapt resource value: 0x7F06003D
- public const int abc_text_size_display_2_material = 2131099709;
+ // aapt resource value: 0x7f08007d
+ public const int design_navigation_icon_size = 2131230845;
- // aapt resource value: 0x7F06003E
- public const int abc_text_size_display_3_material = 2131099710;
+ // aapt resource value: 0x7f080061
+ public const int design_navigation_max_width = 2131230817;
- // aapt resource value: 0x7F06003F
- public const int abc_text_size_display_4_material = 2131099711;
+ // aapt resource value: 0x7f08007e
+ public const int design_navigation_padding_bottom = 2131230846;
- // aapt resource value: 0x7F060040
- public const int abc_text_size_headline_material = 2131099712;
+ // aapt resource value: 0x7f08007f
+ public const int design_navigation_separator_vertical_padding = 2131230847;
- // aapt resource value: 0x7F060041
- public const int abc_text_size_large_material = 2131099713;
+ // aapt resource value: 0x7f080062
+ public const int design_snackbar_action_inline_max_width = 2131230818;
- // aapt resource value: 0x7F060042
- public const int abc_text_size_medium_material = 2131099714;
+ // aapt resource value: 0x7f080063
+ public const int design_snackbar_background_corner_radius = 2131230819;
- // aapt resource value: 0x7F060043
- public const int abc_text_size_menu_header_material = 2131099715;
+ // aapt resource value: 0x7f080080
+ public const int design_snackbar_elevation = 2131230848;
- // aapt resource value: 0x7F060044
- public const int abc_text_size_menu_material = 2131099716;
+ // aapt resource value: 0x7f080064
+ public const int design_snackbar_extra_spacing_horizontal = 2131230820;
- // aapt resource value: 0x7F060045
- public const int abc_text_size_small_material = 2131099717;
+ // aapt resource value: 0x7f080065
+ public const int design_snackbar_max_width = 2131230821;
- // aapt resource value: 0x7F060046
- public const int abc_text_size_subhead_material = 2131099718;
+ // aapt resource value: 0x7f080066
+ public const int design_snackbar_min_width = 2131230822;
- // aapt resource value: 0x7F060047
- public const int abc_text_size_subtitle_material_toolbar = 2131099719;
+ // aapt resource value: 0x7f080081
+ public const int design_snackbar_padding_horizontal = 2131230849;
- // aapt resource value: 0x7F060048
- public const int abc_text_size_title_material = 2131099720;
+ // aapt resource value: 0x7f080082
+ public const int design_snackbar_padding_vertical = 2131230850;
- // aapt resource value: 0x7F060049
- public const int abc_text_size_title_material_toolbar = 2131099721;
+ // aapt resource value: 0x7f080067
+ public const int design_snackbar_padding_vertical_2lines = 2131230823;
- // aapt resource value: 0x7F06004A
- public const int compat_button_inset_horizontal_material = 2131099722;
+ // aapt resource value: 0x7f080083
+ public const int design_snackbar_text_size = 2131230851;
- // aapt resource value: 0x7F06004B
- public const int compat_button_inset_vertical_material = 2131099723;
+ // aapt resource value: 0x7f080084
+ public const int design_tab_max_width = 2131230852;
- // aapt resource value: 0x7F06004C
- public const int compat_button_padding_horizontal_material = 2131099724;
+ // aapt resource value: 0x7f080068
+ public const int design_tab_scrollable_min_width = 2131230824;
- // aapt resource value: 0x7F06004D
- public const int compat_button_padding_vertical_material = 2131099725;
+ // aapt resource value: 0x7f080085
+ public const int design_tab_text_size = 2131230853;
- // aapt resource value: 0x7F06004E
- public const int compat_control_corner_material = 2131099726;
+ // aapt resource value: 0x7f080086
+ public const int design_tab_text_size_2line = 2131230854;
- // aapt resource value: 0x7F06004F
- public const int disabled_alpha_material_dark = 2131099727;
+ // aapt resource value: 0x7f080050
+ public const int disabled_alpha_material_dark = 2131230800;
- // aapt resource value: 0x7F060050
- public const int disabled_alpha_material_light = 2131099728;
+ // aapt resource value: 0x7f080051
+ public const int disabled_alpha_material_light = 2131230801;
- // aapt resource value: 0x7F060051
- public const int fastscroll_default_thickness = 2131099729;
+ // aapt resource value: 0x7f080000
+ public const int fastscroll_default_thickness = 2131230720;
- // aapt resource value: 0x7F060052
- public const int fastscroll_margin = 2131099730;
+ // aapt resource value: 0x7f080001
+ public const int fastscroll_margin = 2131230721;
- // aapt resource value: 0x7F060053
- public const int fastscroll_minimum_range = 2131099731;
+ // aapt resource value: 0x7f080002
+ public const int fastscroll_minimum_range = 2131230722;
- // aapt resource value: 0x7F060054
- public const int fingerprint_icon_size = 2131099732;
+ // aapt resource value: 0x7f08009c
+ public const int fingerprint_icon_size = 2131230876;
- // aapt resource value: 0x7F060055
- public const int fingerprint_status_layout_margin_vertical = 2131099733;
+ // aapt resource value: 0x7f08009b
+ public const int fingerprint_status_layout_margin_vertical = 2131230875;
- // aapt resource value: 0x7F060056
- public const int highlight_alpha_material_colored = 2131099734;
+ // aapt resource value: 0x7f080052
+ public const int highlight_alpha_material_colored = 2131230802;
- // aapt resource value: 0x7F060057
- public const int highlight_alpha_material_dark = 2131099735;
+ // aapt resource value: 0x7f080053
+ public const int highlight_alpha_material_dark = 2131230803;
- // aapt resource value: 0x7F060058
- public const int highlight_alpha_material_light = 2131099736;
+ // aapt resource value: 0x7f080054
+ public const int highlight_alpha_material_light = 2131230804;
- // aapt resource value: 0x7F060059
- public const int hint_alpha_material_dark = 2131099737;
+ // aapt resource value: 0x7f080055
+ public const int hint_alpha_material_dark = 2131230805;
- // aapt resource value: 0x7F06005A
- public const int hint_alpha_material_light = 2131099738;
+ // aapt resource value: 0x7f080056
+ public const int hint_alpha_material_light = 2131230806;
- // aapt resource value: 0x7F06005B
- public const int hint_pressed_alpha_material_dark = 2131099739;
+ // aapt resource value: 0x7f080057
+ public const int hint_pressed_alpha_material_dark = 2131230807;
- // aapt resource value: 0x7F06005C
- public const int hint_pressed_alpha_material_light = 2131099740;
+ // aapt resource value: 0x7f080058
+ public const int hint_pressed_alpha_material_light = 2131230808;
- // aapt resource value: 0x7F06005D
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131099741;
+ // aapt resource value: 0x7f080003
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
- // aapt resource value: 0x7F06005E
- public const int item_touch_helper_swipe_escape_max_velocity = 2131099742;
+ // aapt resource value: 0x7f080004
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
- // aapt resource value: 0x7F06005F
- public const int item_touch_helper_swipe_escape_velocity = 2131099743;
+ // aapt resource value: 0x7f080005
+ public const int item_touch_helper_swipe_escape_velocity = 2131230725;
- // aapt resource value: 0x7F060060
- public const int notification_action_icon_size = 2131099744;
+ // aapt resource value: 0x7f080090
+ public const int notification_action_icon_size = 2131230864;
- // aapt resource value: 0x7F060061
- public const int notification_action_text_size = 2131099745;
+ // aapt resource value: 0x7f080091
+ public const int notification_action_text_size = 2131230865;
- // aapt resource value: 0x7F060062
- public const int notification_big_circle_margin = 2131099746;
+ // aapt resource value: 0x7f080092
+ public const int notification_big_circle_margin = 2131230866;
- // aapt resource value: 0x7F060063
- public const int notification_content_margin_start = 2131099747;
+ // aapt resource value: 0x7f080088
+ public const int notification_content_margin_start = 2131230856;
- // aapt resource value: 0x7F060064
- public const int notification_large_icon_height = 2131099748;
+ // aapt resource value: 0x7f080093
+ public const int notification_large_icon_height = 2131230867;
- // aapt resource value: 0x7F060065
- public const int notification_large_icon_width = 2131099749;
+ // aapt resource value: 0x7f080094
+ public const int notification_large_icon_width = 2131230868;
- // aapt resource value: 0x7F060066
- public const int notification_main_column_padding_top = 2131099750;
+ // aapt resource value: 0x7f080089
+ public const int notification_main_column_padding_top = 2131230857;
- // aapt resource value: 0x7F060067
- public const int notification_media_narrow_margin = 2131099751;
+ // aapt resource value: 0x7f08008a
+ public const int notification_media_narrow_margin = 2131230858;
- // aapt resource value: 0x7F060068
- public const int notification_right_icon_size = 2131099752;
+ // aapt resource value: 0x7f080095
+ public const int notification_right_icon_size = 2131230869;
- // aapt resource value: 0x7F060069
- public const int notification_right_side_padding_top = 2131099753;
+ // aapt resource value: 0x7f080087
+ public const int notification_right_side_padding_top = 2131230855;
- // aapt resource value: 0x7F06006A
- public const int notification_small_icon_background_padding = 2131099754;
+ // aapt resource value: 0x7f080096
+ public const int notification_small_icon_background_padding = 2131230870;
- // aapt resource value: 0x7F06006B
- public const int notification_small_icon_size_as_large = 2131099755;
+ // aapt resource value: 0x7f080097
+ public const int notification_small_icon_size_as_large = 2131230871;
- // aapt resource value: 0x7F06006C
- public const int notification_subtext_size = 2131099756;
+ // aapt resource value: 0x7f080098
+ public const int notification_subtext_size = 2131230872;
- // aapt resource value: 0x7F06006D
- public const int notification_top_pad = 2131099757;
+ // aapt resource value: 0x7f080099
+ public const int notification_top_pad = 2131230873;
- // aapt resource value: 0x7F06006E
- public const int notification_top_pad_large_text = 2131099758;
+ // aapt resource value: 0x7f08009a
+ public const int notification_top_pad_large_text = 2131230874;
- // aapt resource value: 0x7F06006F
- public const int pickerview_textsize = 2131099759;
+ // aapt resource value: 0x7f08009d
+ public const int pickerview_textsize = 2131230877;
- // aapt resource value: 0x7F060070
- public const int pickerview_topbar_btn_textsize = 2131099760;
+ // aapt resource value: 0x7f08009e
+ public const int pickerview_topbar_btn_textsize = 2131230878;
- // aapt resource value: 0x7F060071
- public const int pickerview_topbar_height = 2131099761;
+ // aapt resource value: 0x7f08009f
+ public const int pickerview_topbar_height = 2131230879;
- // aapt resource value: 0x7F060072
- public const int pickerview_topbar_padding = 2131099762;
+ // aapt resource value: 0x7f0800a0
+ public const int pickerview_topbar_padding = 2131230880;
- // aapt resource value: 0x7F060073
- public const int pickerview_topbar_title_textsize = 2131099763;
+ // aapt resource value: 0x7f0800a1
+ public const int pickerview_topbar_title_textsize = 2131230881;
- // aapt resource value: 0x7F060074
- public const int tooltip_corner_radius = 2131099764;
+ // aapt resource value: 0x7f080059
+ public const int tooltip_corner_radius = 2131230809;
- // aapt resource value: 0x7F060075
- public const int tooltip_horizontal_padding = 2131099765;
+ // aapt resource value: 0x7f08005a
+ public const int tooltip_horizontal_padding = 2131230810;
- // aapt resource value: 0x7F060076
- public const int tooltip_margin = 2131099766;
+ // aapt resource value: 0x7f08005b
+ public const int tooltip_margin = 2131230811;
- // aapt resource value: 0x7F060077
- public const int tooltip_precise_anchor_extra_offset = 2131099767;
+ // aapt resource value: 0x7f08005c
+ public const int tooltip_precise_anchor_extra_offset = 2131230812;
- // aapt resource value: 0x7F060078
- public const int tooltip_precise_anchor_threshold = 2131099768;
+ // aapt resource value: 0x7f08005d
+ public const int tooltip_precise_anchor_threshold = 2131230813;
- // aapt resource value: 0x7F060079
- public const int tooltip_vertical_padding = 2131099769;
+ // aapt resource value: 0x7f08005e
+ public const int tooltip_vertical_padding = 2131230814;
- // aapt resource value: 0x7F06007A
- public const int tooltip_y_offset_non_touch = 2131099770;
+ // aapt resource value: 0x7f08005f
+ public const int tooltip_y_offset_non_touch = 2131230815;
- // aapt resource value: 0x7F06007B
- public const int tooltip_y_offset_touch = 2131099771;
+ // aapt resource value: 0x7f080060
+ public const int tooltip_y_offset_touch = 2131230816;
static Dimension()
{
@@ -2104,416 +2525,461 @@
public partial class Drawable
{
- // aapt resource value: 0x7F070000
- public const int abc_ab_share_pack_mtrl_alpha = 2131165184;
+ // aapt resource value: 0x7f020000
+ public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
- // aapt resource value: 0x7F070001
- public const int abc_action_bar_item_background_material = 2131165185;
+ // aapt resource value: 0x7f020001
+ public const int abc_action_bar_item_background_material = 2130837505;
- // aapt resource value: 0x7F070002
- public const int abc_btn_borderless_material = 2131165186;
+ // aapt resource value: 0x7f020002
+ public const int abc_btn_borderless_material = 2130837506;
- // aapt resource value: 0x7F070003
- public const int abc_btn_check_material = 2131165187;
+ // aapt resource value: 0x7f020003
+ public const int abc_btn_check_material = 2130837507;
- // aapt resource value: 0x7F070004
- public const int abc_btn_check_to_on_mtrl_000 = 2131165188;
+ // aapt resource value: 0x7f020004
+ public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
- // aapt resource value: 0x7F070005
- public const int abc_btn_check_to_on_mtrl_015 = 2131165189;
+ // aapt resource value: 0x7f020005
+ public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
- // aapt resource value: 0x7F070006
- public const int abc_btn_colored_material = 2131165190;
+ // aapt resource value: 0x7f020006
+ public const int abc_btn_colored_material = 2130837510;
- // aapt resource value: 0x7F070007
- public const int abc_btn_default_mtrl_shape = 2131165191;
+ // aapt resource value: 0x7f020007
+ public const int abc_btn_default_mtrl_shape = 2130837511;
- // aapt resource value: 0x7F070008
- public const int abc_btn_radio_material = 2131165192;
+ // aapt resource value: 0x7f020008
+ public const int abc_btn_radio_material = 2130837512;
- // aapt resource value: 0x7F070009
- public const int abc_btn_radio_to_on_mtrl_000 = 2131165193;
+ // aapt resource value: 0x7f020009
+ public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
- // aapt resource value: 0x7F07000A
- public const int abc_btn_radio_to_on_mtrl_015 = 2131165194;
+ // aapt resource value: 0x7f02000a
+ public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
- // aapt resource value: 0x7F07000B
- public const int abc_btn_switch_to_on_mtrl_00001 = 2131165195;
+ // aapt resource value: 0x7f02000b
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
- // aapt resource value: 0x7F07000C
- public const int abc_btn_switch_to_on_mtrl_00012 = 2131165196;
+ // aapt resource value: 0x7f02000c
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
- // aapt resource value: 0x7F07000D
- public const int abc_cab_background_internal_bg = 2131165197;
+ // aapt resource value: 0x7f02000d
+ public const int abc_cab_background_internal_bg = 2130837517;
- // aapt resource value: 0x7F07000E
- public const int abc_cab_background_top_material = 2131165198;
+ // aapt resource value: 0x7f02000e
+ public const int abc_cab_background_top_material = 2130837518;
- // aapt resource value: 0x7F07000F
- public const int abc_cab_background_top_mtrl_alpha = 2131165199;
+ // aapt resource value: 0x7f02000f
+ public const int abc_cab_background_top_mtrl_alpha = 2130837519;
- // aapt resource value: 0x7F070010
- public const int abc_control_background_material = 2131165200;
+ // aapt resource value: 0x7f020010
+ public const int abc_control_background_material = 2130837520;
- // aapt resource value: 0x7F070011
- public const int abc_dialog_material_background = 2131165201;
+ // aapt resource value: 0x7f020011
+ public const int abc_dialog_material_background = 2130837521;
- // aapt resource value: 0x7F070012
- public const int abc_edit_text_material = 2131165202;
+ // aapt resource value: 0x7f020012
+ public const int abc_edit_text_material = 2130837522;
- // aapt resource value: 0x7F070013
- public const int abc_ic_ab_back_material = 2131165203;
+ // aapt resource value: 0x7f020013
+ public const int abc_ic_ab_back_material = 2130837523;
- // aapt resource value: 0x7F070014
- public const int abc_ic_arrow_drop_right_black_24dp = 2131165204;
+ // aapt resource value: 0x7f020014
+ public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
- // aapt resource value: 0x7F070015
- public const int abc_ic_clear_material = 2131165205;
+ // aapt resource value: 0x7f020015
+ public const int abc_ic_clear_material = 2130837525;
- // aapt resource value: 0x7F070016
- public const int abc_ic_commit_search_api_mtrl_alpha = 2131165206;
+ // aapt resource value: 0x7f020016
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
- // aapt resource value: 0x7F070017
- public const int abc_ic_go_search_api_material = 2131165207;
+ // aapt resource value: 0x7f020017
+ public const int abc_ic_go_search_api_material = 2130837527;
- // aapt resource value: 0x7F070018
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2131165208;
+ // aapt resource value: 0x7f020018
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
- // aapt resource value: 0x7F070019
- public const int abc_ic_menu_cut_mtrl_alpha = 2131165209;
+ // aapt resource value: 0x7f020019
+ public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
- // aapt resource value: 0x7F07001A
- public const int abc_ic_menu_overflow_material = 2131165210;
+ // aapt resource value: 0x7f02001a
+ public const int abc_ic_menu_overflow_material = 2130837530;
- // aapt resource value: 0x7F07001B
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2131165211;
+ // aapt resource value: 0x7f02001b
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
- // aapt resource value: 0x7F07001C
- public const int abc_ic_menu_selectall_mtrl_alpha = 2131165212;
+ // aapt resource value: 0x7f02001c
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
- // aapt resource value: 0x7F07001D
- public const int abc_ic_menu_share_mtrl_alpha = 2131165213;
+ // aapt resource value: 0x7f02001d
+ public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
- // aapt resource value: 0x7F07001E
- public const int abc_ic_search_api_material = 2131165214;
+ // aapt resource value: 0x7f02001e
+ public const int abc_ic_search_api_material = 2130837534;
- // aapt resource value: 0x7F07001F
- public const int abc_ic_star_black_16dp = 2131165215;
+ // aapt resource value: 0x7f02001f
+ public const int abc_ic_star_black_16dp = 2130837535;
- // aapt resource value: 0x7F070020
- public const int abc_ic_star_black_36dp = 2131165216;
+ // aapt resource value: 0x7f020020
+ public const int abc_ic_star_black_36dp = 2130837536;
- // aapt resource value: 0x7F070021
- public const int abc_ic_star_black_48dp = 2131165217;
+ // aapt resource value: 0x7f020021
+ public const int abc_ic_star_black_48dp = 2130837537;
- // aapt resource value: 0x7F070022
- public const int abc_ic_star_half_black_16dp = 2131165218;
+ // aapt resource value: 0x7f020022
+ public const int abc_ic_star_half_black_16dp = 2130837538;
- // aapt resource value: 0x7F070023
- public const int abc_ic_star_half_black_36dp = 2131165219;
+ // aapt resource value: 0x7f020023
+ public const int abc_ic_star_half_black_36dp = 2130837539;
- // aapt resource value: 0x7F070024
- public const int abc_ic_star_half_black_48dp = 2131165220;
+ // aapt resource value: 0x7f020024
+ public const int abc_ic_star_half_black_48dp = 2130837540;
- // aapt resource value: 0x7F070025
- public const int abc_ic_voice_search_api_material = 2131165221;
+ // aapt resource value: 0x7f020025
+ public const int abc_ic_voice_search_api_material = 2130837541;
- // aapt resource value: 0x7F070026
- public const int abc_item_background_holo_dark = 2131165222;
+ // aapt resource value: 0x7f020026
+ public const int abc_item_background_holo_dark = 2130837542;
- // aapt resource value: 0x7F070027
- public const int abc_item_background_holo_light = 2131165223;
+ // aapt resource value: 0x7f020027
+ public const int abc_item_background_holo_light = 2130837543;
- // aapt resource value: 0x7F070028
- public const int abc_list_divider_mtrl_alpha = 2131165224;
+ // aapt resource value: 0x7f020028
+ public const int abc_list_divider_mtrl_alpha = 2130837544;
- // aapt resource value: 0x7F070029
- public const int abc_list_focused_holo = 2131165225;
+ // aapt resource value: 0x7f020029
+ public const int abc_list_focused_holo = 2130837545;
- // aapt resource value: 0x7F07002A
- public const int abc_list_longpressed_holo = 2131165226;
+ // aapt resource value: 0x7f02002a
+ public const int abc_list_longpressed_holo = 2130837546;
- // aapt resource value: 0x7F07002B
- public const int abc_list_pressed_holo_dark = 2131165227;
+ // aapt resource value: 0x7f02002b
+ public const int abc_list_pressed_holo_dark = 2130837547;
- // aapt resource value: 0x7F07002C
- public const int abc_list_pressed_holo_light = 2131165228;
+ // aapt resource value: 0x7f02002c
+ public const int abc_list_pressed_holo_light = 2130837548;
- // aapt resource value: 0x7F07002D
- public const int abc_list_selector_background_transition_holo_dark = 2131165229;
+ // aapt resource value: 0x7f02002d
+ public const int abc_list_selector_background_transition_holo_dark = 2130837549;
- // aapt resource value: 0x7F07002E
- public const int abc_list_selector_background_transition_holo_light = 2131165230;
+ // aapt resource value: 0x7f02002e
+ public const int abc_list_selector_background_transition_holo_light = 2130837550;
- // aapt resource value: 0x7F07002F
- public const int abc_list_selector_disabled_holo_dark = 2131165231;
+ // aapt resource value: 0x7f02002f
+ public const int abc_list_selector_disabled_holo_dark = 2130837551;
- // aapt resource value: 0x7F070030
- public const int abc_list_selector_disabled_holo_light = 2131165232;
+ // aapt resource value: 0x7f020030
+ public const int abc_list_selector_disabled_holo_light = 2130837552;
- // aapt resource value: 0x7F070031
- public const int abc_list_selector_holo_dark = 2131165233;
+ // aapt resource value: 0x7f020031
+ public const int abc_list_selector_holo_dark = 2130837553;
- // aapt resource value: 0x7F070032
- public const int abc_list_selector_holo_light = 2131165234;
+ // aapt resource value: 0x7f020032
+ public const int abc_list_selector_holo_light = 2130837554;
- // aapt resource value: 0x7F070033
- public const int abc_menu_hardkey_panel_mtrl_mult = 2131165235;
+ // aapt resource value: 0x7f020033
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
- // aapt resource value: 0x7F070034
- public const int abc_popup_background_mtrl_mult = 2131165236;
+ // aapt resource value: 0x7f020034
+ public const int abc_popup_background_mtrl_mult = 2130837556;
- // aapt resource value: 0x7F070035
- public const int abc_ratingbar_indicator_material = 2131165237;
+ // aapt resource value: 0x7f020035
+ public const int abc_ratingbar_indicator_material = 2130837557;
- // aapt resource value: 0x7F070036
- public const int abc_ratingbar_material = 2131165238;
+ // aapt resource value: 0x7f020036
+ public const int abc_ratingbar_material = 2130837558;
- // aapt resource value: 0x7F070037
- public const int abc_ratingbar_small_material = 2131165239;
+ // aapt resource value: 0x7f020037
+ public const int abc_ratingbar_small_material = 2130837559;
- // aapt resource value: 0x7F070038
- public const int abc_scrubber_control_off_mtrl_alpha = 2131165240;
+ // aapt resource value: 0x7f020038
+ public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
- // aapt resource value: 0x7F070039
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131165241;
+ // aapt resource value: 0x7f020039
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
- // aapt resource value: 0x7F07003A
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131165242;
+ // aapt resource value: 0x7f02003a
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
- // aapt resource value: 0x7F07003B
- public const int abc_scrubber_primary_mtrl_alpha = 2131165243;
+ // aapt resource value: 0x7f02003b
+ public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
- // aapt resource value: 0x7F07003C
- public const int abc_scrubber_track_mtrl_alpha = 2131165244;
+ // aapt resource value: 0x7f02003c
+ public const int abc_scrubber_track_mtrl_alpha = 2130837564;
- // aapt resource value: 0x7F07003D
- public const int abc_seekbar_thumb_material = 2131165245;
+ // aapt resource value: 0x7f02003d
+ public const int abc_seekbar_thumb_material = 2130837565;
- // aapt resource value: 0x7F07003E
- public const int abc_seekbar_tick_mark_material = 2131165246;
+ // aapt resource value: 0x7f02003e
+ public const int abc_seekbar_tick_mark_material = 2130837566;
- // aapt resource value: 0x7F07003F
- public const int abc_seekbar_track_material = 2131165247;
+ // aapt resource value: 0x7f02003f
+ public const int abc_seekbar_track_material = 2130837567;
+
+ // aapt resource value: 0x7f020040
+ public const int abc_spinner_mtrl_am_alpha = 2130837568;
+
+ // aapt resource value: 0x7f020041
+ public const int abc_spinner_textfield_background_material = 2130837569;
+
+ // aapt resource value: 0x7f020042
+ public const int abc_switch_thumb_material = 2130837570;
+
+ // aapt resource value: 0x7f020043
+ public const int abc_switch_track_mtrl_alpha = 2130837571;
+
+ // aapt resource value: 0x7f020044
+ public const int abc_tab_indicator_material = 2130837572;
+
+ // aapt resource value: 0x7f020045
+ public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+
+ // aapt resource value: 0x7f020046
+ public const int abc_text_cursor_material = 2130837574;
+
+ // aapt resource value: 0x7f020047
+ public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+
+ // aapt resource value: 0x7f020048
+ public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+
+ // aapt resource value: 0x7f020049
+ public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+
+ // aapt resource value: 0x7f02004a
+ public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+
+ // aapt resource value: 0x7f02004b
+ public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
+
+ // aapt resource value: 0x7f02004c
+ public const int abc_text_select_handle_right_mtrl_light = 2130837580;
+
+ // aapt resource value: 0x7f02004d
+ public const int abc_textfield_activated_mtrl_alpha = 2130837581;
+
+ // aapt resource value: 0x7f02004e
+ public const int abc_textfield_default_mtrl_alpha = 2130837582;
- // aapt resource value: 0x7F070040
- public const int abc_spinner_mtrl_am_alpha = 2131165248;
+ // aapt resource value: 0x7f02004f
+ public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
- // aapt resource value: 0x7F070041
- public const int abc_spinner_textfield_background_material = 2131165249;
+ // aapt resource value: 0x7f020050
+ public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
- // aapt resource value: 0x7F070042
- public const int abc_switch_thumb_material = 2131165250;
+ // aapt resource value: 0x7f020051
+ public const int abc_textfield_search_material = 2130837585;
- // aapt resource value: 0x7F070043
- public const int abc_switch_track_mtrl_alpha = 2131165251;
+ // aapt resource value: 0x7f020052
+ public const int abc_vector_test = 2130837586;
- // aapt resource value: 0x7F070044
- public const int abc_tab_indicator_material = 2131165252;
+ // aapt resource value: 0x7f020053
+ public const int avd_hide_password = 2130837587;
- // aapt resource value: 0x7F070045
- public const int abc_tab_indicator_mtrl_alpha = 2131165253;
+ // aapt resource value: 0x7f020092
+ public const int avd_hide_password_1 = 2130837650;
- // aapt resource value: 0x7F07004D
- public const int abc_textfield_activated_mtrl_alpha = 2131165261;
+ // aapt resource value: 0x7f020093
+ public const int avd_hide_password_2 = 2130837651;
- // aapt resource value: 0x7F07004E
- public const int abc_textfield_default_mtrl_alpha = 2131165262;
+ // aapt resource value: 0x7f020094
+ public const int avd_hide_password_3 = 2130837652;
- // aapt resource value: 0x7F07004F
- public const int abc_textfield_search_activated_mtrl_alpha = 2131165263;
+ // aapt resource value: 0x7f020054
+ public const int avd_show_password = 2130837588;
- // aapt resource value: 0x7F070050
- public const int abc_textfield_search_default_mtrl_alpha = 2131165264;
+ // aapt resource value: 0x7f020095
+ public const int avd_show_password_1 = 2130837653;
- // aapt resource value: 0x7F070051
- public const int abc_textfield_search_material = 2131165265;
+ // aapt resource value: 0x7f020096
+ public const int avd_show_password_2 = 2130837654;
- // aapt resource value: 0x7F070046
- public const int abc_text_cursor_material = 2131165254;
+ // aapt resource value: 0x7f020097
+ public const int avd_show_password_3 = 2130837655;
- // aapt resource value: 0x7F070047
- public const int abc_text_select_handle_left_mtrl_dark = 2131165255;
+ // aapt resource value: 0x7f020055
+ public const int design_bottom_navigation_item_background = 2130837589;
- // aapt resource value: 0x7F070048
- public const int abc_text_select_handle_left_mtrl_light = 2131165256;
+ // aapt resource value: 0x7f020056
+ public const int design_fab_background = 2130837590;
- // aapt resource value: 0x7F070049
- public const int abc_text_select_handle_middle_mtrl_dark = 2131165257;
+ // aapt resource value: 0x7f020057
+ public const int design_ic_visibility = 2130837591;
- // aapt resource value: 0x7F07004A
- public const int abc_text_select_handle_middle_mtrl_light = 2131165258;
+ // aapt resource value: 0x7f020058
+ public const int design_ic_visibility_off = 2130837592;
- // aapt resource value: 0x7F07004B
- public const int abc_text_select_handle_right_mtrl_dark = 2131165259;
+ // aapt resource value: 0x7f020059
+ public const int design_password_eye = 2130837593;
- // aapt resource value: 0x7F07004C
- public const int abc_text_select_handle_right_mtrl_light = 2131165260;
+ // aapt resource value: 0x7f02005a
+ public const int design_snackbar_background = 2130837594;
- // aapt resource value: 0x7F070052
- public const int abc_vector_test = 2131165266;
+ // aapt resource value: 0x7f02005b
+ public const int fingerprint_draw_off = 2130837595;
- // aapt resource value: 0x7F070053
- public const int fingerprint_draw_off = 2131165267;
+ // aapt resource value: 0x7f02005c
+ public const int fingerprint_draw_off_animation = 2130837596;
- // aapt resource value: 0x7F070054
- public const int fingerprint_draw_off_animation = 2131165268;
+ // aapt resource value: 0x7f02005d
+ public const int fingerprint_draw_on = 2130837597;
- // aapt resource value: 0x7F070055
- public const int fingerprint_draw_on = 2131165269;
+ // aapt resource value: 0x7f02005e
+ public const int fingerprint_draw_on_animation = 2130837598;
- // aapt resource value: 0x7F070056
- public const int fingerprint_draw_on_animation = 2131165270;
+ // aapt resource value: 0x7f02005f
+ public const int fingerprint_error = 2130837599;
- // aapt resource value: 0x7F070057
- public const int fingerprint_error = 2131165271;
+ // aapt resource value: 0x7f020060
+ public const int fingerprint_error_off = 2130837600;
- // aapt resource value: 0x7F070058
- public const int fingerprint_error_off = 2131165272;
+ // aapt resource value: 0x7f020061
+ public const int fingerprint_error_off_animation = 2130837601;
- // aapt resource value: 0x7F070059
- public const int fingerprint_error_off_animation = 2131165273;
+ // aapt resource value: 0x7f020062
+ public const int fingerprint_error_on = 2130837602;
- // aapt resource value: 0x7F07005A
- public const int fingerprint_error_on = 2131165274;
+ // aapt resource value: 0x7f020063
+ public const int fingerprint_error_on_animation = 2130837603;
- // aapt resource value: 0x7F07005B
- public const int fingerprint_error_on_animation = 2131165275;
+ // aapt resource value: 0x7f020064
+ public const int fingerprint_error_state_to_fp = 2130837604;
- // aapt resource value: 0x7F07005C
- public const int fingerprint_error_state_to_fp = 2131165276;
+ // aapt resource value: 0x7f020065
+ public const int fingerprint_error_state_to_fp_animation = 2130837605;
- // aapt resource value: 0x7F07005D
- public const int fingerprint_error_state_to_fp_animation = 2131165277;
+ // aapt resource value: 0x7f020066
+ public const int fingerprint_fingerprint = 2130837606;
- // aapt resource value: 0x7F07005E
- public const int fingerprint_fingerprint = 2131165278;
+ // aapt resource value: 0x7f020067
+ public const int fingerprint_fp_to_error_state = 2130837607;
- // aapt resource value: 0x7F07005F
- public const int fingerprint_fp_to_error_state = 2131165279;
+ // aapt resource value: 0x7f020068
+ public const int fingerprint_fp_to_error_state_animation = 2130837608;
- // aapt resource value: 0x7F070060
- public const int fingerprint_fp_to_error_state_animation = 2131165280;
+ // aapt resource value: 0x7f020069
+ public const int gd_btn_shape_app_b = 2130837609;
- // aapt resource value: 0x7F070061
- public const int gd_btn_shape_app_b = 2131165281;
+ // aapt resource value: 0x7f02006a
+ public const int gd_btn_shape_app_g = 2130837610;
- // aapt resource value: 0x7F070062
- public const int gd_btn_shape_app_g = 2131165282;
+ // aapt resource value: 0x7f02006b
+ public const int gd_btn_shape_app_w = 2130837611;
- // aapt resource value: 0x7F070063
- public const int gd_btn_shape_app_w = 2131165283;
+ // aapt resource value: 0x7f02006c
+ public const int gd_btn_shape_shadow_w = 2130837612;
- // aapt resource value: 0x7F070064
- public const int gd_btn_shape_shadow_w = 2131165284;
+ // aapt resource value: 0x7f02006d
+ public const int gd_click_effect_select = 2130837613;
- // aapt resource value: 0x7F070065
- public const int gd_click_effect_select = 2131165285;
+ // aapt resource value: 0x7f02006e
+ public const int ic_gdmap_add = 2130837614;
- // aapt resource value: 0x7F070078
- public const int Icon = 2131165304;
+ // aapt resource value: 0x7f02006f
+ public const int ic_gdmap_back = 2130837615;
- // aapt resource value: 0x7F070066
- public const int ic_gdmap_add = 2131165286;
+ // aapt resource value: 0x7f020070
+ public const int ic_gdmap_delete = 2130837616;
- // aapt resource value: 0x7F070067
- public const int ic_gdmap_back = 2131165287;
+ // aapt resource value: 0x7f020071
+ public const int ic_gdmap_home = 2130837617;
- // aapt resource value: 0x7F070068
- public const int ic_gdmap_delete = 2131165288;
+ // aapt resource value: 0x7f020072
+ public const int ic_gdmap_mylocation = 2130837618;
- // aapt resource value: 0x7F070069
- public const int ic_gdmap_home = 2131165289;
+ // aapt resource value: 0x7f020073
+ public const int ic_gdmap_now = 2130837619;
- // aapt resource value: 0x7F07006A
- public const int ic_gdmap_mylocation = 2131165290;
+ // aapt resource value: 0x7f020074
+ public const int ic_gdmap_search = 2130837620;
- // aapt resource value: 0x7F07006B
- public const int ic_gdmap_now = 2131165291;
+ // aapt resource value: 0x7f020075
+ public const int ic_gdmap_zoom_out = 2130837621;
- // aapt resource value: 0x7F07006C
- public const int ic_gdmap_search = 2131165292;
+ // aapt resource value: 0x7f020076
+ public const int ic_gps_point = 2130837622;
- // aapt resource value: 0x7F07006D
- public const int ic_gdmap_zoom_out = 2131165293;
+ // aapt resource value: 0x7f020077
+ public const int ic_wd_arc_scale_bg = 2130837623;
- // aapt resource value: 0x7F07006E
- public const int ic_gps_point = 2131165294;
+ // aapt resource value: 0x7f020078
+ public const int ic_wd_curtain_bg_top = 2130837624;
- // aapt resource value: 0x7F07006F
- public const int ic_wd_arc_scale_bg = 2131165295;
+ // aapt resource value: 0x7f020079
+ public const int ic_wd_curtain_h_bg = 2130837625;
- // aapt resource value: 0x7F070070
- public const int ic_wd_curtain_bg_top = 2131165296;
+ // aapt resource value: 0x7f02007a
+ public const int ic_wd_curtain_h_open = 2130837626;
- // aapt resource value: 0x7F070071
- public const int ic_wd_curtain_h_bg = 2131165297;
+ // aapt resource value: 0x7f02007b
+ public const int ic_wd_curtain_h_progress = 2130837627;
- // aapt resource value: 0x7F070072
- public const int ic_wd_curtain_h_open = 2131165298;
+ // aapt resource value: 0x7f02007c
+ public const int ic_wd_curtain_h_top = 2130837628;
- // aapt resource value: 0x7F070073
- public const int ic_wd_curtain_h_progress = 2131165299;
+ // aapt resource value: 0x7f02007d
+ public const int ic_wd_curtain_open = 2130837629;
- // aapt resource value: 0x7F070074
- public const int ic_wd_curtain_h_top = 2131165300;
+ // aapt resource value: 0x7f02007e
+ public const int ic_wd_curtain_roll_bg = 2130837630;
- // aapt resource value: 0x7F070075
- public const int ic_wd_curtain_open = 2131165301;
+ // aapt resource value: 0x7f02007f
+ public const int ic_wd_curtain_roll_progress = 2130837631;
- // aapt resource value: 0x7F070076
- public const int ic_wd_curtain_roll_bg = 2131165302;
+ // aapt resource value: 0x7f020080
+ public const int Icon = 2130837632;
- // aapt resource value: 0x7F070077
- public const int ic_wd_curtain_roll_progress = 2131165303;
+ // aapt resource value: 0x7f020081
+ public const int Loading = 2130837633;
- // aapt resource value: 0x7F070079
- public const int Loading = 2131165305;
+ // aapt resource value: 0x7f020082
+ public const int navigation_empty_icon = 2130837634;
- // aapt resource value: 0x7F07007A
- public const int notification_action_background = 2131165306;
+ // aapt resource value: 0x7f020083
+ public const int notification_action_background = 2130837635;
- // aapt resource value: 0x7F07007B
- public const int notification_bg = 2131165307;
+ // aapt resource value: 0x7f020084
+ public const int notification_bg = 2130837636;
- // aapt resource value: 0x7F07007C
- public const int notification_bg_low = 2131165308;
+ // aapt resource value: 0x7f020085
+ public const int notification_bg_low = 2130837637;
- // aapt resource value: 0x7F07007D
- public const int notification_bg_low_normal = 2131165309;
+ // aapt resource value: 0x7f020086
+ public const int notification_bg_low_normal = 2130837638;
- // aapt resource value: 0x7F07007E
- public const int notification_bg_low_pressed = 2131165310;
+ // aapt resource value: 0x7f020087
+ public const int notification_bg_low_pressed = 2130837639;
- // aapt resource value: 0x7F07007F
- public const int notification_bg_normal = 2131165311;
+ // aapt resource value: 0x7f020088
+ public const int notification_bg_normal = 2130837640;
- // aapt resource value: 0x7F070080
- public const int notification_bg_normal_pressed = 2131165312;
+ // aapt resource value: 0x7f020089
+ public const int notification_bg_normal_pressed = 2130837641;
- // aapt resource value: 0x7F070081
- public const int notification_icon_background = 2131165313;
+ // aapt resource value: 0x7f02008a
+ public const int notification_icon_background = 2130837642;
- // aapt resource value: 0x7F070082
- public const int notification_template_icon_bg = 2131165314;
+ // aapt resource value: 0x7f020090
+ public const int notification_template_icon_bg = 2130837648;
- // aapt resource value: 0x7F070083
- public const int notification_template_icon_low_bg = 2131165315;
+ // aapt resource value: 0x7f020091
+ public const int notification_template_icon_low_bg = 2130837649;
- // aapt resource value: 0x7F070084
- public const int notification_tile_bg = 2131165316;
+ // aapt resource value: 0x7f02008b
+ public const int notification_tile_bg = 2130837643;
- // aapt resource value: 0x7F070085
- public const int notify_panel_notification_icon_bg = 2131165317;
+ // aapt resource value: 0x7f02008c
+ public const int notify_panel_notification_icon_bg = 2130837644;
- // aapt resource value: 0x7F070086
- public const int selector_pickerview_btn = 2131165318;
+ // aapt resource value: 0x7f02008d
+ public const int selector_pickerview_btn = 2130837645;
- // aapt resource value: 0x7F070087
- public const int tooltip_frame_dark = 2131165319;
+ // aapt resource value: 0x7f02008e
+ public const int tooltip_frame_dark = 2130837646;
- // aapt resource value: 0x7F070088
- public const int tooltip_frame_light = 2131165320;
+ // aapt resource value: 0x7f02008f
+ public const int tooltip_frame_light = 2130837647;
static Drawable()
{
@@ -2528,539 +2994,689 @@
public partial class Id
{
- // aapt resource value: 0x7F08000E
- public const int action0 = 2131230734;
+ // aapt resource value: 0x7f090027
+ public const int ALT = 2131296295;
- // aapt resource value: 0x7F080020
- public const int actions = 2131230752;
+ // aapt resource value: 0x7f090028
+ public const int CTRL = 2131296296;
- // aapt resource value: 0x7F08000F
- public const int action_bar = 2131230735;
+ // aapt resource value: 0x7f09008e
+ public const int Custom = 2131296398;
- // aapt resource value: 0x7F080010
- public const int action_bar_activity_content = 2131230736;
+ // aapt resource value: 0x7f09008d
+ public const int CustomLabel = 2131296397;
- // aapt resource value: 0x7F080011
- public const int action_bar_container = 2131230737;
+ // aapt resource value: 0x7f090054
+ public const int FILL = 2131296340;
- // aapt resource value: 0x7F080012
- public const int action_bar_root = 2131230738;
+ // aapt resource value: 0x7f090055
+ public const int FILL_STROKE = 2131296341;
- // aapt resource value: 0x7F080013
- public const int action_bar_spinner = 2131230739;
+ // aapt resource value: 0x7f090029
+ public const int FUNCTION = 2131296297;
- // aapt resource value: 0x7F080014
- public const int action_bar_subtitle = 2131230740;
+ // aapt resource value: 0x7f09004f
+ public const int FixedBehind = 2131296335;
- // aapt resource value: 0x7F080015
- public const int action_bar_title = 2131230741;
+ // aapt resource value: 0x7f090050
+ public const int FixedFront = 2131296336;
- // aapt resource value: 0x7F080016
- public const int action_container = 2131230742;
+ // aapt resource value: 0x7f09002a
+ public const int META = 2131296298;
- // aapt resource value: 0x7F080017
- public const int action_context_bar = 2131230743;
+ // aapt resource value: 0x7f090051
+ public const int MatchLayout = 2131296337;
- // aapt resource value: 0x7F080018
- public const int action_divider = 2131230744;
+ // aapt resource value: 0x7f090088
+ public const int Notice = 2131296392;
- // aapt resource value: 0x7F080019
- public const int action_image = 2131230745;
+ // aapt resource value: 0x7f09008c
+ public const int Password = 2131296396;
- // aapt resource value: 0x7F08001A
- public const int action_menu_divider = 2131230746;
+ // aapt resource value: 0x7f09008b
+ public const int PasswordLabel = 2131296395;
- // aapt resource value: 0x7F08001B
- public const int action_menu_presenter = 2131230747;
+ // aapt resource value: 0x7f09002b
+ public const int SHIFT = 2131296299;
- // aapt resource value: 0x7F08001C
- public const int action_mode_bar = 2131230748;
+ // aapt resource value: 0x7f09008a
+ public const int SSID = 2131296394;
- // aapt resource value: 0x7F08001D
- public const int action_mode_bar_stub = 2131230749;
+ // aapt resource value: 0x7f090089
+ public const int SSIDLabel = 2131296393;
- // aapt resource value: 0x7F08001E
- public const int action_mode_close_button = 2131230750;
+ // aapt resource value: 0x7f090056
+ public const int STROKE = 2131296342;
- // aapt resource value: 0x7F08001F
- public const int action_text = 2131230751;
+ // aapt resource value: 0x7f09002c
+ public const int SYM = 2131296300;
- // aapt resource value: 0x7F080021
- public const int activity_chooser_view_content = 2131230753;
+ // aapt resource value: 0x7f090052
+ public const int Scale = 2131296338;
- // aapt resource value: 0x7F080022
- public const int add = 2131230754;
+ // aapt resource value: 0x7f090053
+ public const int Translate = 2131296339;
- // aapt resource value: 0x7F080023
- public const int alertTitle = 2131230755;
+ // aapt resource value: 0x7f0900cb
+ public const int action0 = 2131296459;
- // aapt resource value: 0x7F080000
- public const int ALT = 2131230720;
+ // aapt resource value: 0x7f090079
+ public const int action_bar = 2131296377;
- // aapt resource value: 0x7F080024
- public const int always = 2131230756;
+ // aapt resource value: 0x7f090001
+ public const int action_bar_activity_content = 2131296257;
- // aapt resource value: 0x7F080025
- public const int async = 2131230757;
+ // aapt resource value: 0x7f090078
+ public const int action_bar_container = 2131296376;
- // aapt resource value: 0x7F080026
- public const int beginning = 2131230758;
+ // aapt resource value: 0x7f090074
+ public const int action_bar_root = 2131296372;
- // aapt resource value: 0x7F080027
- public const int blocking = 2131230759;
+ // aapt resource value: 0x7f090002
+ public const int action_bar_spinner = 2131296258;
- // aapt resource value: 0x7F080028
- public const int bottom = 2131230760;
+ // aapt resource value: 0x7f090058
+ public const int action_bar_subtitle = 2131296344;
- // aapt resource value: 0x7F080029
- public const int btnCancel = 2131230761;
+ // aapt resource value: 0x7f090057
+ public const int action_bar_title = 2131296343;
- // aapt resource value: 0x7F08002A
- public const int btnSubmit = 2131230762;
+ // aapt resource value: 0x7f0900c8
+ public const int action_container = 2131296456;
- // aapt resource value: 0x7F08002B
- public const int buttonPanel = 2131230763;
+ // aapt resource value: 0x7f09007a
+ public const int action_context_bar = 2131296378;
- // aapt resource value: 0x7F08002C
- public const int cancel_action = 2131230764;
+ // aapt resource value: 0x7f0900cf
+ public const int action_divider = 2131296463;
- // aapt resource value: 0x7F08002D
- public const int center = 2131230765;
+ // aapt resource value: 0x7f0900c9
+ public const int action_image = 2131296457;
- // aapt resource value: 0x7F08002E
- public const int checkbox = 2131230766;
+ // aapt resource value: 0x7f090003
+ public const int action_menu_divider = 2131296259;
- // aapt resource value: 0x7F08002F
- public const int chronometer = 2131230767;
+ // aapt resource value: 0x7f090004
+ public const int action_menu_presenter = 2131296260;
- // aapt resource value: 0x7F080030
- public const int collapseActionView = 2131230768;
+ // aapt resource value: 0x7f090076
+ public const int action_mode_bar = 2131296374;
- // aapt resource value: 0x7F080031
- public const int contentFrame = 2131230769;
+ // aapt resource value: 0x7f090075
+ public const int action_mode_bar_stub = 2131296373;
- // aapt resource value: 0x7F080032
- public const int contentPanel = 2131230770;
+ // aapt resource value: 0x7f090059
+ public const int action_mode_close_button = 2131296345;
- // aapt resource value: 0x7F080033
- public const int content_container = 2131230771;
+ // aapt resource value: 0x7f0900ca
+ public const int action_text = 2131296458;
- // aapt resource value: 0x7F080001
- public const int CTRL = 2131230721;
+ // aapt resource value: 0x7f0900d8
+ public const int actions = 2131296472;
- // aapt resource value: 0x7F080034
- public const int custom = 2131230772;
+ // aapt resource value: 0x7f09005a
+ public const int activity_chooser_view_content = 2131296346;
- // aapt resource value: 0x7F080035
- public const int customPanel = 2131230773;
+ // aapt resource value: 0x7f090021
+ public const int add = 2131296289;
- // aapt resource value: 0x7F080036
- public const int day = 2131230774;
+ // aapt resource value: 0x7f09006d
+ public const int alertTitle = 2131296365;
- // aapt resource value: 0x7F080037
- public const int decor_content_parent = 2131230775;
+ // aapt resource value: 0x7f090047
+ public const int all = 2131296327;
- // aapt resource value: 0x7F080038
- public const int default_activity_button = 2131230776;
+ // aapt resource value: 0x7f09002d
+ public const int always = 2131296301;
- // aapt resource value: 0x7F080039
- public const int description = 2131230777;
+ // aapt resource value: 0x7f09004b
+ public const int async = 2131296331;
- // aapt resource value: 0x7F08003A
- public const int disableHome = 2131230778;
+ // aapt resource value: 0x7f090039
+ public const int auto = 2131296313;
- // aapt resource value: 0x7F08003B
- public const int edit_query = 2131230779;
+ // aapt resource value: 0x7f090024
+ public const int beginning = 2131296292;
- // aapt resource value: 0x7F08003C
- public const int end = 2131230780;
+ // aapt resource value: 0x7f09004c
+ public const int blocking = 2131296332;
- // aapt resource value: 0x7F08003D
- public const int end_padder = 2131230781;
+ // aapt resource value: 0x7f090032
+ public const int bottom = 2131296306;
- // aapt resource value: 0x7F08003F
- public const int expanded_menu = 2131230783;
+ // aapt resource value: 0x7f0900b3
+ public const int btnCancel = 2131296435;
- // aapt resource value: 0x7F08003E
- public const int expand_activities_button = 2131230782;
+ // aapt resource value: 0x7f0900b5
+ public const int btnSubmit = 2131296437;
- // aapt resource value: 0x7F080002
- public const int FILL = 2131230722;
+ // aapt resource value: 0x7f090060
+ public const int buttonPanel = 2131296352;
- // aapt resource value: 0x7F080003
- public const int FILL_STROKE = 2131230723;
+ // aapt resource value: 0x7f0900cc
+ public const int cancel_action = 2131296460;
- // aapt resource value: 0x7F080040
- public const int fingerprint_icon = 2131230784;
+ // aapt resource value: 0x7f09003a
+ public const int center = 2131296314;
- // aapt resource value: 0x7F080005
- public const int FixedBehind = 2131230725;
+ // aapt resource value: 0x7f09003b
+ public const int center_horizontal = 2131296315;
- // aapt resource value: 0x7F080006
- public const int FixedFront = 2131230726;
+ // aapt resource value: 0x7f09003c
+ public const int center_vertical = 2131296316;
- // aapt resource value: 0x7F080041
- public const int forever = 2131230785;
+ // aapt resource value: 0x7f090070
+ public const int checkbox = 2131296368;
- // aapt resource value: 0x7F080004
- public const int FUNCTION = 2131230724;
+ // aapt resource value: 0x7f0900d4
+ public const int chronometer = 2131296468;
- // aapt resource value: 0x7F080042
- public const int gd_btn_back = 2131230786;
+ // aapt resource value: 0x7f090043
+ public const int clip_horizontal = 2131296323;
- // aapt resource value: 0x7F080043
- public const int gd_btn_myLocation = 2131230787;
+ // aapt resource value: 0x7f090044
+ public const int clip_vertical = 2131296324;
- // aapt resource value: 0x7F080044
- public const int gd_btn_save = 2131230788;
+ // aapt resource value: 0x7f09002e
+ public const int collapseActionView = 2131296302;
- // aapt resource value: 0x7F080045
- public const int gd_img_search_delete = 2131230789;
+ // aapt resource value: 0x7f090099
+ public const int container = 2131296409;
- // aapt resource value: 0x7F080046
- public const int gd_ll_myhome = 2131230790;
+ // aapt resource value: 0x7f0900e1
+ public const int contentFrame = 2131296481;
- // aapt resource value: 0x7F080047
- public const int gd_ll_search = 2131230791;
+ // aapt resource value: 0x7f090063
+ public const int contentPanel = 2131296355;
- // aapt resource value: 0x7F080048
- public const int gd_mapView = 2131230792;
+ // aapt resource value: 0x7f0900b7
+ public const int content_container = 2131296439;
- // aapt resource value: 0x7F080049
- public const int gd_rl_topview = 2131230793;
+ // aapt resource value: 0x7f09009a
+ public const int coordinator = 2131296410;
- // aapt resource value: 0x7F08004A
- public const int gd_tv_activity_title = 2131230794;
+ // aapt resource value: 0x7f09006a
+ public const int custom = 2131296362;
- // aapt resource value: 0x7F08004B
- public const int gd_tv_radius = 2131230795;
+ // aapt resource value: 0x7f090069
+ public const int customPanel = 2131296361;
- // aapt resource value: 0x7F08004C
- public const int gd_tv_search_title = 2131230796;
+ // aapt resource value: 0x7f0900c3
+ public const int day = 2131296451;
- // aapt resource value: 0x7F08004D
- public const int hdl_gallery_rootView = 2131230797;
+ // aapt resource value: 0x7f090077
+ public const int decor_content_parent = 2131296375;
+
+ // aapt resource value: 0x7f09005d
+ public const int default_activity_button = 2131296349;
+
+ // aapt resource value: 0x7f090094
+ public const int description = 2131296404;
+
+ // aapt resource value: 0x7f09009c
+ public const int design_bottom_sheet = 2131296412;
+
+ // aapt resource value: 0x7f0900a3
+ public const int design_menu_item_action_area = 2131296419;
+
+ // aapt resource value: 0x7f0900a2
+ public const int design_menu_item_action_area_stub = 2131296418;
+
+ // aapt resource value: 0x7f0900a1
+ public const int design_menu_item_text = 2131296417;
+
+ // aapt resource value: 0x7f0900a0
+ public const int design_navigation_view = 2131296416;
+
+ // aapt resource value: 0x7f090015
+ public const int disableHome = 2131296277;
+
+ // aapt resource value: 0x7f09007b
+ public const int edit_query = 2131296379;
+
+ // aapt resource value: 0x7f090025
+ public const int end = 2131296293;
+
+ // aapt resource value: 0x7f0900da
+ public const int end_padder = 2131296474;
+
+ // aapt resource value: 0x7f090034
+ public const int enterAlways = 2131296308;
+
+ // aapt resource value: 0x7f090035
+ public const int enterAlwaysCollapsed = 2131296309;
+
+ // aapt resource value: 0x7f090036
+ public const int exitUntilCollapsed = 2131296310;
+
+ // aapt resource value: 0x7f09005b
+ public const int expand_activities_button = 2131296347;
+
+ // aapt resource value: 0x7f09006f
+ public const int expanded_menu = 2131296367;
+
+ // aapt resource value: 0x7f090045
+ public const int fill = 2131296325;
+
+ // aapt resource value: 0x7f090046
+ public const int fill_horizontal = 2131296326;
+
+ // aapt resource value: 0x7f09003d
+ public const int fill_vertical = 2131296317;
+
+ // aapt resource value: 0x7f090095
+ public const int fingerprint_icon = 2131296405;
+
+ // aapt resource value: 0x7f090049
+ public const int @fixed = 2131296329;
+
+ // aapt resource value: 0x7f09004d
+ public const int forever = 2131296333;
+
+ // aapt resource value: 0x7f0900a8
+ public const int gd_btn_back = 2131296424;
+
+ // aapt resource value: 0x7f0900b1
+ public const int gd_btn_myLocation = 2131296433;
+
+ // aapt resource value: 0x7f0900b0
+ public const int gd_btn_save = 2131296432;
+
+ // aapt resource value: 0x7f0900ad
+ public const int gd_img_search_delete = 2131296429;
+
+ // aapt resource value: 0x7f0900af
+ public const int gd_ll_myhome = 2131296431;
+
+ // aapt resource value: 0x7f0900ab
+ public const int gd_ll_search = 2131296427;
+
+ // aapt resource value: 0x7f0900aa
+ public const int gd_mapView = 2131296426;
+
+ // aapt resource value: 0x7f0900a7
+ public const int gd_rl_topview = 2131296423;
+
+ // aapt resource value: 0x7f0900a9
+ public const int gd_tv_activity_title = 2131296425;
+
+ // aapt resource value: 0x7f0900ae
+ public const int gd_tv_radius = 2131296430;
+
+ // aapt resource value: 0x7f0900ac
+ public const int gd_tv_search_title = 2131296428;
+
+ // aapt resource value: 0x7f0900a5
+ public const int hdl_gallery_rootView = 2131296421;
+
+ // aapt resource value: 0x7f0900a6
+ public const int hdl_gallery_viewPager = 2131296422;
+
+ // aapt resource value: 0x7f0900b9
+ public const int hdl_options1 = 2131296441;
+
+ // aapt resource value: 0x7f0900ba
+ public const int hdl_options2 = 2131296442;
+
+ // aapt resource value: 0x7f0900bb
+ public const int hdl_options3 = 2131296443;
+
+ // aapt resource value: 0x7f0900b8
+ public const int hdl_pickerview_ll = 2131296440;
+
+ // aapt resource value: 0x7f090005
+ public const int home = 2131296261;
+
+ // aapt resource value: 0x7f090016
+ public const int homeAsUp = 2131296278;
+
+ // aapt resource value: 0x7f0900c4
+ public const int hour = 2131296452;
+
+ // aapt resource value: 0x7f09005f
+ public const int icon = 2131296351;
+
+ // aapt resource value: 0x7f0900d9
+ public const int icon_group = 2131296473;
+
+ // aapt resource value: 0x7f09002f
+ public const int ifRoom = 2131296303;
+
+ // aapt resource value: 0x7f09005c
+ public const int image = 2131296348;
+
+ // aapt resource value: 0x7f0900d5
+ public const int info = 2131296469;
+
+ // aapt resource value: 0x7f09004e
+ public const int italic = 2131296334;
+
+ // aapt resource value: 0x7f090000
+ public const int item_touch_helper_previous_elevation = 2131296256;
+
+ // aapt resource value: 0x7f090098
+ public const int largeLabel = 2131296408;
- // aapt resource value: 0x7F08004E
- public const int hdl_gallery_viewPager = 2131230798;
+ // aapt resource value: 0x7f09003e
+ public const int left = 2131296318;
- // aapt resource value: 0x7F08004F
- public const int hdl_options1 = 2131230799;
+ // aapt resource value: 0x7f09000d
+ public const int line1 = 2131296269;
- // aapt resource value: 0x7F080050
- public const int hdl_options2 = 2131230800;
+ // aapt resource value: 0x7f09000e
+ public const int line3 = 2131296270;
- // aapt resource value: 0x7F080051
- public const int hdl_options3 = 2131230801;
+ // aapt resource value: 0x7f090012
+ public const int listMode = 2131296274;
- // aapt resource value: 0x7F080052
- public const int hdl_pickerview_ll = 2131230802;
+ // aapt resource value: 0x7f09005e
+ public const int list_item = 2131296350;
- // aapt resource value: 0x7F080053
- public const int home = 2131230803;
+ // aapt resource value: 0x7f0900e3
+ public const int masked = 2131296483;
- // aapt resource value: 0x7F080054
- public const int homeAsUp = 2131230804;
+ // aapt resource value: 0x7f0900ce
+ public const int media_actions = 2131296462;
- // aapt resource value: 0x7F080055
- public const int hour = 2131230805;
+ // aapt resource value: 0x7f0900e0
+ public const int message = 2131296480;
- // aapt resource value: 0x7F080056
- public const int icon = 2131230806;
+ // aapt resource value: 0x7f090026
+ public const int middle = 2131296294;
- // aapt resource value: 0x7F080057
- public const int icon_group = 2131230807;
+ // aapt resource value: 0x7f0900c5
+ public const int min = 2131296453;
- // aapt resource value: 0x7F080058
- public const int ifRoom = 2131230808;
+ // aapt resource value: 0x7f090048
+ public const int mini = 2131296328;
- // aapt resource value: 0x7F080059
- public const int image = 2131230809;
+ // aapt resource value: 0x7f0900c2
+ public const int month = 2131296450;
- // aapt resource value: 0x7F08005A
- public const int info = 2131230810;
+ // aapt resource value: 0x7f09001c
+ public const int multiply = 2131296284;
- // aapt resource value: 0x7F08005B
- public const int italic = 2131230811;
+ // aapt resource value: 0x7f0900c7
+ public const int myButton = 2131296455;
- // aapt resource value: 0x7F08005C
- public const int item_touch_helper_previous_elevation = 2131230812;
+ // aapt resource value: 0x7f09009f
+ public const int navigation_header_container = 2131296415;
- // aapt resource value: 0x7F08005D
- public const int left = 2131230813;
+ // aapt resource value: 0x7f090030
+ public const int never = 2131296304;
- // aapt resource value: 0x7F08005E
- public const int line1 = 2131230814;
+ // aapt resource value: 0x7f090017
+ public const int none = 2131296279;
- // aapt resource value: 0x7F08005F
- public const int line3 = 2131230815;
+ // aapt resource value: 0x7f090013
+ public const int normal = 2131296275;
- // aapt resource value: 0x7F080060
- public const int listMode = 2131230816;
+ // aapt resource value: 0x7f0900d7
+ public const int notification_background = 2131296471;
- // aapt resource value: 0x7F080061
- public const int list_item = 2131230817;
+ // aapt resource value: 0x7f0900d1
+ public const int notification_main_column = 2131296465;
- // aapt resource value: 0x7F080008
- public const int MatchLayout = 2131230728;
+ // aapt resource value: 0x7f0900d0
+ public const int notification_main_column_container = 2131296464;
- // aapt resource value: 0x7F080062
- public const int media_actions = 2131230818;
+ // aapt resource value: 0x7f0900bd
+ public const int options1 = 2131296445;
- // aapt resource value: 0x7F080063
- public const int message = 2131230819;
+ // aapt resource value: 0x7f0900be
+ public const int options2 = 2131296446;
- // aapt resource value: 0x7F080007
- public const int META = 2131230727;
+ // aapt resource value: 0x7f0900bf
+ public const int options3 = 2131296447;
- // aapt resource value: 0x7F080064
- public const int middle = 2131230820;
+ // aapt resource value: 0x7f0900bc
+ public const int optionspicker = 2131296444;
- // aapt resource value: 0x7F080065
- public const int min = 2131230821;
+ // aapt resource value: 0x7f0900b6
+ public const int outmost_container = 2131296438;
- // aapt resource value: 0x7F080066
- public const int month = 2131230822;
+ // aapt resource value: 0x7f090041
+ public const int parallax = 2131296321;
- // aapt resource value: 0x7F080067
- public const int multiply = 2131230823;
+ // aapt resource value: 0x7f090062
+ public const int parentPanel = 2131296354;
- // aapt resource value: 0x7F080068
- public const int myButton = 2131230824;
+ // aapt resource value: 0x7f090042
+ public const int pin = 2131296322;
- // aapt resource value: 0x7F080069
- public const int never = 2131230825;
+ // aapt resource value: 0x7f090006
+ public const int progress_circular = 2131296262;
- // aapt resource value: 0x7F08006A
- public const int none = 2131230826;
+ // aapt resource value: 0x7f090007
+ public const int progress_horizontal = 2131296263;
- // aapt resource value: 0x7F08006B
- public const int normal = 2131230827;
+ // aapt resource value: 0x7f090072
+ public const int radio = 2131296370;
- // aapt resource value: 0x7F08006C
- public const int notification_background = 2131230828;
+ // aapt resource value: 0x7f09003f
+ public const int right = 2131296319;
- // aapt resource value: 0x7F08006D
- public const int notification_main_column = 2131230829;
+ // aapt resource value: 0x7f0900d6
+ public const int right_icon = 2131296470;
- // aapt resource value: 0x7F08006E
- public const int notification_main_column_container = 2131230830;
+ // aapt resource value: 0x7f0900d2
+ public const int right_side = 2131296466;
- // aapt resource value: 0x7F08006F
- public const int options1 = 2131230831;
+ // aapt resource value: 0x7f0900b2
+ public const int rv_topbar = 2131296434;
- // aapt resource value: 0x7F080070
- public const int options2 = 2131230832;
+ // aapt resource value: 0x7f09001d
+ public const int screen = 2131296285;
- // aapt resource value: 0x7F080071
- public const int options3 = 2131230833;
+ // aapt resource value: 0x7f090037
+ public const int scroll = 2131296311;
- // aapt resource value: 0x7F080072
- public const int optionspicker = 2131230834;
+ // aapt resource value: 0x7f090068
+ public const int scrollIndicatorDown = 2131296360;
- // aapt resource value: 0x7F080073
- public const int outmost_container = 2131230835;
+ // aapt resource value: 0x7f090064
+ public const int scrollIndicatorUp = 2131296356;
- // aapt resource value: 0x7F080074
- public const int parentPanel = 2131230836;
+ // aapt resource value: 0x7f090065
+ public const int scrollView = 2131296357;
- // aapt resource value: 0x7F080075
- public const int progress_circular = 2131230837;
+ // aapt resource value: 0x7f09004a
+ public const int scrollable = 2131296330;
- // aapt resource value: 0x7F080076
- public const int progress_horizontal = 2131230838;
+ // aapt resource value: 0x7f09007d
+ public const int search_badge = 2131296381;
- // aapt resource value: 0x7F080077
- public const int radio = 2131230839;
+ // aapt resource value: 0x7f09007c
+ public const int search_bar = 2131296380;
- // aapt resource value: 0x7F080078
- public const int right = 2131230840;
+ // aapt resource value: 0x7f09007e
+ public const int search_button = 2131296382;
- // aapt resource value: 0x7F080079
- public const int right_icon = 2131230841;
+ // aapt resource value: 0x7f090083
+ public const int search_close_btn = 2131296387;
- // aapt resource value: 0x7F08007A
- public const int right_side = 2131230842;
+ // aapt resource value: 0x7f09007f
+ public const int search_edit_frame = 2131296383;
- // aapt resource value: 0x7F08007B
- public const int rv_topbar = 2131230843;
+ // aapt resource value: 0x7f090085
+ public const int search_go_btn = 2131296389;
- // aapt resource value: 0x7F08000C
- public const int Scale = 2131230732;
+ // aapt resource value: 0x7f090080
+ public const int search_mag_icon = 2131296384;
- // aapt resource value: 0x7F08007C
- public const int screen = 2131230844;
+ // aapt resource value: 0x7f090081
+ public const int search_plate = 2131296385;
- // aapt resource value: 0x7F08007D
- public const int scrollIndicatorDown = 2131230845;
+ // aapt resource value: 0x7f090082
+ public const int search_src_text = 2131296386;
- // aapt resource value: 0x7F08007E
- public const int scrollIndicatorUp = 2131230846;
+ // aapt resource value: 0x7f090086
+ public const int search_voice_btn = 2131296390;
- // aapt resource value: 0x7F08007F
- public const int scrollView = 2131230847;
+ // aapt resource value: 0x7f0900c6
+ public const int second = 2131296454;
- // aapt resource value: 0x7F080080
- public const int search_badge = 2131230848;
+ // aapt resource value: 0x7f090087
+ public const int select_dialog_listview = 2131296391;
- // aapt resource value: 0x7F080081
- public const int search_bar = 2131230849;
+ // aapt resource value: 0x7f090071
+ public const int shortcut = 2131296369;
- // aapt resource value: 0x7F080082
- public const int search_button = 2131230850;
+ // aapt resource value: 0x7f090018
+ public const int showCustom = 2131296280;
- // aapt resource value: 0x7F080083
- public const int search_close_btn = 2131230851;
+ // aapt resource value: 0x7f090019
+ public const int showHome = 2131296281;
- // aapt resource value: 0x7F080084
- public const int search_edit_frame = 2131230852;
+ // aapt resource value: 0x7f09001a
+ public const int showTitle = 2131296282;
- // aapt resource value: 0x7F080085
- public const int search_go_btn = 2131230853;
+ // aapt resource value: 0x7f090097
+ public const int smallLabel = 2131296407;
- // aapt resource value: 0x7F080086
- public const int search_mag_icon = 2131230854;
+ // aapt resource value: 0x7f09009e
+ public const int snackbar_action = 2131296414;
- // aapt resource value: 0x7F080087
- public const int search_plate = 2131230855;
+ // aapt resource value: 0x7f09009d
+ public const int snackbar_text = 2131296413;
- // aapt resource value: 0x7F080088
- public const int search_src_text = 2131230856;
+ // aapt resource value: 0x7f090038
+ public const int snap = 2131296312;
- // aapt resource value: 0x7F080089
- public const int search_voice_btn = 2131230857;
+ // aapt resource value: 0x7f090061
+ public const int spacer = 2131296353;
- // aapt resource value: 0x7F08008A
- public const int second = 2131230858;
+ // aapt resource value: 0x7f090008
+ public const int split_action_bar = 2131296264;
- // aapt resource value: 0x7F08008B
- public const int select_dialog_listview = 2131230859;
+ // aapt resource value: 0x7f09001e
+ public const int src_atop = 2131296286;
- // aapt resource value: 0x7F080009
- public const int SHIFT = 2131230729;
+ // aapt resource value: 0x7f09001f
+ public const int src_in = 2131296287;
- // aapt resource value: 0x7F08008C
- public const int shortcut = 2131230860;
+ // aapt resource value: 0x7f090020
+ public const int src_over = 2131296288;
- // aapt resource value: 0x7F08008D
- public const int showCustom = 2131230861;
+ // aapt resource value: 0x7f0900db
+ public const int srl_classics_arrow = 2131296475;
- // aapt resource value: 0x7F08008E
- public const int showHome = 2131230862;
+ // aapt resource value: 0x7f0900de
+ public const int srl_classics_center = 2131296478;
- // aapt resource value: 0x7F08008F
- public const int showTitle = 2131230863;
+ // aapt resource value: 0x7f0900dd
+ public const int srl_classics_progress = 2131296477;
- // aapt resource value: 0x7F080090
- public const int spacer = 2131230864;
+ // aapt resource value: 0x7f0900dc
+ public const int srl_classics_title = 2131296476;
- // aapt resource value: 0x7F080091
- public const int split_action_bar = 2131230865;
+ // aapt resource value: 0x7f0900df
+ public const int srl_classics_update = 2131296479;
- // aapt resource value: 0x7F080092
- public const int src_atop = 2131230866;
+ // aapt resource value: 0x7f090040
+ public const int start = 2131296320;
- // aapt resource value: 0x7F080093
- public const int src_in = 2131230867;
+ // aapt resource value: 0x7f09008f
+ public const int startV1 = 2131296399;
- // aapt resource value: 0x7F080094
- public const int src_over = 2131230868;
+ // aapt resource value: 0x7f090091
+ public const int startV1V4 = 2131296401;
- // aapt resource value: 0x7F080095
- public const int srl_classics_arrow = 2131230869;
+ // aapt resource value: 0x7f090090
+ public const int startV4 = 2131296400;
- // aapt resource value: 0x7F080096
- public const int srl_classics_center = 2131230870;
+ // aapt resource value: 0x7f090096
+ public const int status = 2131296406;
- // aapt resource value: 0x7F080097
- public const int srl_classics_progress = 2131230871;
+ // aapt resource value: 0x7f0900cd
+ public const int status_bar_latest_event_content = 2131296461;
- // aapt resource value: 0x7F080098
- public const int srl_classics_title = 2131230872;
+ // aapt resource value: 0x7f090092
+ public const int stop = 2131296402;
- // aapt resource value: 0x7F080099
- public const int srl_classics_update = 2131230873;
+ // aapt resource value: 0x7f090073
+ public const int submenuarrow = 2131296371;
- // aapt resource value: 0x7F08009A
- public const int status = 2131230874;
+ // aapt resource value: 0x7f090084
+ public const int submit_area = 2131296388;
- // aapt resource value: 0x7F08009B
- public const int status_bar_latest_event_content = 2131230875;
+ // aapt resource value: 0x7f090093
+ public const int subtitle = 2131296403;
- // aapt resource value: 0x7F08000A
- public const int STROKE = 2131230730;
+ // aapt resource value: 0x7f090014
+ public const int tabMode = 2131296276;
- // aapt resource value: 0x7F08009C
- public const int submenuarrow = 2131230876;
+ // aapt resource value: 0x7f09000f
+ public const int text = 2131296271;
- // aapt resource value: 0x7F08009D
- public const int submit_area = 2131230877;
+ // aapt resource value: 0x7f090010
+ public const int text2 = 2131296272;
- // aapt resource value: 0x7F08009E
- public const int subtitle = 2131230878;
+ // aapt resource value: 0x7f090067
+ public const int textSpacerNoButtons = 2131296359;
- // aapt resource value: 0x7F08000B
- public const int SYM = 2131230731;
+ // aapt resource value: 0x7f090066
+ public const int textSpacerNoTitle = 2131296358;
- // aapt resource value: 0x7F08009F
- public const int tabMode = 2131230879;
+ // aapt resource value: 0x7f0900a4
+ public const int text_input_password_toggle = 2131296420;
- // aapt resource value: 0x7F0800A0
- public const int text = 2131230880;
+ // aapt resource value: 0x7f09000a
+ public const int textinput_counter = 2131296266;
- // aapt resource value: 0x7F0800A1
- public const int text2 = 2131230881;
+ // aapt resource value: 0x7f09000b
+ public const int textinput_error = 2131296267;
- // aapt resource value: 0x7F0800A2
- public const int textSpacerNoButtons = 2131230882;
+ // aapt resource value: 0x7f0900d3
+ public const int time = 2131296467;
- // aapt resource value: 0x7F0800A3
- public const int textSpacerNoTitle = 2131230883;
+ // aapt resource value: 0x7f0900c0
+ public const int timepicker = 2131296448;
- // aapt resource value: 0x7F0800A4
- public const int time = 2131230884;
+ // aapt resource value: 0x7f090011
+ public const int title = 2131296273;
- // aapt resource value: 0x7F0800A5
- public const int timepicker = 2131230885;
+ // aapt resource value: 0x7f09006e
+ public const int titleDividerNoCustom = 2131296366;
- // aapt resource value: 0x7F0800A6
- public const int title = 2131230886;
+ // aapt resource value: 0x7f09006c
+ public const int title_template = 2131296364;
- // aapt resource value: 0x7F0800A7
- public const int titleDividerNoCustom = 2131230887;
+ // aapt resource value: 0x7f090033
+ public const int top = 2131296307;
- // aapt resource value: 0x7F0800A8
- public const int title_template = 2131230888;
+ // aapt resource value: 0x7f09006b
+ public const int topPanel = 2131296363;
- // aapt resource value: 0x7F0800A9
- public const int top = 2131230889;
+ // aapt resource value: 0x7f09009b
+ public const int touch_outside = 2131296411;
- // aapt resource value: 0x7F0800AA
- public const int topPanel = 2131230890;
+ // aapt resource value: 0x7f0900b4
+ public const int tvTitle = 2131296436;
- // aapt resource value: 0x7F08000D
- public const int Translate = 2131230733;
+ // aapt resource value: 0x7f090022
+ public const int uniform = 2131296290;
- // aapt resource value: 0x7F0800AB
- public const int tvTitle = 2131230891;
+ // aapt resource value: 0x7f090009
+ public const int up = 2131296265;
- // aapt resource value: 0x7F0800AC
- public const int uniform = 2131230892;
+ // aapt resource value: 0x7f09001b
+ public const int useLogo = 2131296283;
- // aapt resource value: 0x7F0800AD
- public const int up = 2131230893;
+ // aapt resource value: 0x7f09000c
+ public const int view_offset_helper = 2131296268;
- // aapt resource value: 0x7F0800AE
- public const int useLogo = 2131230894;
+ // aapt resource value: 0x7f0900e2
+ public const int visible = 2131296482;
- // aapt resource value: 0x7F0800AF
- public const int withText = 2131230895;
+ // aapt resource value: 0x7f090031
+ public const int withText = 2131296305;
- // aapt resource value: 0x7F0800B0
- public const int wrap_content = 2131230896;
+ // aapt resource value: 0x7f090023
+ public const int wrap_content = 2131296291;
- // aapt resource value: 0x7F0800B1
- public const int year = 2131230897;
+ // aapt resource value: 0x7f0900c1
+ public const int year = 2131296449;
static Id()
{
@@ -3075,23 +3691,38 @@
public partial class Integer
{
- // aapt resource value: 0x7F090000
- public const int abc_config_activityDefaultDur = 2131296256;
+ // aapt resource value: 0x7f0e0000
+ public const int abc_config_activityDefaultDur = 2131623936;
- // aapt resource value: 0x7F090001
- public const int abc_config_activityShortDur = 2131296257;
+ // aapt resource value: 0x7f0e0001
+ public const int abc_config_activityShortDur = 2131623937;
- // aapt resource value: 0x7F090002
- public const int animation_default_duration = 2131296258;
+ // aapt resource value: 0x7f0e000a
+ public const int animation_default_duration = 2131623946;
- // aapt resource value: 0x7F090003
- public const int cancel_button_image_alpha = 2131296259;
+ // aapt resource value: 0x7f0e0005
+ public const int app_bar_elevation_anim_duration = 2131623941;
- // aapt resource value: 0x7F090004
- public const int config_tooltipAnimTime = 2131296260;
+ // aapt resource value: 0x7f0e0006
+ public const int bottom_sheet_slide_duration = 2131623942;
- // aapt resource value: 0x7F090005
- public const int status_bar_notification_info_maxnum = 2131296261;
+ // aapt resource value: 0x7f0e0002
+ public const int cancel_button_image_alpha = 2131623938;
+
+ // aapt resource value: 0x7f0e0003
+ public const int config_tooltipAnimTime = 2131623939;
+
+ // aapt resource value: 0x7f0e0004
+ public const int design_snackbar_text_max_lines = 2131623940;
+
+ // aapt resource value: 0x7f0e0007
+ public const int hide_password_duration = 2131623943;
+
+ // aapt resource value: 0x7f0e0008
+ public const int show_password_duration = 2131623944;
+
+ // aapt resource value: 0x7f0e0009
+ public const int status_bar_notification_info_maxnum = 2131623945;
static Integer()
{
@@ -3106,191 +3737,236 @@
public partial class Layout
{
- // aapt resource value: 0x7F0A0000
- public const int abc_action_bar_title_item = 2131361792;
+ // aapt resource value: 0x7f040000
+ public const int abc_action_bar_title_item = 2130968576;
- // aapt resource value: 0x7F0A0001
- public const int abc_action_bar_up_container = 2131361793;
+ // aapt resource value: 0x7f040001
+ public const int abc_action_bar_up_container = 2130968577;
- // aapt resource value: 0x7F0A0002
- public const int abc_action_bar_view_list_nav_layout = 2131361794;
+ // aapt resource value: 0x7f040002
+ public const int abc_action_bar_view_list_nav_layout = 2130968578;
- // aapt resource value: 0x7F0A0003
- public const int abc_action_menu_item_layout = 2131361795;
+ // aapt resource value: 0x7f040003
+ public const int abc_action_menu_item_layout = 2130968579;
- // aapt resource value: 0x7F0A0004
- public const int abc_action_menu_layout = 2131361796;
+ // aapt resource value: 0x7f040004
+ public const int abc_action_menu_layout = 2130968580;
- // aapt resource value: 0x7F0A0005
- public const int abc_action_mode_bar = 2131361797;
+ // aapt resource value: 0x7f040005
+ public const int abc_action_mode_bar = 2130968581;
- // aapt resource value: 0x7F0A0006
- public const int abc_action_mode_close_item_material = 2131361798;
+ // aapt resource value: 0x7f040006
+ public const int abc_action_mode_close_item_material = 2130968582;
- // aapt resource value: 0x7F0A0007
- public const int abc_activity_chooser_view = 2131361799;
+ // aapt resource value: 0x7f040007
+ public const int abc_activity_chooser_view = 2130968583;
- // aapt resource value: 0x7F0A0008
- public const int abc_activity_chooser_view_list_item = 2131361800;
+ // aapt resource value: 0x7f040008
+ public const int abc_activity_chooser_view_list_item = 2130968584;
- // aapt resource value: 0x7F0A0009
- public const int abc_alert_dialog_button_bar_material = 2131361801;
+ // aapt resource value: 0x7f040009
+ public const int abc_alert_dialog_button_bar_material = 2130968585;
- // aapt resource value: 0x7F0A000A
- public const int abc_alert_dialog_material = 2131361802;
+ // aapt resource value: 0x7f04000a
+ public const int abc_alert_dialog_material = 2130968586;
- // aapt resource value: 0x7F0A000B
- public const int abc_alert_dialog_title_material = 2131361803;
+ // aapt resource value: 0x7f04000b
+ public const int abc_alert_dialog_title_material = 2130968587;
- // aapt resource value: 0x7F0A000C
- public const int abc_dialog_title_material = 2131361804;
+ // aapt resource value: 0x7f04000c
+ public const int abc_dialog_title_material = 2130968588;
- // aapt resource value: 0x7F0A000D
- public const int abc_expanded_menu_layout = 2131361805;
+ // aapt resource value: 0x7f04000d
+ public const int abc_expanded_menu_layout = 2130968589;
- // aapt resource value: 0x7F0A000E
- public const int abc_list_menu_item_checkbox = 2131361806;
+ // aapt resource value: 0x7f04000e
+ public const int abc_list_menu_item_checkbox = 2130968590;
- // aapt resource value: 0x7F0A000F
- public const int abc_list_menu_item_icon = 2131361807;
+ // aapt resource value: 0x7f04000f
+ public const int abc_list_menu_item_icon = 2130968591;
- // aapt resource value: 0x7F0A0010
- public const int abc_list_menu_item_layout = 2131361808;
+ // aapt resource value: 0x7f040010
+ public const int abc_list_menu_item_layout = 2130968592;
- // aapt resource value: 0x7F0A0011
- public const int abc_list_menu_item_radio = 2131361809;
+ // aapt resource value: 0x7f040011
+ public const int abc_list_menu_item_radio = 2130968593;
- // aapt resource value: 0x7F0A0012
- public const int abc_popup_menu_header_item_layout = 2131361810;
+ // aapt resource value: 0x7f040012
+ public const int abc_popup_menu_header_item_layout = 2130968594;
- // aapt resource value: 0x7F0A0013
- public const int abc_popup_menu_item_layout = 2131361811;
+ // aapt resource value: 0x7f040013
+ public const int abc_popup_menu_item_layout = 2130968595;
- // aapt resource value: 0x7F0A0014
- public const int abc_screen_content_include = 2131361812;
+ // aapt resource value: 0x7f040014
+ public const int abc_screen_content_include = 2130968596;
- // aapt resource value: 0x7F0A0015
- public const int abc_screen_simple = 2131361813;
+ // aapt resource value: 0x7f040015
+ public const int abc_screen_simple = 2130968597;
- // aapt resource value: 0x7F0A0016
- public const int abc_screen_simple_overlay_action_mode = 2131361814;
+ // aapt resource value: 0x7f040016
+ public const int abc_screen_simple_overlay_action_mode = 2130968598;
- // aapt resource value: 0x7F0A0017
- public const int abc_screen_toolbar = 2131361815;
+ // aapt resource value: 0x7f040017
+ public const int abc_screen_toolbar = 2130968599;
- // aapt resource value: 0x7F0A0018
- public const int abc_search_dropdown_item_icons_2line = 2131361816;
+ // aapt resource value: 0x7f040018
+ public const int abc_search_dropdown_item_icons_2line = 2130968600;
- // aapt resource value: 0x7F0A0019
- public const int abc_search_view = 2131361817;
+ // aapt resource value: 0x7f040019
+ public const int abc_search_view = 2130968601;
- // aapt resource value: 0x7F0A001A
- public const int abc_select_dialog_material = 2131361818;
+ // aapt resource value: 0x7f04001a
+ public const int abc_select_dialog_material = 2130968602;
- // aapt resource value: 0x7F0A001B
- public const int biometric_prompt_dialog_content = 2131361819;
+ // aapt resource value: 0x7f04001b
+ public const int activity_elian = 2130968603;
- // aapt resource value: 0x7F0A001C
- public const int hdl_gallery_banner_view_layout = 2131361820;
+ // aapt resource value: 0x7f04001c
+ public const int biometric_prompt_dialog_content = 2130968604;
- // aapt resource value: 0x7F0A001D
- public const int hdl_widget_activity_crop_image = 2131361821;
+ // aapt resource value: 0x7f04001d
+ public const int design_bottom_navigation_item = 2130968605;
- // aapt resource value: 0x7F0A001E
- public const int hdl_widget_activity_geofence_round = 2131361822;
+ // aapt resource value: 0x7f04001e
+ public const int design_bottom_sheet_dialog = 2130968606;
- // aapt resource value: 0x7F0A001F
- public const int hdl_widget_air_button = 2131361823;
+ // aapt resource value: 0x7f04001f
+ public const int design_layout_snackbar = 2130968607;
- // aapt resource value: 0x7F0A0020
- public const int hdl_widget_include_pickerview_topbar = 2131361824;
+ // aapt resource value: 0x7f040020
+ public const int design_layout_snackbar_include = 2130968608;
- // aapt resource value: 0x7F0A0021
- public const int hdl_widget_layout_basepickerview = 2131361825;
+ // aapt resource value: 0x7f040021
+ public const int design_layout_tab_icon = 2130968609;
- // aapt resource value: 0x7F0A0022
- public const int hdl_widget_pickerview = 2131361826;
+ // aapt resource value: 0x7f040022
+ public const int design_layout_tab_text = 2130968610;
- // aapt resource value: 0x7F0A0023
- public const int hdl_widget_pickerview_options = 2131361827;
+ // aapt resource value: 0x7f040023
+ public const int design_menu_item_action_area = 2130968611;
- // aapt resource value: 0x7F0A0024
- public const int hdl_widget_pickerview_time = 2131361828;
+ // aapt resource value: 0x7f040024
+ public const int design_navigation_item = 2130968612;
- // aapt resource value: 0x7F0A0025
- public const int Main = 2131361829;
+ // aapt resource value: 0x7f040025
+ public const int design_navigation_item_header = 2130968613;
- // aapt resource value: 0x7F0A0026
- public const int notification_action = 2131361830;
+ // aapt resource value: 0x7f040026
+ public const int design_navigation_item_separator = 2130968614;
- // aapt resource value: 0x7F0A0027
- public const int notification_action_tombstone = 2131361831;
+ // aapt resource value: 0x7f040027
+ public const int design_navigation_item_subheader = 2130968615;
- // aapt resource value: 0x7F0A0028
- public const int notification_media_action = 2131361832;
+ // aapt resource value: 0x7f040028
+ public const int design_navigation_menu = 2130968616;
- // aapt resource value: 0x7F0A0029
- public const int notification_media_cancel_action = 2131361833;
+ // aapt resource value: 0x7f040029
+ public const int design_navigation_menu_item = 2130968617;
- // aapt resource value: 0x7F0A002A
- public const int notification_template_big_media = 2131361834;
+ // aapt resource value: 0x7f04002a
+ public const int design_text_input_password_icon = 2130968618;
- // aapt resource value: 0x7F0A002B
- public const int notification_template_big_media_custom = 2131361835;
+ // aapt resource value: 0x7f04002b
+ public const int hdl_gallery_banner_view_layout = 2130968619;
- // aapt resource value: 0x7F0A002C
- public const int notification_template_big_media_narrow = 2131361836;
+ // aapt resource value: 0x7f04002c
+ public const int hdl_widget_activity_crop_image = 2130968620;
- // aapt resource value: 0x7F0A002D
- public const int notification_template_big_media_narrow_custom = 2131361837;
+ // aapt resource value: 0x7f04002d
+ public const int hdl_widget_activity_geofence_round = 2130968621;
- // aapt resource value: 0x7F0A002E
- public const int notification_template_custom_big = 2131361838;
+ // aapt resource value: 0x7f04002e
+ public const int hdl_widget_air_button = 2130968622;
- // aapt resource value: 0x7F0A002F
- public const int notification_template_icon_group = 2131361839;
+ // aapt resource value: 0x7f04002f
+ public const int hdl_widget_include_pickerview_topbar = 2130968623;
- // aapt resource value: 0x7F0A0030
- public const int notification_template_lines_media = 2131361840;
+ // aapt resource value: 0x7f040030
+ public const int hdl_widget_layout_basepickerview = 2130968624;
- // aapt resource value: 0x7F0A0031
- public const int notification_template_media = 2131361841;
+ // aapt resource value: 0x7f040031
+ public const int hdl_widget_pickerview = 2130968625;
- // aapt resource value: 0x7F0A0032
- public const int notification_template_media_custom = 2131361842;
+ // aapt resource value: 0x7f040032
+ public const int hdl_widget_pickerview_options = 2130968626;
- // aapt resource value: 0x7F0A0033
- public const int notification_template_part_chronometer = 2131361843;
+ // aapt resource value: 0x7f040033
+ public const int hdl_widget_pickerview_time = 2130968627;
- // aapt resource value: 0x7F0A0034
- public const int notification_template_part_time = 2131361844;
+ // aapt resource value: 0x7f040034
+ public const int Main = 2130968628;
- // aapt resource value: 0x7F0A0035
- public const int select_dialog_item_material = 2131361845;
+ // aapt resource value: 0x7f040035
+ public const int notification_action = 2130968629;
- // aapt resource value: 0x7F0A0036
- public const int select_dialog_multichoice_material = 2131361846;
+ // aapt resource value: 0x7f040036
+ public const int notification_action_tombstone = 2130968630;
- // aapt resource value: 0x7F0A0037
- public const int select_dialog_singlechoice_material = 2131361847;
+ // aapt resource value: 0x7f040037
+ public const int notification_media_action = 2130968631;
- // aapt resource value: 0x7F0A0038
- public const int srl_classics_footer = 2131361848;
+ // aapt resource value: 0x7f040038
+ public const int notification_media_cancel_action = 2130968632;
- // aapt resource value: 0x7F0A0039
- public const int srl_classics_header = 2131361849;
+ // aapt resource value: 0x7f040039
+ public const int notification_template_big_media = 2130968633;
- // aapt resource value: 0x7F0A003A
- public const int support_simple_spinner_dropdown_item = 2131361850;
+ // aapt resource value: 0x7f04003a
+ public const int notification_template_big_media_custom = 2130968634;
- // aapt resource value: 0x7F0A003B
- public const int tooltip = 2131361851;
+ // aapt resource value: 0x7f04003b
+ public const int notification_template_big_media_narrow = 2130968635;
- // aapt resource value: 0x7F0A003C
- public const int zxingscanneractivitylayout = 2131361852;
+ // aapt resource value: 0x7f04003c
+ public const int notification_template_big_media_narrow_custom = 2130968636;
- // aapt resource value: 0x7F0A003D
- public const int zxingscannerfragmentlayout = 2131361853;
+ // aapt resource value: 0x7f04003d
+ public const int notification_template_custom_big = 2130968637;
+
+ // aapt resource value: 0x7f04003e
+ public const int notification_template_icon_group = 2130968638;
+
+ // aapt resource value: 0x7f04003f
+ public const int notification_template_lines_media = 2130968639;
+
+ // aapt resource value: 0x7f040040
+ public const int notification_template_media = 2130968640;
+
+ // aapt resource value: 0x7f040041
+ public const int notification_template_media_custom = 2130968641;
+
+ // aapt resource value: 0x7f040042
+ public const int notification_template_part_chronometer = 2130968642;
+
+ // aapt resource value: 0x7f040043
+ public const int notification_template_part_time = 2130968643;
+
+ // aapt resource value: 0x7f040044
+ public const int select_dialog_item_material = 2130968644;
+
+ // aapt resource value: 0x7f040045
+ public const int select_dialog_multichoice_material = 2130968645;
+
+ // aapt resource value: 0x7f040046
+ public const int select_dialog_singlechoice_material = 2130968646;
+
+ // aapt resource value: 0x7f040047
+ public const int srl_classics_footer = 2130968647;
+
+ // aapt resource value: 0x7f040048
+ public const int srl_classics_header = 2130968648;
+
+ // aapt resource value: 0x7f040049
+ public const int support_simple_spinner_dropdown_item = 2130968649;
+
+ // aapt resource value: 0x7f04004a
+ public const int tooltip = 2130968650;
+
+ // aapt resource value: 0x7f04004b
+ public const int zxingscanneractivitylayout = 2130968651;
+
+ // aapt resource value: 0x7f04004c
+ public const int zxingscannerfragmentlayout = 2130968652;
static Layout()
{
@@ -3305,8 +3981,8 @@
public partial class Mipmap
{
- // aapt resource value: 0x7F0B0000
- public const int Icon = 2131427328;
+ // aapt resource value: 0x7f030000
+ public const int Icon = 2130903040;
static Mipmap()
{
@@ -3321,218 +3997,242 @@
public partial class String
{
- // aapt resource value: 0x7F0C0000
- public const int abc_action_bar_home_description = 2131492864;
+ // aapt resource value: 0x7f0a0000
+ public const int abc_action_bar_home_description = 2131361792;
- // aapt resource value: 0x7F0C0001
- public const int abc_action_bar_home_description_format = 2131492865;
+ // aapt resource value: 0x7f0a0001
+ public const int abc_action_bar_home_description_format = 2131361793;
- // aapt resource value: 0x7F0C0002
- public const int abc_action_bar_home_subtitle_description_format = 2131492866;
+ // aapt resource value: 0x7f0a0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131361794;
- // aapt resource value: 0x7F0C0003
- public const int abc_action_bar_up_description = 2131492867;
+ // aapt resource value: 0x7f0a0003
+ public const int abc_action_bar_up_description = 2131361795;
- // aapt resource value: 0x7F0C0004
- public const int abc_action_menu_overflow_description = 2131492868;
+ // aapt resource value: 0x7f0a0004
+ public const int abc_action_menu_overflow_description = 2131361796;
- // aapt resource value: 0x7F0C0005
- public const int abc_action_mode_done = 2131492869;
+ // aapt resource value: 0x7f0a0005
+ public const int abc_action_mode_done = 2131361797;
- // aapt resource value: 0x7F0C0007
- public const int abc_activitychooserview_choose_application = 2131492871;
+ // aapt resource value: 0x7f0a0006
+ public const int abc_activity_chooser_view_see_all = 2131361798;
- // aapt resource value: 0x7F0C0006
- public const int abc_activity_chooser_view_see_all = 2131492870;
+ // aapt resource value: 0x7f0a0007
+ public const int abc_activitychooserview_choose_application = 2131361799;
- // aapt resource value: 0x7F0C0008
- public const int abc_capital_off = 2131492872;
+ // aapt resource value: 0x7f0a0008
+ public const int abc_capital_off = 2131361800;
- // aapt resource value: 0x7F0C0009
- public const int abc_capital_on = 2131492873;
+ // aapt resource value: 0x7f0a0009
+ public const int abc_capital_on = 2131361801;
- // aapt resource value: 0x7F0C000A
- public const int abc_font_family_body_1_material = 2131492874;
+ // aapt resource value: 0x7f0a0015
+ public const int abc_font_family_body_1_material = 2131361813;
- // aapt resource value: 0x7F0C000B
- public const int abc_font_family_body_2_material = 2131492875;
+ // aapt resource value: 0x7f0a0016
+ public const int abc_font_family_body_2_material = 2131361814;
- // aapt resource value: 0x7F0C000C
- public const int abc_font_family_button_material = 2131492876;
+ // aapt resource value: 0x7f0a0017
+ public const int abc_font_family_button_material = 2131361815;
- // aapt resource value: 0x7F0C000D
- public const int abc_font_family_caption_material = 2131492877;
+ // aapt resource value: 0x7f0a0018
+ public const int abc_font_family_caption_material = 2131361816;
- // aapt resource value: 0x7F0C000E
- public const int abc_font_family_display_1_material = 2131492878;
+ // aapt resource value: 0x7f0a0019
+ public const int abc_font_family_display_1_material = 2131361817;
- // aapt resource value: 0x7F0C000F
- public const int abc_font_family_display_2_material = 2131492879;
+ // aapt resource value: 0x7f0a001a
+ public const int abc_font_family_display_2_material = 2131361818;
- // aapt resource value: 0x7F0C0010
- public const int abc_font_family_display_3_material = 2131492880;
+ // aapt resource value: 0x7f0a001b
+ public const int abc_font_family_display_3_material = 2131361819;
- // aapt resource value: 0x7F0C0011
- public const int abc_font_family_display_4_material = 2131492881;
+ // aapt resource value: 0x7f0a001c
+ public const int abc_font_family_display_4_material = 2131361820;
- // aapt resource value: 0x7F0C0012
- public const int abc_font_family_headline_material = 2131492882;
+ // aapt resource value: 0x7f0a001d
+ public const int abc_font_family_headline_material = 2131361821;
- // aapt resource value: 0x7F0C0013
- public const int abc_font_family_menu_material = 2131492883;
+ // aapt resource value: 0x7f0a001e
+ public const int abc_font_family_menu_material = 2131361822;
- // aapt resource value: 0x7F0C0014
- public const int abc_font_family_subhead_material = 2131492884;
+ // aapt resource value: 0x7f0a001f
+ public const int abc_font_family_subhead_material = 2131361823;
- // aapt resource value: 0x7F0C0015
- public const int abc_font_family_title_material = 2131492885;
+ // aapt resource value: 0x7f0a0020
+ public const int abc_font_family_title_material = 2131361824;
- // aapt resource value: 0x7F0C0017
- public const int abc_searchview_description_clear = 2131492887;
+ // aapt resource value: 0x7f0a000a
+ public const int abc_search_hint = 2131361802;
- // aapt resource value: 0x7F0C0018
- public const int abc_searchview_description_query = 2131492888;
+ // aapt resource value: 0x7f0a000b
+ public const int abc_searchview_description_clear = 2131361803;
- // aapt resource value: 0x7F0C0019
- public const int abc_searchview_description_search = 2131492889;
+ // aapt resource value: 0x7f0a000c
+ public const int abc_searchview_description_query = 2131361804;
- // aapt resource value: 0x7F0C001A
- public const int abc_searchview_description_submit = 2131492890;
+ // aapt resource value: 0x7f0a000d
+ public const int abc_searchview_description_search = 2131361805;
- // aapt resource value: 0x7F0C001B
- public const int abc_searchview_description_voice = 2131492891;
+ // aapt resource value: 0x7f0a000e
+ public const int abc_searchview_description_submit = 2131361806;
- // aapt resource value: 0x7F0C0016
- public const int abc_search_hint = 2131492886;
+ // aapt resource value: 0x7f0a000f
+ public const int abc_searchview_description_voice = 2131361807;
- // aapt resource value: 0x7F0C001C
- public const int abc_shareactionprovider_share_with = 2131492892;
+ // aapt resource value: 0x7f0a0010
+ public const int abc_shareactionprovider_share_with = 2131361808;
- // aapt resource value: 0x7F0C001D
- public const int abc_shareactionprovider_share_with_application = 2131492893;
+ // aapt resource value: 0x7f0a0011
+ public const int abc_shareactionprovider_share_with_application = 2131361809;
- // aapt resource value: 0x7F0C001E
- public const int abc_toolbar_collapse_description = 2131492894;
+ // aapt resource value: 0x7f0a0012
+ public const int abc_toolbar_collapse_description = 2131361810;
- // aapt resource value: 0x7F0C001F
- public const int app_name = 2131492895;
+ // aapt resource value: 0x7f0a003c
+ public const int app_name = 2131361852;
- // aapt resource value: 0x7F0C0020
- public const int gd_activity_title = 2131492896;
+ // aapt resource value: 0x7f0a0021
+ public const int appbar_scrolling_view_behavior = 2131361825;
+
+ // aapt resource value: 0x7f0a0022
+ public const int bottom_sheet_behavior = 2131361826;
+
+ // aapt resource value: 0x7f0a0023
+ public const int character_counter_pattern = 2131361827;
+
+ // aapt resource value: 0x7f0a003d
+ public const int gd_activity_title = 2131361853;
+
+ // aapt resource value: 0x7f0a003e
+ public const int gd_cancel = 2131361854;
+
+ // aapt resource value: 0x7f0a003f
+ public const int gd_myhome = 2131361855;
+
+ // aapt resource value: 0x7f0a0040
+ public const int gd_notifyMsg = 2131361856;
+
+ // aapt resource value: 0x7f0a0041
+ public const int gd_notifyTitle = 2131361857;
+
+ // aapt resource value: 0x7f0a0042
+ public const int gd_save = 2131361858;
- // aapt resource value: 0x7F0C0021
- public const int gd_cancel = 2131492897;
+ // aapt resource value: 0x7f0a0043
+ public const int gd_search_tip = 2131361859;
- // aapt resource value: 0x7F0C0022
- public const int gd_myhome = 2131492898;
+ // aapt resource value: 0x7f0a0044
+ public const int gd_select_distance = 2131361860;
- // aapt resource value: 0x7F0C0023
- public const int gd_notifyMsg = 2131492899;
+ // aapt resource value: 0x7f0a0045
+ public const int gd_setting = 2131361861;
- // aapt resource value: 0x7F0C0024
- public const int gd_notifyTitle = 2131492900;
+ // aapt resource value: 0x7f0a004e
+ public const int hello = 2131361870;
- // aapt resource value: 0x7F0C0025
- public const int gd_save = 2131492901;
+ // aapt resource value: 0x7f0a0029
+ public const int not_recognized_fingerprint_hint = 2131361833;
- // aapt resource value: 0x7F0C0026
- public const int gd_search_tip = 2131492902;
+ // aapt resource value: 0x7f0a0024
+ public const int password_toggle_content_description = 2131361828;
- // aapt resource value: 0x7F0C0027
- public const int gd_select_distance = 2131492903;
+ // aapt resource value: 0x7f0a0025
+ public const int path_password_eye = 2131361829;
- // aapt resource value: 0x7F0C0028
- public const int gd_setting = 2131492904;
+ // aapt resource value: 0x7f0a0026
+ public const int path_password_eye_mask_strike_through = 2131361830;
- // aapt resource value: 0x7F0C0029
- public const int hello = 2131492905;
+ // aapt resource value: 0x7f0a0027
+ public const int path_password_eye_mask_visible = 2131361831;
- // aapt resource value: 0x7F0C002A
- public const int not_recognized_fingerprint_hint = 2131492906;
+ // aapt resource value: 0x7f0a0028
+ public const int path_password_strike_through = 2131361832;
- // aapt resource value: 0x7F0C002B
- public const int pickerview_cancel = 2131492907;
+ // aapt resource value: 0x7f0a0046
+ public const int pickerview_cancel = 2131361862;
- // aapt resource value: 0x7F0C002C
- public const int pickerview_day = 2131492908;
+ // aapt resource value: 0x7f0a0047
+ public const int pickerview_day = 2131361863;
- // aapt resource value: 0x7F0C002D
- public const int pickerview_hours = 2131492909;
+ // aapt resource value: 0x7f0a0048
+ public const int pickerview_hours = 2131361864;
- // aapt resource value: 0x7F0C002E
- public const int pickerview_minutes = 2131492910;
+ // aapt resource value: 0x7f0a0049
+ public const int pickerview_minutes = 2131361865;
- // aapt resource value: 0x7F0C002F
- public const int pickerview_month = 2131492911;
+ // aapt resource value: 0x7f0a004a
+ public const int pickerview_month = 2131361866;
- // aapt resource value: 0x7F0C0030
- public const int pickerview_seconds = 2131492912;
+ // aapt resource value: 0x7f0a004b
+ public const int pickerview_seconds = 2131361867;
- // aapt resource value: 0x7F0C0031
- public const int pickerview_submit = 2131492913;
+ // aapt resource value: 0x7f0a004c
+ public const int pickerview_submit = 2131361868;
- // aapt resource value: 0x7F0C0032
- public const int pickerview_year = 2131492914;
+ // aapt resource value: 0x7f0a004d
+ public const int pickerview_year = 2131361869;
- // aapt resource value: 0x7F0C0033
- public const int search_menu_title = 2131492915;
+ // aapt resource value: 0x7f0a0013
+ public const int search_menu_title = 2131361811;
- // aapt resource value: 0x7F0C0034
- public const int srl_component_falsify = 2131492916;
+ // aapt resource value: 0x7f0a002b
+ public const int srl_component_falsify = 2131361835;
- // aapt resource value: 0x7F0C0035
- public const int srl_content_empty = 2131492917;
+ // aapt resource value: 0x7f0a002c
+ public const int srl_content_empty = 2131361836;
- // aapt resource value: 0x7F0C0036
- public const int srl_footer_failed = 2131492918;
+ // aapt resource value: 0x7f0a002d
+ public const int srl_footer_failed = 2131361837;
- // aapt resource value: 0x7F0C0037
- public const int srl_footer_finish = 2131492919;
+ // aapt resource value: 0x7f0a002e
+ public const int srl_footer_finish = 2131361838;
- // aapt resource value: 0x7F0C0038
- public const int srl_footer_loading = 2131492920;
+ // aapt resource value: 0x7f0a002f
+ public const int srl_footer_loading = 2131361839;
- // aapt resource value: 0x7F0C0039
- public const int srl_footer_nothing = 2131492921;
+ // aapt resource value: 0x7f0a0030
+ public const int srl_footer_nothing = 2131361840;
- // aapt resource value: 0x7F0C003A
- public const int srl_footer_pulling = 2131492922;
+ // aapt resource value: 0x7f0a0031
+ public const int srl_footer_pulling = 2131361841;
- // aapt resource value: 0x7F0C003B
- public const int srl_footer_refreshing = 2131492923;
+ // aapt resource value: 0x7f0a0032
+ public const int srl_footer_refreshing = 2131361842;
- // aapt resource value: 0x7F0C003C
- public const int srl_footer_release = 2131492924;
+ // aapt resource value: 0x7f0a0033
+ public const int srl_footer_release = 2131361843;
- // aapt resource value: 0x7F0C003D
- public const int srl_header_failed = 2131492925;
+ // aapt resource value: 0x7f0a0034
+ public const int srl_header_failed = 2131361844;
- // aapt resource value: 0x7F0C003E
- public const int srl_header_finish = 2131492926;
+ // aapt resource value: 0x7f0a0035
+ public const int srl_header_finish = 2131361845;
- // aapt resource value: 0x7F0C003F
- public const int srl_header_loading = 2131492927;
+ // aapt resource value: 0x7f0a0036
+ public const int srl_header_loading = 2131361846;
- // aapt resource value: 0x7F0C0040
- public const int srl_header_pulling = 2131492928;
+ // aapt resource value: 0x7f0a0037
+ public const int srl_header_pulling = 2131361847;
- // aapt resource value: 0x7F0C0041
- public const int srl_header_refreshing = 2131492929;
+ // aapt resource value: 0x7f0a0038
+ public const int srl_header_refreshing = 2131361848;
- // aapt resource value: 0x7F0C0042
- public const int srl_header_release = 2131492930;
+ // aapt resource value: 0x7f0a0039
+ public const int srl_header_release = 2131361849;
- // aapt resource value: 0x7F0C0043
- public const int srl_header_secondary = 2131492931;
+ // aapt resource value: 0x7f0a003a
+ public const int srl_header_secondary = 2131361850;
- // aapt resource value: 0x7F0C0044
- public const int srl_header_update = 2131492932;
+ // aapt resource value: 0x7f0a003b
+ public const int srl_header_update = 2131361851;
- // aapt resource value: 0x7F0C0045
- public const int status_bar_notification_info_overflow = 2131492933;
+ // aapt resource value: 0x7f0a0014
+ public const int status_bar_notification_info_overflow = 2131361812;
- // aapt resource value: 0x7F0C0046
- public const int touch_fingerprint_sensor_hint = 2131492934;
+ // aapt resource value: 0x7f0a002a
+ public const int touch_fingerprint_sensor_hint = 2131361834;
static String()
{
@@ -3547,1115 +4247,1205 @@
public partial class Style
{
- // aapt resource value: 0x7F0D0000
- public const int AlertDialog_AppCompat = 2131558400;
+ // aapt resource value: 0x7f0b009d
+ public const int AlertDialog_AppCompat = 2131427485;
- // aapt resource value: 0x7F0D0001
- public const int AlertDialog_AppCompat_Light = 2131558401;
+ // aapt resource value: 0x7f0b009e
+ public const int AlertDialog_AppCompat_Light = 2131427486;
- // aapt resource value: 0x7F0D0002
- public const int Animation_AppCompat_Dialog = 2131558402;
+ // aapt resource value: 0x7f0b009f
+ public const int Animation_AppCompat_Dialog = 2131427487;
- // aapt resource value: 0x7F0D0003
- public const int Animation_AppCompat_DropDownUp = 2131558403;
+ // aapt resource value: 0x7f0b00a0
+ public const int Animation_AppCompat_DropDownUp = 2131427488;
- // aapt resource value: 0x7F0D0004
- public const int Animation_AppCompat_Tooltip = 2131558404;
+ // aapt resource value: 0x7f0b00a1
+ public const int Animation_AppCompat_Tooltip = 2131427489;
- // aapt resource value: 0x7F0D0005
- public const int Base_AlertDialog_AppCompat = 2131558405;
+ // aapt resource value: 0x7f0b0169
+ public const int Animation_Design_BottomSheetDialog = 2131427689;
- // aapt resource value: 0x7F0D0006
- public const int Base_AlertDialog_AppCompat_Light = 2131558406;
+ // aapt resource value: 0x7f0b00a2
+ public const int Base_AlertDialog_AppCompat = 2131427490;
- // aapt resource value: 0x7F0D0007
- public const int Base_Animation_AppCompat_Dialog = 2131558407;
+ // aapt resource value: 0x7f0b00a3
+ public const int Base_AlertDialog_AppCompat_Light = 2131427491;
- // aapt resource value: 0x7F0D0008
- public const int Base_Animation_AppCompat_DropDownUp = 2131558408;
+ // aapt resource value: 0x7f0b00a4
+ public const int Base_Animation_AppCompat_Dialog = 2131427492;
- // aapt resource value: 0x7F0D0009
- public const int Base_Animation_AppCompat_Tooltip = 2131558409;
+ // aapt resource value: 0x7f0b00a5
+ public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
- // aapt resource value: 0x7F0D000B
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131558411;
+ // aapt resource value: 0x7f0b00a6
+ public const int Base_Animation_AppCompat_Tooltip = 2131427494;
- // aapt resource value: 0x7F0D000A
- public const int Base_DialogWindowTitle_AppCompat = 2131558410;
+ // aapt resource value: 0x7f0b00a7
+ public const int Base_DialogWindowTitle_AppCompat = 2131427495;
- // aapt resource value: 0x7F0D000C
- public const int Base_TextAppearance_AppCompat = 2131558412;
+ // aapt resource value: 0x7f0b00a8
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
- // aapt resource value: 0x7F0D000D
- public const int Base_TextAppearance_AppCompat_Body1 = 2131558413;
+ // aapt resource value: 0x7f0b0039
+ public const int Base_TextAppearance_AppCompat = 2131427385;
- // aapt resource value: 0x7F0D000E
- public const int Base_TextAppearance_AppCompat_Body2 = 2131558414;
+ // aapt resource value: 0x7f0b003a
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
- // aapt resource value: 0x7F0D000F
- public const int Base_TextAppearance_AppCompat_Button = 2131558415;
+ // aapt resource value: 0x7f0b003b
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
- // aapt resource value: 0x7F0D0010
- public const int Base_TextAppearance_AppCompat_Caption = 2131558416;
+ // aapt resource value: 0x7f0b0027
+ public const int Base_TextAppearance_AppCompat_Button = 2131427367;
- // aapt resource value: 0x7F0D0011
- public const int Base_TextAppearance_AppCompat_Display1 = 2131558417;
+ // aapt resource value: 0x7f0b003c
+ public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
- // aapt resource value: 0x7F0D0012
- public const int Base_TextAppearance_AppCompat_Display2 = 2131558418;
+ // aapt resource value: 0x7f0b003d
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
- // aapt resource value: 0x7F0D0013
- public const int Base_TextAppearance_AppCompat_Display3 = 2131558419;
+ // aapt resource value: 0x7f0b003e
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
- // aapt resource value: 0x7F0D0014
- public const int Base_TextAppearance_AppCompat_Display4 = 2131558420;
+ // aapt resource value: 0x7f0b003f
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
- // aapt resource value: 0x7F0D0015
- public const int Base_TextAppearance_AppCompat_Headline = 2131558421;
+ // aapt resource value: 0x7f0b0040
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
- // aapt resource value: 0x7F0D0016
- public const int Base_TextAppearance_AppCompat_Inverse = 2131558422;
+ // aapt resource value: 0x7f0b0041
+ public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
- // aapt resource value: 0x7F0D0017
- public const int Base_TextAppearance_AppCompat_Large = 2131558423;
+ // aapt resource value: 0x7f0b000b
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
- // aapt resource value: 0x7F0D0018
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131558424;
+ // aapt resource value: 0x7f0b0042
+ public const int Base_TextAppearance_AppCompat_Large = 2131427394;
- // aapt resource value: 0x7F0D0019
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131558425;
+ // aapt resource value: 0x7f0b000c
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
- // aapt resource value: 0x7F0D001A
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131558426;
+ // aapt resource value: 0x7f0b0043
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
- // aapt resource value: 0x7F0D001B
- public const int Base_TextAppearance_AppCompat_Medium = 2131558427;
+ // aapt resource value: 0x7f0b0044
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
- // aapt resource value: 0x7F0D001C
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131558428;
+ // aapt resource value: 0x7f0b0045
+ public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
- // aapt resource value: 0x7F0D001D
- public const int Base_TextAppearance_AppCompat_Menu = 2131558429;
+ // aapt resource value: 0x7f0b000d
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
- // aapt resource value: 0x7F0D001E
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131558430;
+ // aapt resource value: 0x7f0b0046
+ public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
- // aapt resource value: 0x7F0D001F
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131558431;
+ // aapt resource value: 0x7f0b00a9
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
- // aapt resource value: 0x7F0D0020
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131558432;
+ // aapt resource value: 0x7f0b0047
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
- // aapt resource value: 0x7F0D0021
- public const int Base_TextAppearance_AppCompat_Small = 2131558433;
+ // aapt resource value: 0x7f0b0048
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
- // aapt resource value: 0x7F0D0022
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131558434;
+ // aapt resource value: 0x7f0b0049
+ public const int Base_TextAppearance_AppCompat_Small = 2131427401;
- // aapt resource value: 0x7F0D0023
- public const int Base_TextAppearance_AppCompat_Subhead = 2131558435;
+ // aapt resource value: 0x7f0b000e
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
- // aapt resource value: 0x7F0D0024
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131558436;
+ // aapt resource value: 0x7f0b004a
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
- // aapt resource value: 0x7F0D0025
- public const int Base_TextAppearance_AppCompat_Title = 2131558437;
+ // aapt resource value: 0x7f0b000f
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
- // aapt resource value: 0x7F0D0026
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131558438;
+ // aapt resource value: 0x7f0b004b
+ public const int Base_TextAppearance_AppCompat_Title = 2131427403;
- // aapt resource value: 0x7F0D0027
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131558439;
+ // aapt resource value: 0x7f0b0010
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
- // aapt resource value: 0x7F0D0028
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131558440;
+ // aapt resource value: 0x7f0b00aa
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
- // aapt resource value: 0x7F0D0029
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131558441;
+ // aapt resource value: 0x7f0b008e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
- // aapt resource value: 0x7F0D002A
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131558442;
+ // aapt resource value: 0x7f0b004c
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
- // aapt resource value: 0x7F0D002B
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131558443;
+ // aapt resource value: 0x7f0b004d
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
- // aapt resource value: 0x7F0D002C
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131558444;
+ // aapt resource value: 0x7f0b004e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
- // aapt resource value: 0x7F0D002D
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131558445;
+ // aapt resource value: 0x7f0b004f
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
- // aapt resource value: 0x7F0D002E
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131558446;
+ // aapt resource value: 0x7f0b0050
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
- // aapt resource value: 0x7F0D002F
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131558447;
+ // aapt resource value: 0x7f0b0051
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
- // aapt resource value: 0x7F0D0030
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131558448;
+ // aapt resource value: 0x7f0b0052
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
- // aapt resource value: 0x7F0D0031
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131558449;
+ // aapt resource value: 0x7f0b0095
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
- // aapt resource value: 0x7F0D0032
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131558450;
+ // aapt resource value: 0x7f0b0096
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
- // aapt resource value: 0x7F0D0033
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131558451;
+ // aapt resource value: 0x7f0b008f
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
- // aapt resource value: 0x7F0D0034
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131558452;
+ // aapt resource value: 0x7f0b00ab
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
- // aapt resource value: 0x7F0D0035
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131558453;
+ // aapt resource value: 0x7f0b0053
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
- // aapt resource value: 0x7F0D0036
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131558454;
+ // aapt resource value: 0x7f0b0054
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
- // aapt resource value: 0x7F0D0037
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131558455;
+ // aapt resource value: 0x7f0b0055
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
- // aapt resource value: 0x7F0D0038
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131558456;
+ // aapt resource value: 0x7f0b0056
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
- // aapt resource value: 0x7F0D0039
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131558457;
+ // aapt resource value: 0x7f0b0057
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
- // aapt resource value: 0x7F0D003A
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131558458;
+ // aapt resource value: 0x7f0b00ac
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
- // aapt resource value: 0x7F0D003B
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131558459;
+ // aapt resource value: 0x7f0b0058
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
- // aapt resource value: 0x7F0D004A
- public const int Base_ThemeOverlay_AppCompat = 2131558474;
+ // aapt resource value: 0x7f0b0059
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
- // aapt resource value: 0x7F0D004B
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131558475;
+ // aapt resource value: 0x7f0b005a
+ public const int Base_Theme_AppCompat = 2131427418;
- // aapt resource value: 0x7F0D004C
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131558476;
+ // aapt resource value: 0x7f0b00ad
+ public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
- // aapt resource value: 0x7F0D004D
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131558477;
+ // aapt resource value: 0x7f0b0011
+ public const int Base_Theme_AppCompat_Dialog = 2131427345;
- // aapt resource value: 0x7F0D004E
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131558478;
+ // aapt resource value: 0x7f0b0012
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
- // aapt resource value: 0x7F0D004F
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131558479;
+ // aapt resource value: 0x7f0b00ae
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
- // aapt resource value: 0x7F0D0050
- public const int Base_ThemeOverlay_AppCompat_Light = 2131558480;
+ // aapt resource value: 0x7f0b0013
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
- // aapt resource value: 0x7F0D003C
- public const int Base_Theme_AppCompat = 2131558460;
+ // aapt resource value: 0x7f0b0001
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
- // aapt resource value: 0x7F0D003D
- public const int Base_Theme_AppCompat_CompactMenu = 2131558461;
+ // aapt resource value: 0x7f0b005b
+ public const int Base_Theme_AppCompat_Light = 2131427419;
- // aapt resource value: 0x7F0D003E
- public const int Base_Theme_AppCompat_Dialog = 2131558462;
+ // aapt resource value: 0x7f0b00af
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
- // aapt resource value: 0x7F0D0042
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131558466;
+ // aapt resource value: 0x7f0b0014
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
- // aapt resource value: 0x7F0D003F
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131558463;
+ // aapt resource value: 0x7f0b0015
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
- // aapt resource value: 0x7F0D0040
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131558464;
+ // aapt resource value: 0x7f0b00b0
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
- // aapt resource value: 0x7F0D0041
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131558465;
+ // aapt resource value: 0x7f0b0016
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
- // aapt resource value: 0x7F0D0043
- public const int Base_Theme_AppCompat_Light = 2131558467;
+ // aapt resource value: 0x7f0b0002
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
- // aapt resource value: 0x7F0D0044
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131558468;
+ // aapt resource value: 0x7f0b00b1
+ public const int Base_ThemeOverlay_AppCompat = 2131427505;
- // aapt resource value: 0x7F0D0045
- public const int Base_Theme_AppCompat_Light_Dialog = 2131558469;
+ // aapt resource value: 0x7f0b00b2
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
- // aapt resource value: 0x7F0D0049
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131558473;
+ // aapt resource value: 0x7f0b00b3
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
- // aapt resource value: 0x7F0D0046
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131558470;
+ // aapt resource value: 0x7f0b00b4
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
- // aapt resource value: 0x7F0D0047
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131558471;
+ // aapt resource value: 0x7f0b0017
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
- // aapt resource value: 0x7F0D0048
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131558472;
+ // aapt resource value: 0x7f0b0018
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
- // aapt resource value: 0x7F0D0053
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131558483;
+ // aapt resource value: 0x7f0b00b5
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
- // aapt resource value: 0x7F0D0051
- public const int Base_V11_Theme_AppCompat_Dialog = 2131558481;
+ // aapt resource value: 0x7f0b0019
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
- // aapt resource value: 0x7F0D0052
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131558482;
+ // aapt resource value: 0x7f0b001a
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
- // aapt resource value: 0x7F0D0054
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131558484;
+ // aapt resource value: 0x7f0b001b
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
- // aapt resource value: 0x7F0D0055
- public const int Base_V12_Widget_AppCompat_EditText = 2131558485;
+ // aapt resource value: 0x7f0b0023
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
- // aapt resource value: 0x7F0D005A
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131558490;
+ // aapt resource value: 0x7f0b0024
+ public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
- // aapt resource value: 0x7F0D0056
- public const int Base_V21_Theme_AppCompat = 2131558486;
+ // aapt resource value: 0x7f0b016a
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
- // aapt resource value: 0x7F0D0057
- public const int Base_V21_Theme_AppCompat_Dialog = 2131558487;
+ // aapt resource value: 0x7f0b005c
+ public const int Base_V21_Theme_AppCompat = 2131427420;
- // aapt resource value: 0x7F0D0058
- public const int Base_V21_Theme_AppCompat_Light = 2131558488;
+ // aapt resource value: 0x7f0b005d
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
- // aapt resource value: 0x7F0D0059
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131558489;
+ // aapt resource value: 0x7f0b005e
+ public const int Base_V21_Theme_AppCompat_Light = 2131427422;
- // aapt resource value: 0x7F0D005B
- public const int Base_V22_Theme_AppCompat = 2131558491;
+ // aapt resource value: 0x7f0b005f
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
- // aapt resource value: 0x7F0D005C
- public const int Base_V22_Theme_AppCompat_Light = 2131558492;
+ // aapt resource value: 0x7f0b0060
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
- // aapt resource value: 0x7F0D005D
- public const int Base_V23_Theme_AppCompat = 2131558493;
+ // aapt resource value: 0x7f0b0166
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
- // aapt resource value: 0x7F0D005E
- public const int Base_V23_Theme_AppCompat_Light = 2131558494;
+ // aapt resource value: 0x7f0b008c
+ public const int Base_V22_Theme_AppCompat = 2131427468;
- // aapt resource value: 0x7F0D005F
- public const int Base_V26_Theme_AppCompat = 2131558495;
+ // aapt resource value: 0x7f0b008d
+ public const int Base_V22_Theme_AppCompat_Light = 2131427469;
- // aapt resource value: 0x7F0D0060
- public const int Base_V26_Theme_AppCompat_Light = 2131558496;
+ // aapt resource value: 0x7f0b0090
+ public const int Base_V23_Theme_AppCompat = 2131427472;
- // aapt resource value: 0x7F0D0061
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131558497;
+ // aapt resource value: 0x7f0b0091
+ public const int Base_V23_Theme_AppCompat_Light = 2131427473;
- // aapt resource value: 0x7F0D0066
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131558502;
+ // aapt resource value: 0x7f0b0099
+ public const int Base_V26_Theme_AppCompat = 2131427481;
- // aapt resource value: 0x7F0D0062
- public const int Base_V7_Theme_AppCompat = 2131558498;
+ // aapt resource value: 0x7f0b009a
+ public const int Base_V26_Theme_AppCompat_Light = 2131427482;
- // aapt resource value: 0x7F0D0063
- public const int Base_V7_Theme_AppCompat_Dialog = 2131558499;
+ // aapt resource value: 0x7f0b009b
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
- // aapt resource value: 0x7F0D0064
- public const int Base_V7_Theme_AppCompat_Light = 2131558500;
+ // aapt resource value: 0x7f0b0168
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
- // aapt resource value: 0x7F0D0065
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131558501;
+ // aapt resource value: 0x7f0b00b6
+ public const int Base_V7_Theme_AppCompat = 2131427510;
- // aapt resource value: 0x7F0D0067
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131558503;
+ // aapt resource value: 0x7f0b00b7
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
- // aapt resource value: 0x7F0D0068
- public const int Base_V7_Widget_AppCompat_EditText = 2131558504;
+ // aapt resource value: 0x7f0b00b8
+ public const int Base_V7_Theme_AppCompat_Light = 2131427512;
- // aapt resource value: 0x7F0D0069
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131558505;
+ // aapt resource value: 0x7f0b00b9
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
- // aapt resource value: 0x7F0D006A
- public const int Base_Widget_AppCompat_ActionBar = 2131558506;
+ // aapt resource value: 0x7f0b00ba
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
- // aapt resource value: 0x7F0D006B
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131558507;
+ // aapt resource value: 0x7f0b00bb
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
- // aapt resource value: 0x7F0D006C
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131558508;
+ // aapt resource value: 0x7f0b00bc
+ public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
- // aapt resource value: 0x7F0D006D
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131558509;
+ // aapt resource value: 0x7f0b00bd
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
- // aapt resource value: 0x7F0D006E
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131558510;
+ // aapt resource value: 0x7f0b00be
+ public const int Base_Widget_AppCompat_ActionBar = 2131427518;
- // aapt resource value: 0x7F0D006F
- public const int Base_Widget_AppCompat_ActionButton = 2131558511;
+ // aapt resource value: 0x7f0b00bf
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
- // aapt resource value: 0x7F0D0070
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131558512;
+ // aapt resource value: 0x7f0b00c0
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
- // aapt resource value: 0x7F0D0071
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131558513;
+ // aapt resource value: 0x7f0b0061
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
- // aapt resource value: 0x7F0D0072
- public const int Base_Widget_AppCompat_ActionMode = 2131558514;
+ // aapt resource value: 0x7f0b0062
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
- // aapt resource value: 0x7F0D0073
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131558515;
+ // aapt resource value: 0x7f0b0063
+ public const int Base_Widget_AppCompat_ActionButton = 2131427427;
- // aapt resource value: 0x7F0D0074
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131558516;
+ // aapt resource value: 0x7f0b0064
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
- // aapt resource value: 0x7F0D0075
- public const int Base_Widget_AppCompat_Button = 2131558517;
+ // aapt resource value: 0x7f0b0065
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
- // aapt resource value: 0x7F0D007B
- public const int Base_Widget_AppCompat_ButtonBar = 2131558523;
+ // aapt resource value: 0x7f0b00c1
+ public const int Base_Widget_AppCompat_ActionMode = 2131427521;
- // aapt resource value: 0x7F0D007C
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131558524;
+ // aapt resource value: 0x7f0b00c2
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
- // aapt resource value: 0x7F0D0076
- public const int Base_Widget_AppCompat_Button_Borderless = 2131558518;
+ // aapt resource value: 0x7f0b0025
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
- // aapt resource value: 0x7F0D0077
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131558519;
+ // aapt resource value: 0x7f0b0066
+ public const int Base_Widget_AppCompat_Button = 2131427430;
- // aapt resource value: 0x7F0D0078
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131558520;
+ // aapt resource value: 0x7f0b0067
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
- // aapt resource value: 0x7F0D0079
- public const int Base_Widget_AppCompat_Button_Colored = 2131558521;
+ // aapt resource value: 0x7f0b0068
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
- // aapt resource value: 0x7F0D007A
- public const int Base_Widget_AppCompat_Button_Small = 2131558522;
+ // aapt resource value: 0x7f0b00c3
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
- // aapt resource value: 0x7F0D007D
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131558525;
+ // aapt resource value: 0x7f0b0092
+ public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
- // aapt resource value: 0x7F0D007E
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131558526;
+ // aapt resource value: 0x7f0b0069
+ public const int Base_Widget_AppCompat_Button_Small = 2131427433;
- // aapt resource value: 0x7F0D007F
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131558527;
+ // aapt resource value: 0x7f0b006a
+ public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
- // aapt resource value: 0x7F0D0080
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131558528;
+ // aapt resource value: 0x7f0b00c4
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
- // aapt resource value: 0x7F0D0081
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131558529;
+ // aapt resource value: 0x7f0b006b
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
- // aapt resource value: 0x7F0D0082
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131558530;
+ // aapt resource value: 0x7f0b006c
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
- // aapt resource value: 0x7F0D0083
- public const int Base_Widget_AppCompat_EditText = 2131558531;
+ // aapt resource value: 0x7f0b00c5
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
- // aapt resource value: 0x7F0D0084
- public const int Base_Widget_AppCompat_ImageButton = 2131558532;
+ // aapt resource value: 0x7f0b0000
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
- // aapt resource value: 0x7F0D0085
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131558533;
+ // aapt resource value: 0x7f0b00c6
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
- // aapt resource value: 0x7F0D0086
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131558534;
+ // aapt resource value: 0x7f0b006d
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
- // aapt resource value: 0x7F0D0087
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131558535;
+ // aapt resource value: 0x7f0b0026
+ public const int Base_Widget_AppCompat_EditText = 2131427366;
- // aapt resource value: 0x7F0D0088
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131558536;
+ // aapt resource value: 0x7f0b006e
+ public const int Base_Widget_AppCompat_ImageButton = 2131427438;
- // aapt resource value: 0x7F0D0089
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131558537;
+ // aapt resource value: 0x7f0b00c7
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
- // aapt resource value: 0x7F0D008A
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131558538;
+ // aapt resource value: 0x7f0b00c8
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
- // aapt resource value: 0x7F0D008B
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131558539;
+ // aapt resource value: 0x7f0b00c9
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
- // aapt resource value: 0x7F0D008C
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131558540;
+ // aapt resource value: 0x7f0b006f
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
- // aapt resource value: 0x7F0D008D
- public const int Base_Widget_AppCompat_ListMenuView = 2131558541;
+ // aapt resource value: 0x7f0b0070
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
- // aapt resource value: 0x7F0D008E
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131558542;
+ // aapt resource value: 0x7f0b0071
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
- // aapt resource value: 0x7F0D008F
- public const int Base_Widget_AppCompat_ListView = 2131558543;
+ // aapt resource value: 0x7f0b0072
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
- // aapt resource value: 0x7F0D0090
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131558544;
+ // aapt resource value: 0x7f0b0073
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
- // aapt resource value: 0x7F0D0091
- public const int Base_Widget_AppCompat_ListView_Menu = 2131558545;
+ // aapt resource value: 0x7f0b00ca
+ public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
- // aapt resource value: 0x7F0D0092
- public const int Base_Widget_AppCompat_PopupMenu = 2131558546;
+ // aapt resource value: 0x7f0b0074
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
- // aapt resource value: 0x7F0D0093
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131558547;
+ // aapt resource value: 0x7f0b0075
+ public const int Base_Widget_AppCompat_ListView = 2131427445;
- // aapt resource value: 0x7F0D0094
- public const int Base_Widget_AppCompat_PopupWindow = 2131558548;
+ // aapt resource value: 0x7f0b0076
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
- // aapt resource value: 0x7F0D0095
- public const int Base_Widget_AppCompat_ProgressBar = 2131558549;
+ // aapt resource value: 0x7f0b0077
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
- // aapt resource value: 0x7F0D0096
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131558550;
+ // aapt resource value: 0x7f0b0078
+ public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
- // aapt resource value: 0x7F0D0097
- public const int Base_Widget_AppCompat_RatingBar = 2131558551;
+ // aapt resource value: 0x7f0b0079
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
- // aapt resource value: 0x7F0D0098
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131558552;
+ // aapt resource value: 0x7f0b00cb
+ public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
- // aapt resource value: 0x7F0D0099
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131558553;
+ // aapt resource value: 0x7f0b001c
+ public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
- // aapt resource value: 0x7F0D009A
- public const int Base_Widget_AppCompat_SearchView = 2131558554;
+ // aapt resource value: 0x7f0b001d
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
- // aapt resource value: 0x7F0D009B
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131558555;
+ // aapt resource value: 0x7f0b007a
+ public const int Base_Widget_AppCompat_RatingBar = 2131427450;
- // aapt resource value: 0x7F0D009C
- public const int Base_Widget_AppCompat_SeekBar = 2131558556;
+ // aapt resource value: 0x7f0b0093
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
- // aapt resource value: 0x7F0D009D
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131558557;
+ // aapt resource value: 0x7f0b0094
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
- // aapt resource value: 0x7F0D009E
- public const int Base_Widget_AppCompat_Spinner = 2131558558;
+ // aapt resource value: 0x7f0b00cc
+ public const int Base_Widget_AppCompat_SearchView = 2131427532;
- // aapt resource value: 0x7F0D009F
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131558559;
+ // aapt resource value: 0x7f0b00cd
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
- // aapt resource value: 0x7F0D00A0
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131558560;
+ // aapt resource value: 0x7f0b007b
+ public const int Base_Widget_AppCompat_SeekBar = 2131427451;
- // aapt resource value: 0x7F0D00A1
- public const int Base_Widget_AppCompat_Toolbar = 2131558561;
+ // aapt resource value: 0x7f0b00ce
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
- // aapt resource value: 0x7F0D00A2
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131558562;
+ // aapt resource value: 0x7f0b007c
+ public const int Base_Widget_AppCompat_Spinner = 2131427452;
- // aapt resource value: 0x7F0D00A3
- public const int BottomSheetDialogAnimation = 2131558563;
+ // aapt resource value: 0x7f0b0003
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
- // aapt resource value: 0x7F0D016F
- public const int custom_dialog2 = 2131558767;
+ // aapt resource value: 0x7f0b007d
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
- // aapt resource value: 0x7F0D00A4
- public const int MyTheme = 2131558564;
+ // aapt resource value: 0x7f0b009c
+ public const int Base_Widget_AppCompat_Toolbar = 2131427484;
- // aapt resource value: 0x7F0D0170
- public const int picker_view_scale_anim = 2131558768;
+ // aapt resource value: 0x7f0b007e
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
- // aapt resource value: 0x7F0D0171
- public const int picker_view_slide_anim = 2131558769;
+ // aapt resource value: 0x7f0b0167
+ public const int Base_Widget_Design_AppBarLayout = 2131427687;
- // aapt resource value: 0x7F0D00A5
- public const int Platform_AppCompat = 2131558565;
+ // aapt resource value: 0x7f0b016b
+ public const int Base_Widget_Design_TabLayout = 2131427691;
- // aapt resource value: 0x7F0D00A6
- public const int Platform_AppCompat_Light = 2131558566;
+ // aapt resource value: 0x7f0b018a
+ public const int BottomSheetDialogAnimation = 2131427722;
- // aapt resource value: 0x7F0D00A7
- public const int Platform_ThemeOverlay_AppCompat = 2131558567;
+ // aapt resource value: 0x7f0b018f
+ public const int MyTheme = 2131427727;
- // aapt resource value: 0x7F0D00A8
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131558568;
+ // aapt resource value: 0x7f0b001e
+ public const int Platform_AppCompat = 2131427358;
- // aapt resource value: 0x7F0D00A9
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131558569;
+ // aapt resource value: 0x7f0b001f
+ public const int Platform_AppCompat_Light = 2131427359;
- // aapt resource value: 0x7F0D00AA
- public const int Platform_V11_AppCompat = 2131558570;
+ // aapt resource value: 0x7f0b007f
+ public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+
+ // aapt resource value: 0x7f0b0080
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+
+ // aapt resource value: 0x7f0b0081
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+
+ // aapt resource value: 0x7f0b0020
+ public const int Platform_V11_AppCompat = 2131427360;
+
+ // aapt resource value: 0x7f0b0021
+ public const int Platform_V11_AppCompat_Light = 2131427361;
+
+ // aapt resource value: 0x7f0b0028
+ public const int Platform_V14_AppCompat = 2131427368;
+
+ // aapt resource value: 0x7f0b0029
+ public const int Platform_V14_AppCompat_Light = 2131427369;
+
+ // aapt resource value: 0x7f0b0082
+ public const int Platform_V21_AppCompat = 2131427458;
+
+ // aapt resource value: 0x7f0b0083
+ public const int Platform_V21_AppCompat_Light = 2131427459;
+
+ // aapt resource value: 0x7f0b0097
+ public const int Platform_V25_AppCompat = 2131427479;
+
+ // aapt resource value: 0x7f0b0098
+ public const int Platform_V25_AppCompat_Light = 2131427480;
+
+ // aapt resource value: 0x7f0b0022
+ public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+
+ // aapt resource value: 0x7f0b002b
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+
+ // aapt resource value: 0x7f0b002c
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+
+ // aapt resource value: 0x7f0b002d
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+
+ // aapt resource value: 0x7f0b002e
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+
+ // aapt resource value: 0x7f0b002f
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+
+ // aapt resource value: 0x7f0b0030
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+
+ // aapt resource value: 0x7f0b0031
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+
+ // aapt resource value: 0x7f0b0032
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+
+ // aapt resource value: 0x7f0b0033
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+
+ // aapt resource value: 0x7f0b0034
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+
+ // aapt resource value: 0x7f0b0035
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+
+ // aapt resource value: 0x7f0b0036
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+
+ // aapt resource value: 0x7f0b0037
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+
+ // aapt resource value: 0x7f0b0038
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+
+ // aapt resource value: 0x7f0b00cf
+ public const int TextAppearance_AppCompat = 2131427535;
+
+ // aapt resource value: 0x7f0b00d0
+ public const int TextAppearance_AppCompat_Body1 = 2131427536;
+
+ // aapt resource value: 0x7f0b00d1
+ public const int TextAppearance_AppCompat_Body2 = 2131427537;
+
+ // aapt resource value: 0x7f0b00d2
+ public const int TextAppearance_AppCompat_Button = 2131427538;
+
+ // aapt resource value: 0x7f0b00d3
+ public const int TextAppearance_AppCompat_Caption = 2131427539;
- // aapt resource value: 0x7F0D00AB
- public const int Platform_V11_AppCompat_Light = 2131558571;
+ // aapt resource value: 0x7f0b00d4
+ public const int TextAppearance_AppCompat_Display1 = 2131427540;
- // aapt resource value: 0x7F0D00AC
- public const int Platform_V14_AppCompat = 2131558572;
+ // aapt resource value: 0x7f0b00d5
+ public const int TextAppearance_AppCompat_Display2 = 2131427541;
- // aapt resource value: 0x7F0D00AD
- public const int Platform_V14_AppCompat_Light = 2131558573;
+ // aapt resource value: 0x7f0b00d6
+ public const int TextAppearance_AppCompat_Display3 = 2131427542;
- // aapt resource value: 0x7F0D00AE
- public const int Platform_V21_AppCompat = 2131558574;
+ // aapt resource value: 0x7f0b00d7
+ public const int TextAppearance_AppCompat_Display4 = 2131427543;
- // aapt resource value: 0x7F0D00AF
- public const int Platform_V21_AppCompat_Light = 2131558575;
+ // aapt resource value: 0x7f0b00d8
+ public const int TextAppearance_AppCompat_Headline = 2131427544;
- // aapt resource value: 0x7F0D00B0
- public const int Platform_V25_AppCompat = 2131558576;
+ // aapt resource value: 0x7f0b00d9
+ public const int TextAppearance_AppCompat_Inverse = 2131427545;
- // aapt resource value: 0x7F0D00B1
- public const int Platform_V25_AppCompat_Light = 2131558577;
+ // aapt resource value: 0x7f0b00da
+ public const int TextAppearance_AppCompat_Large = 2131427546;
- // aapt resource value: 0x7F0D00B2
- public const int Platform_Widget_AppCompat_Spinner = 2131558578;
+ // aapt resource value: 0x7f0b00db
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
- // aapt resource value: 0x7F0D00B3
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131558579;
+ // aapt resource value: 0x7f0b00dc
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
- // aapt resource value: 0x7F0D00B4
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131558580;
+ // aapt resource value: 0x7f0b00dd
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
- // aapt resource value: 0x7F0D00B5
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131558581;
+ // aapt resource value: 0x7f0b00de
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
- // aapt resource value: 0x7F0D00B6
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131558582;
+ // aapt resource value: 0x7f0b00df
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
- // aapt resource value: 0x7F0D00B7
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131558583;
+ // aapt resource value: 0x7f0b00e0
+ public const int TextAppearance_AppCompat_Medium = 2131427552;
- // aapt resource value: 0x7F0D00B8
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131558584;
+ // aapt resource value: 0x7f0b00e1
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
- // aapt resource value: 0x7F0D00BE
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131558590;
+ // aapt resource value: 0x7f0b00e2
+ public const int TextAppearance_AppCompat_Menu = 2131427554;
- // aapt resource value: 0x7F0D00B9
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131558585;
+ // aapt resource value: 0x7f0b0084
+ public const int TextAppearance_AppCompat_Notification = 2131427460;
- // aapt resource value: 0x7F0D00BA
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131558586;
+ // aapt resource value: 0x7f0b0085
+ public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
- // aapt resource value: 0x7F0D00BB
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131558587;
+ // aapt resource value: 0x7f0b0086
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
- // aapt resource value: 0x7F0D00BC
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131558588;
+ // aapt resource value: 0x7f0b00e3
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
- // aapt resource value: 0x7F0D00BD
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131558589;
+ // aapt resource value: 0x7f0b00e4
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
- // aapt resource value: 0x7F0D00BF
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131558591;
+ // aapt resource value: 0x7f0b0087
+ public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
- // aapt resource value: 0x7F0D00C0
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131558592;
+ // aapt resource value: 0x7f0b0088
+ public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
- // aapt resource value: 0x7F0D00C1
- public const int TextAppearance_AppCompat = 2131558593;
+ // aapt resource value: 0x7f0b0089
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
- // aapt resource value: 0x7F0D00C2
- public const int TextAppearance_AppCompat_Body1 = 2131558594;
+ // aapt resource value: 0x7f0b008a
+ public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
- // aapt resource value: 0x7F0D00C3
- public const int TextAppearance_AppCompat_Body2 = 2131558595;
+ // aapt resource value: 0x7f0b008b
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
- // aapt resource value: 0x7F0D00C4
- public const int TextAppearance_AppCompat_Button = 2131558596;
+ // aapt resource value: 0x7f0b00e5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
- // aapt resource value: 0x7F0D00C5
- public const int TextAppearance_AppCompat_Caption = 2131558597;
+ // aapt resource value: 0x7f0b00e6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
- // aapt resource value: 0x7F0D00C6
- public const int TextAppearance_AppCompat_Display1 = 2131558598;
+ // aapt resource value: 0x7f0b00e7
+ public const int TextAppearance_AppCompat_Small = 2131427559;
- // aapt resource value: 0x7F0D00C7
- public const int TextAppearance_AppCompat_Display2 = 2131558599;
+ // aapt resource value: 0x7f0b00e8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
- // aapt resource value: 0x7F0D00C8
- public const int TextAppearance_AppCompat_Display3 = 2131558600;
+ // aapt resource value: 0x7f0b00e9
+ public const int TextAppearance_AppCompat_Subhead = 2131427561;
- // aapt resource value: 0x7F0D00C9
- public const int TextAppearance_AppCompat_Display4 = 2131558601;
+ // aapt resource value: 0x7f0b00ea
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
- // aapt resource value: 0x7F0D00CA
- public const int TextAppearance_AppCompat_Headline = 2131558602;
+ // aapt resource value: 0x7f0b00eb
+ public const int TextAppearance_AppCompat_Title = 2131427563;
- // aapt resource value: 0x7F0D00CB
- public const int TextAppearance_AppCompat_Inverse = 2131558603;
+ // aapt resource value: 0x7f0b00ec
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
- // aapt resource value: 0x7F0D00CC
- public const int TextAppearance_AppCompat_Large = 2131558604;
+ // aapt resource value: 0x7f0b002a
+ public const int TextAppearance_AppCompat_Tooltip = 2131427370;
- // aapt resource value: 0x7F0D00CD
- public const int TextAppearance_AppCompat_Large_Inverse = 2131558605;
+ // aapt resource value: 0x7f0b00ed
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
- // aapt resource value: 0x7F0D00CE
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131558606;
+ // aapt resource value: 0x7f0b00ee
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
- // aapt resource value: 0x7F0D00CF
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131558607;
+ // aapt resource value: 0x7f0b00ef
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
- // aapt resource value: 0x7F0D00D0
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131558608;
+ // aapt resource value: 0x7f0b00f0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
- // aapt resource value: 0x7F0D00D1
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131558609;
+ // aapt resource value: 0x7f0b00f1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
- // aapt resource value: 0x7F0D00D2
- public const int TextAppearance_AppCompat_Medium = 2131558610;
+ // aapt resource value: 0x7f0b00f2
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
- // aapt resource value: 0x7F0D00D3
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131558611;
+ // aapt resource value: 0x7f0b00f3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
- // aapt resource value: 0x7F0D00D4
- public const int TextAppearance_AppCompat_Menu = 2131558612;
+ // aapt resource value: 0x7f0b00f4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
- // aapt resource value: 0x7F0D00D5
- public const int TextAppearance_AppCompat_Notification = 2131558613;
+ // aapt resource value: 0x7f0b00f5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
- // aapt resource value: 0x7F0D00D6
- public const int TextAppearance_AppCompat_Notification_Info = 2131558614;
+ // aapt resource value: 0x7f0b00f6
+ public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
- // aapt resource value: 0x7F0D00D7
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131558615;
+ // aapt resource value: 0x7f0b00f7
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
- // aapt resource value: 0x7F0D00D8
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131558616;
+ // aapt resource value: 0x7f0b00f8
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
- // aapt resource value: 0x7F0D00D9
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131558617;
+ // aapt resource value: 0x7f0b00f9
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
- // aapt resource value: 0x7F0D00DA
- public const int TextAppearance_AppCompat_Notification_Media = 2131558618;
+ // aapt resource value: 0x7f0b00fa
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
- // aapt resource value: 0x7F0D00DB
- public const int TextAppearance_AppCompat_Notification_Time = 2131558619;
+ // aapt resource value: 0x7f0b00fb
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
- // aapt resource value: 0x7F0D00DC
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131558620;
+ // aapt resource value: 0x7f0b00fc
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
- // aapt resource value: 0x7F0D00DD
- public const int TextAppearance_AppCompat_Notification_Title = 2131558621;
+ // aapt resource value: 0x7f0b00fd
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
- // aapt resource value: 0x7F0D00DE
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131558622;
+ // aapt resource value: 0x7f0b00fe
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
- // aapt resource value: 0x7F0D00DF
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131558623;
+ // aapt resource value: 0x7f0b00ff
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
- // aapt resource value: 0x7F0D00E0
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131558624;
+ // aapt resource value: 0x7f0b0183
+ public const int TextAppearance_Compat_Notification = 2131427715;
- // aapt resource value: 0x7F0D00E1
- public const int TextAppearance_AppCompat_Small = 2131558625;
+ // aapt resource value: 0x7f0b0184
+ public const int TextAppearance_Compat_Notification_Info = 2131427716;
- // aapt resource value: 0x7F0D00E2
- public const int TextAppearance_AppCompat_Small_Inverse = 2131558626;
+ // aapt resource value: 0x7f0b0160
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
- // aapt resource value: 0x7F0D00E3
- public const int TextAppearance_AppCompat_Subhead = 2131558627;
+ // aapt resource value: 0x7f0b0189
+ public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
- // aapt resource value: 0x7F0D00E4
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131558628;
+ // aapt resource value: 0x7f0b0164
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
- // aapt resource value: 0x7F0D00E5
- public const int TextAppearance_AppCompat_Title = 2131558629;
+ // aapt resource value: 0x7f0b0161
+ public const int TextAppearance_Compat_Notification_Media = 2131427681;
- // aapt resource value: 0x7F0D00E6
- public const int TextAppearance_AppCompat_Title_Inverse = 2131558630;
+ // aapt resource value: 0x7f0b0185
+ public const int TextAppearance_Compat_Notification_Time = 2131427717;
- // aapt resource value: 0x7F0D00E7
- public const int TextAppearance_AppCompat_Tooltip = 2131558631;
+ // aapt resource value: 0x7f0b0162
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
- // aapt resource value: 0x7F0D00E8
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131558632;
+ // aapt resource value: 0x7f0b0186
+ public const int TextAppearance_Compat_Notification_Title = 2131427718;
- // aapt resource value: 0x7F0D00E9
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131558633;
+ // aapt resource value: 0x7f0b0163
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
- // aapt resource value: 0x7F0D00EA
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131558634;
+ // aapt resource value: 0x7f0b016c
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
- // aapt resource value: 0x7F0D00EB
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131558635;
+ // aapt resource value: 0x7f0b016d
+ public const int TextAppearance_Design_Counter = 2131427693;
- // aapt resource value: 0x7F0D00EC
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131558636;
+ // aapt resource value: 0x7f0b016e
+ public const int TextAppearance_Design_Counter_Overflow = 2131427694;
- // aapt resource value: 0x7F0D00ED
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131558637;
+ // aapt resource value: 0x7f0b016f
+ public const int TextAppearance_Design_Error = 2131427695;
- // aapt resource value: 0x7F0D00EE
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131558638;
+ // aapt resource value: 0x7f0b0170
+ public const int TextAppearance_Design_Hint = 2131427696;
- // aapt resource value: 0x7F0D00EF
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131558639;
+ // aapt resource value: 0x7f0b0171
+ public const int TextAppearance_Design_Snackbar_Message = 2131427697;
- // aapt resource value: 0x7F0D00F0
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131558640;
+ // aapt resource value: 0x7f0b0172
+ public const int TextAppearance_Design_Tab = 2131427698;
- // aapt resource value: 0x7F0D00F1
- public const int TextAppearance_AppCompat_Widget_Button = 2131558641;
+ // aapt resource value: 0x7f0b0100
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
- // aapt resource value: 0x7F0D00F2
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131558642;
+ // aapt resource value: 0x7f0b0101
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
- // aapt resource value: 0x7F0D00F3
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131558643;
+ // aapt resource value: 0x7f0b0102
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
- // aapt resource value: 0x7F0D00F4
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131558644;
+ // aapt resource value: 0x7f0b0103
+ public const int Theme_AppCompat = 2131427587;
- // aapt resource value: 0x7F0D00F5
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131558645;
+ // aapt resource value: 0x7f0b0104
+ public const int Theme_AppCompat_CompactMenu = 2131427588;
- // aapt resource value: 0x7F0D00F6
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131558646;
+ // aapt resource value: 0x7f0b0004
+ public const int Theme_AppCompat_DayNight = 2131427332;
- // aapt resource value: 0x7F0D00F7
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131558647;
+ // aapt resource value: 0x7f0b0005
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
- // aapt resource value: 0x7F0D00F8
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131558648;
+ // aapt resource value: 0x7f0b0006
+ public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
- // aapt resource value: 0x7F0D00F9
- public const int TextAppearance_AppCompat_Widget_Switch = 2131558649;
+ // aapt resource value: 0x7f0b0007
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
- // aapt resource value: 0x7F0D00FA
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131558650;
+ // aapt resource value: 0x7f0b0008
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
- // aapt resource value: 0x7F0D00FB
- public const int TextAppearance_Compat_Notification = 2131558651;
+ // aapt resource value: 0x7f0b0009
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
- // aapt resource value: 0x7F0D00FC
- public const int TextAppearance_Compat_Notification_Info = 2131558652;
+ // aapt resource value: 0x7f0b000a
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
- // aapt resource value: 0x7F0D00FD
- public const int TextAppearance_Compat_Notification_Info_Media = 2131558653;
+ // aapt resource value: 0x7f0b0105
+ public const int Theme_AppCompat_Dialog = 2131427589;
- // aapt resource value: 0x7F0D00FE
- public const int TextAppearance_Compat_Notification_Line2 = 2131558654;
+ // aapt resource value: 0x7f0b0106
+ public const int Theme_AppCompat_Dialog_Alert = 2131427590;
- // aapt resource value: 0x7F0D00FF
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131558655;
+ // aapt resource value: 0x7f0b0107
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
- // aapt resource value: 0x7F0D0100
- public const int TextAppearance_Compat_Notification_Media = 2131558656;
+ // aapt resource value: 0x7f0b0108
+ public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
- // aapt resource value: 0x7F0D0101
- public const int TextAppearance_Compat_Notification_Time = 2131558657;
+ // aapt resource value: 0x7f0b0109
+ public const int Theme_AppCompat_Light = 2131427593;
- // aapt resource value: 0x7F0D0102
- public const int TextAppearance_Compat_Notification_Time_Media = 2131558658;
+ // aapt resource value: 0x7f0b010a
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
- // aapt resource value: 0x7F0D0103
- public const int TextAppearance_Compat_Notification_Title = 2131558659;
+ // aapt resource value: 0x7f0b010b
+ public const int Theme_AppCompat_Light_Dialog = 2131427595;
- // aapt resource value: 0x7F0D0104
- public const int TextAppearance_Compat_Notification_Title_Media = 2131558660;
+ // aapt resource value: 0x7f0b010c
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
- // aapt resource value: 0x7F0D0105
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131558661;
+ // aapt resource value: 0x7f0b010d
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
- // aapt resource value: 0x7F0D0106
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131558662;
+ // aapt resource value: 0x7f0b010e
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
- // aapt resource value: 0x7F0D0107
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131558663;
+ // aapt resource value: 0x7f0b010f
+ public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
- // aapt resource value: 0x7F0D011E
- public const int ThemeOverlay_AppCompat = 2131558686;
+ // aapt resource value: 0x7f0b0110
+ public const int Theme_AppCompat_NoActionBar = 2131427600;
- // aapt resource value: 0x7F0D011F
- public const int ThemeOverlay_AppCompat_ActionBar = 2131558687;
+ // aapt resource value: 0x7f0b018b
+ public const int Theme_BiometricPromptDialog = 2131427723;
- // aapt resource value: 0x7F0D0120
- public const int ThemeOverlay_AppCompat_Dark = 2131558688;
+ // aapt resource value: 0x7f0b0173
+ public const int Theme_Design = 2131427699;
- // aapt resource value: 0x7F0D0121
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131558689;
+ // aapt resource value: 0x7f0b0174
+ public const int Theme_Design_BottomSheetDialog = 2131427700;
- // aapt resource value: 0x7F0D0122
- public const int ThemeOverlay_AppCompat_Dialog = 2131558690;
+ // aapt resource value: 0x7f0b0175
+ public const int Theme_Design_Light = 2131427701;
- // aapt resource value: 0x7F0D0123
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131558691;
+ // aapt resource value: 0x7f0b0176
+ public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
- // aapt resource value: 0x7F0D0124
- public const int ThemeOverlay_AppCompat_Light = 2131558692;
+ // aapt resource value: 0x7f0b0177
+ public const int Theme_Design_Light_NoActionBar = 2131427703;
- // aapt resource value: 0x7F0D0108
- public const int Theme_AppCompat = 2131558664;
+ // aapt resource value: 0x7f0b0178
+ public const int Theme_Design_NoActionBar = 2131427704;
- // aapt resource value: 0x7F0D0109
- public const int Theme_AppCompat_CompactMenu = 2131558665;
+ // aapt resource value: 0x7f0b0111
+ public const int ThemeOverlay_AppCompat = 2131427601;
- // aapt resource value: 0x7F0D010A
- public const int Theme_AppCompat_DayNight = 2131558666;
+ // aapt resource value: 0x7f0b0112
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
- // aapt resource value: 0x7F0D010B
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131558667;
+ // aapt resource value: 0x7f0b0113
+ public const int ThemeOverlay_AppCompat_Dark = 2131427603;
- // aapt resource value: 0x7F0D010C
- public const int Theme_AppCompat_DayNight_Dialog = 2131558668;
+ // aapt resource value: 0x7f0b0114
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
- // aapt resource value: 0x7F0D010F
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131558671;
+ // aapt resource value: 0x7f0b0115
+ public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
- // aapt resource value: 0x7F0D010D
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131558669;
+ // aapt resource value: 0x7f0b0116
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
- // aapt resource value: 0x7F0D010E
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131558670;
+ // aapt resource value: 0x7f0b0117
+ public const int ThemeOverlay_AppCompat_Light = 2131427607;
- // aapt resource value: 0x7F0D0110
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131558672;
+ // aapt resource value: 0x7f0b0118
+ public const int Widget_AppCompat_ActionBar = 2131427608;
- // aapt resource value: 0x7F0D0111
- public const int Theme_AppCompat_Dialog = 2131558673;
+ // aapt resource value: 0x7f0b0119
+ public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
- // aapt resource value: 0x7F0D0114
- public const int Theme_AppCompat_DialogWhenLarge = 2131558676;
+ // aapt resource value: 0x7f0b011a
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
- // aapt resource value: 0x7F0D0112
- public const int Theme_AppCompat_Dialog_Alert = 2131558674;
+ // aapt resource value: 0x7f0b011b
+ public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
- // aapt resource value: 0x7F0D0113
- public const int Theme_AppCompat_Dialog_MinWidth = 2131558675;
+ // aapt resource value: 0x7f0b011c
+ public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
- // aapt resource value: 0x7F0D0115
- public const int Theme_AppCompat_Light = 2131558677;
+ // aapt resource value: 0x7f0b011d
+ public const int Widget_AppCompat_ActionButton = 2131427613;
- // aapt resource value: 0x7F0D0116
- public const int Theme_AppCompat_Light_DarkActionBar = 2131558678;
+ // aapt resource value: 0x7f0b011e
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
- // aapt resource value: 0x7F0D0117
- public const int Theme_AppCompat_Light_Dialog = 2131558679;
+ // aapt resource value: 0x7f0b011f
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
- // aapt resource value: 0x7F0D011A
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131558682;
+ // aapt resource value: 0x7f0b0120
+ public const int Widget_AppCompat_ActionMode = 2131427616;
- // aapt resource value: 0x7F0D0118
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131558680;
+ // aapt resource value: 0x7f0b0121
+ public const int Widget_AppCompat_ActivityChooserView = 2131427617;
- // aapt resource value: 0x7F0D0119
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131558681;
+ // aapt resource value: 0x7f0b0122
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
- // aapt resource value: 0x7F0D011B
- public const int Theme_AppCompat_Light_NoActionBar = 2131558683;
+ // aapt resource value: 0x7f0b0123
+ public const int Widget_AppCompat_Button = 2131427619;
- // aapt resource value: 0x7F0D011C
- public const int Theme_AppCompat_NoActionBar = 2131558684;
+ // aapt resource value: 0x7f0b0124
+ public const int Widget_AppCompat_Button_Borderless = 2131427620;
- // aapt resource value: 0x7F0D011D
- public const int Theme_BiometricPromptDialog = 2131558685;
+ // aapt resource value: 0x7f0b0125
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
- // aapt resource value: 0x7F0D0125
- public const int Widget_AppCompat_ActionBar = 2131558693;
+ // aapt resource value: 0x7f0b0126
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
- // aapt resource value: 0x7F0D0126
- public const int Widget_AppCompat_ActionBar_Solid = 2131558694;
+ // aapt resource value: 0x7f0b0127
+ public const int Widget_AppCompat_Button_Colored = 2131427623;
- // aapt resource value: 0x7F0D0127
- public const int Widget_AppCompat_ActionBar_TabBar = 2131558695;
+ // aapt resource value: 0x7f0b0128
+ public const int Widget_AppCompat_Button_Small = 2131427624;
- // aapt resource value: 0x7F0D0128
- public const int Widget_AppCompat_ActionBar_TabText = 2131558696;
+ // aapt resource value: 0x7f0b0129
+ public const int Widget_AppCompat_ButtonBar = 2131427625;
- // aapt resource value: 0x7F0D0129
- public const int Widget_AppCompat_ActionBar_TabView = 2131558697;
+ // aapt resource value: 0x7f0b012a
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
- // aapt resource value: 0x7F0D012A
- public const int Widget_AppCompat_ActionButton = 2131558698;
+ // aapt resource value: 0x7f0b012b
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
- // aapt resource value: 0x7F0D012B
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131558699;
+ // aapt resource value: 0x7f0b012c
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
- // aapt resource value: 0x7F0D012C
- public const int Widget_AppCompat_ActionButton_Overflow = 2131558700;
+ // aapt resource value: 0x7f0b012d
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
- // aapt resource value: 0x7F0D012D
- public const int Widget_AppCompat_ActionMode = 2131558701;
+ // aapt resource value: 0x7f0b012e
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
- // aapt resource value: 0x7F0D012E
- public const int Widget_AppCompat_ActivityChooserView = 2131558702;
+ // aapt resource value: 0x7f0b012f
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
- // aapt resource value: 0x7F0D012F
- public const int Widget_AppCompat_AutoCompleteTextView = 2131558703;
+ // aapt resource value: 0x7f0b0130
+ public const int Widget_AppCompat_EditText = 2131427632;
- // aapt resource value: 0x7F0D0130
- public const int Widget_AppCompat_Button = 2131558704;
+ // aapt resource value: 0x7f0b0131
+ public const int Widget_AppCompat_ImageButton = 2131427633;
- // aapt resource value: 0x7F0D0136
- public const int Widget_AppCompat_ButtonBar = 2131558710;
+ // aapt resource value: 0x7f0b0132
+ public const int Widget_AppCompat_Light_ActionBar = 2131427634;
- // aapt resource value: 0x7F0D0137
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131558711;
+ // aapt resource value: 0x7f0b0133
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
- // aapt resource value: 0x7F0D0131
- public const int Widget_AppCompat_Button_Borderless = 2131558705;
+ // aapt resource value: 0x7f0b0134
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
- // aapt resource value: 0x7F0D0132
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131558706;
+ // aapt resource value: 0x7f0b0135
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
- // aapt resource value: 0x7F0D0133
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131558707;
+ // aapt resource value: 0x7f0b0136
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
- // aapt resource value: 0x7F0D0134
- public const int Widget_AppCompat_Button_Colored = 2131558708;
+ // aapt resource value: 0x7f0b0137
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
- // aapt resource value: 0x7F0D0135
- public const int Widget_AppCompat_Button_Small = 2131558709;
+ // aapt resource value: 0x7f0b0138
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
- // aapt resource value: 0x7F0D0138
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131558712;
+ // aapt resource value: 0x7f0b0139
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
- // aapt resource value: 0x7F0D0139
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131558713;
+ // aapt resource value: 0x7f0b013a
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
- // aapt resource value: 0x7F0D013A
- public const int Widget_AppCompat_CompoundButton_Switch = 2131558714;
+ // aapt resource value: 0x7f0b013b
+ public const int Widget_AppCompat_Light_ActionButton = 2131427643;
- // aapt resource value: 0x7F0D013B
- public const int Widget_AppCompat_DrawerArrowToggle = 2131558715;
+ // aapt resource value: 0x7f0b013c
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
- // aapt resource value: 0x7F0D013C
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131558716;
+ // aapt resource value: 0x7f0b013d
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
- // aapt resource value: 0x7F0D013D
- public const int Widget_AppCompat_EditText = 2131558717;
+ // aapt resource value: 0x7f0b013e
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
- // aapt resource value: 0x7F0D013E
- public const int Widget_AppCompat_ImageButton = 2131558718;
+ // aapt resource value: 0x7f0b013f
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
- // aapt resource value: 0x7F0D013F
- public const int Widget_AppCompat_Light_ActionBar = 2131558719;
+ // aapt resource value: 0x7f0b0140
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
- // aapt resource value: 0x7F0D0140
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131558720;
+ // aapt resource value: 0x7f0b0141
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
- // aapt resource value: 0x7F0D0141
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131558721;
+ // aapt resource value: 0x7f0b0142
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
- // aapt resource value: 0x7F0D0142
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131558722;
+ // aapt resource value: 0x7f0b0143
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
- // aapt resource value: 0x7F0D0143
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131558723;
+ // aapt resource value: 0x7f0b0144
+ public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
- // aapt resource value: 0x7F0D0144
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131558724;
+ // aapt resource value: 0x7f0b0145
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
- // aapt resource value: 0x7F0D0145
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131558725;
+ // aapt resource value: 0x7f0b0146
+ public const int Widget_AppCompat_Light_SearchView = 2131427654;
- // aapt resource value: 0x7F0D0146
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131558726;
+ // aapt resource value: 0x7f0b0147
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
- // aapt resource value: 0x7F0D0147
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131558727;
+ // aapt resource value: 0x7f0b0148
+ public const int Widget_AppCompat_ListMenuView = 2131427656;
- // aapt resource value: 0x7F0D0148
- public const int Widget_AppCompat_Light_ActionButton = 2131558728;
+ // aapt resource value: 0x7f0b0149
+ public const int Widget_AppCompat_ListPopupWindow = 2131427657;
- // aapt resource value: 0x7F0D0149
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131558729;
+ // aapt resource value: 0x7f0b014a
+ public const int Widget_AppCompat_ListView = 2131427658;
- // aapt resource value: 0x7F0D014A
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131558730;
+ // aapt resource value: 0x7f0b014b
+ public const int Widget_AppCompat_ListView_DropDown = 2131427659;
- // aapt resource value: 0x7F0D014B
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131558731;
+ // aapt resource value: 0x7f0b014c
+ public const int Widget_AppCompat_ListView_Menu = 2131427660;
- // aapt resource value: 0x7F0D014C
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131558732;
+ // aapt resource value: 0x7f0b014d
+ public const int Widget_AppCompat_PopupMenu = 2131427661;
- // aapt resource value: 0x7F0D014D
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131558733;
+ // aapt resource value: 0x7f0b014e
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
- // aapt resource value: 0x7F0D014E
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131558734;
+ // aapt resource value: 0x7f0b014f
+ public const int Widget_AppCompat_PopupWindow = 2131427663;
- // aapt resource value: 0x7F0D014F
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131558735;
+ // aapt resource value: 0x7f0b0150
+ public const int Widget_AppCompat_ProgressBar = 2131427664;
- // aapt resource value: 0x7F0D0150
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131558736;
+ // aapt resource value: 0x7f0b0151
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
- // aapt resource value: 0x7F0D0151
- public const int Widget_AppCompat_Light_PopupMenu = 2131558737;
+ // aapt resource value: 0x7f0b0152
+ public const int Widget_AppCompat_RatingBar = 2131427666;
- // aapt resource value: 0x7F0D0152
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131558738;
+ // aapt resource value: 0x7f0b0153
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
- // aapt resource value: 0x7F0D0153
- public const int Widget_AppCompat_Light_SearchView = 2131558739;
+ // aapt resource value: 0x7f0b0154
+ public const int Widget_AppCompat_RatingBar_Small = 2131427668;
- // aapt resource value: 0x7F0D0154
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131558740;
+ // aapt resource value: 0x7f0b0155
+ public const int Widget_AppCompat_SearchView = 2131427669;
- // aapt resource value: 0x7F0D0155
- public const int Widget_AppCompat_ListMenuView = 2131558741;
+ // aapt resource value: 0x7f0b0156
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
- // aapt resource value: 0x7F0D0156
- public const int Widget_AppCompat_ListPopupWindow = 2131558742;
+ // aapt resource value: 0x7f0b0157
+ public const int Widget_AppCompat_SeekBar = 2131427671;
- // aapt resource value: 0x7F0D0157
- public const int Widget_AppCompat_ListView = 2131558743;
+ // aapt resource value: 0x7f0b0158
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
- // aapt resource value: 0x7F0D0158
- public const int Widget_AppCompat_ListView_DropDown = 2131558744;
+ // aapt resource value: 0x7f0b0159
+ public const int Widget_AppCompat_Spinner = 2131427673;
- // aapt resource value: 0x7F0D0159
- public const int Widget_AppCompat_ListView_Menu = 2131558745;
+ // aapt resource value: 0x7f0b015a
+ public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
- // aapt resource value: 0x7F0D015A
- public const int Widget_AppCompat_PopupMenu = 2131558746;
+ // aapt resource value: 0x7f0b015b
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
- // aapt resource value: 0x7F0D015B
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131558747;
+ // aapt resource value: 0x7f0b015c
+ public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
- // aapt resource value: 0x7F0D015C
- public const int Widget_AppCompat_PopupWindow = 2131558748;
+ // aapt resource value: 0x7f0b015d
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
- // aapt resource value: 0x7F0D015D
- public const int Widget_AppCompat_ProgressBar = 2131558749;
+ // aapt resource value: 0x7f0b015e
+ public const int Widget_AppCompat_Toolbar = 2131427678;
- // aapt resource value: 0x7F0D015E
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131558750;
+ // aapt resource value: 0x7f0b015f
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
- // aapt resource value: 0x7F0D015F
- public const int Widget_AppCompat_RatingBar = 2131558751;
+ // aapt resource value: 0x7f0b0187
+ public const int Widget_Compat_NotificationActionContainer = 2131427719;
- // aapt resource value: 0x7F0D0160
- public const int Widget_AppCompat_RatingBar_Indicator = 2131558752;
+ // aapt resource value: 0x7f0b0188
+ public const int Widget_Compat_NotificationActionText = 2131427720;
- // aapt resource value: 0x7F0D0161
- public const int Widget_AppCompat_RatingBar_Small = 2131558753;
+ // aapt resource value: 0x7f0b0179
+ public const int Widget_Design_AppBarLayout = 2131427705;
- // aapt resource value: 0x7F0D0162
- public const int Widget_AppCompat_SearchView = 2131558754;
+ // aapt resource value: 0x7f0b017a
+ public const int Widget_Design_BottomNavigationView = 2131427706;
- // aapt resource value: 0x7F0D0163
- public const int Widget_AppCompat_SearchView_ActionBar = 2131558755;
+ // aapt resource value: 0x7f0b017b
+ public const int Widget_Design_BottomSheet_Modal = 2131427707;
- // aapt resource value: 0x7F0D0164
- public const int Widget_AppCompat_SeekBar = 2131558756;
+ // aapt resource value: 0x7f0b017c
+ public const int Widget_Design_CollapsingToolbar = 2131427708;
- // aapt resource value: 0x7F0D0165
- public const int Widget_AppCompat_SeekBar_Discrete = 2131558757;
+ // aapt resource value: 0x7f0b017d
+ public const int Widget_Design_CoordinatorLayout = 2131427709;
- // aapt resource value: 0x7F0D0166
- public const int Widget_AppCompat_Spinner = 2131558758;
+ // aapt resource value: 0x7f0b017e
+ public const int Widget_Design_FloatingActionButton = 2131427710;
- // aapt resource value: 0x7F0D0167
- public const int Widget_AppCompat_Spinner_DropDown = 2131558759;
+ // aapt resource value: 0x7f0b017f
+ public const int Widget_Design_NavigationView = 2131427711;
- // aapt resource value: 0x7F0D0168
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131558760;
+ // aapt resource value: 0x7f0b0180
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
- // aapt resource value: 0x7F0D0169
- public const int Widget_AppCompat_Spinner_Underlined = 2131558761;
+ // aapt resource value: 0x7f0b0181
+ public const int Widget_Design_Snackbar = 2131427713;
- // aapt resource value: 0x7F0D016A
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131558762;
+ // aapt resource value: 0x7f0b0165
+ public const int Widget_Design_TabLayout = 2131427685;
- // aapt resource value: 0x7F0D016B
- public const int Widget_AppCompat_Toolbar = 2131558763;
+ // aapt resource value: 0x7f0b0182
+ public const int Widget_Design_TextInputLayout = 2131427714;
- // aapt resource value: 0x7F0D016C
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131558764;
+ // aapt resource value: 0x7f0b018c
+ public const int custom_dialog2 = 2131427724;
- // aapt resource value: 0x7F0D016D
- public const int Widget_Compat_NotificationActionContainer = 2131558765;
+ // aapt resource value: 0x7f0b018d
+ public const int picker_view_scale_anim = 2131427725;
- // aapt resource value: 0x7F0D016E
- public const int Widget_Compat_NotificationActionText = 2131558766;
+ // aapt resource value: 0x7f0b018e
+ public const int picker_view_slide_anim = 2131427726;
static Style()
{
@@ -4667,193 +5457,204 @@
}
}
+ public partial class Xml
+ {
+
+ // aapt resource value: 0x7f070000
+ public const int file_paths = 2131165184;
+
+ // aapt resource value: 0x7f070001
+ public const int hdl_filepaths = 2131165185;
+
+ static Xml()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Xml()
+ {
+ }
+ }
+
public partial class Styleable
{
- // aapt resource value: { 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[] {
- 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};
+ 2130771978,
+ 2130771980,
+ 2130771981,
+ 2130771982,
+ 2130771983,
+ 2130771984,
+ 2130771985,
+ 2130771986,
+ 2130771987,
+ 2130771988,
+ 2130771989,
+ 2130771990,
+ 2130771991,
+ 2130771992,
+ 2130771993,
+ 2130771994,
+ 2130771995,
+ 2130771996,
+ 2130771997,
+ 2130771998,
+ 2130771999,
+ 2130772000,
+ 2130772001,
+ 2130772002,
+ 2130772003,
+ 2130772004,
+ 2130772005,
+ 2130772006,
+ 2130772076};
- // aapt resource value: { 0x10100B3 }
+ // aapt resource value: 10
+ public const int ActionBar_background = 10;
+
+ // aapt resource value: 12
+ public const int ActionBar_backgroundSplit = 12;
+
+ // aapt resource value: 11
+ public const int ActionBar_backgroundStacked = 11;
+
+ // aapt resource value: 21
+ public const int ActionBar_contentInsetEnd = 21;
+
+ // aapt resource value: 25
+ public const int ActionBar_contentInsetEndWithActions = 25;
+
+ // aapt resource value: 22
+ public const int ActionBar_contentInsetLeft = 22;
+
+ // aapt resource value: 23
+ public const int ActionBar_contentInsetRight = 23;
+
+ // aapt resource value: 20
+ public const int ActionBar_contentInsetStart = 20;
+
+ // aapt resource value: 24
+ public const int ActionBar_contentInsetStartWithNavigation = 24;
+
+ // aapt resource value: 13
+ public const int ActionBar_customNavigationLayout = 13;
+
+ // aapt resource value: 3
+ public const int ActionBar_displayOptions = 3;
+
+ // aapt resource value: 9
+ public const int ActionBar_divider = 9;
+
+ // aapt resource value: 26
+ public const int ActionBar_elevation = 26;
+
+ // aapt resource value: 0
+ public const int ActionBar_height = 0;
+
+ // aapt resource value: 19
+ public const int ActionBar_hideOnContentScroll = 19;
+
+ // aapt resource value: 28
+ public const int ActionBar_homeAsUpIndicator = 28;
+
+ // aapt resource value: 14
+ public const int ActionBar_homeLayout = 14;
+
+ // aapt resource value: 7
+ public const int ActionBar_icon = 7;
+
+ // aapt resource value: 16
+ public const int ActionBar_indeterminateProgressStyle = 16;
+
+ // aapt resource value: 18
+ public const int ActionBar_itemPadding = 18;
+
+ // aapt resource value: 8
+ public const int ActionBar_logo = 8;
+
+ // aapt resource value: 2
+ public const int ActionBar_navigationMode = 2;
+
+ // aapt resource value: 27
+ public const int ActionBar_popupTheme = 27;
+
+ // aapt resource value: 17
+ public const int ActionBar_progressBarPadding = 17;
+
+ // aapt resource value: 15
+ public const int ActionBar_progressBarStyle = 15;
+
+ // aapt resource value: 4
+ public const int ActionBar_subtitle = 4;
+
+ // aapt resource value: 6
+ public const int ActionBar_subtitleTextStyle = 6;
+
+ // aapt resource value: 1
+ public const int ActionBar_title = 1;
+
+ // aapt resource value: 5
+ public const int ActionBar_titleTextStyle = 5;
+
public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
- // aapt resource value: 0
- public const int ActionBar_background = 0;
-
- // aapt resource value: 1
- public const int ActionBar_backgroundSplit = 1;
-
- // aapt resource value: 2
- public const int ActionBar_backgroundStacked = 2;
-
- // aapt resource value: 3
- public const int ActionBar_contentInsetEnd = 3;
-
- // aapt resource value: 4
- public const int ActionBar_contentInsetEndWithActions = 4;
-
- // aapt resource value: 5
- public const int ActionBar_contentInsetLeft = 5;
-
- // aapt resource value: 6
- public const int ActionBar_contentInsetRight = 6;
-
- // aapt resource value: 7
- public const int ActionBar_contentInsetStart = 7;
-
- // aapt resource value: 8
- public const int ActionBar_contentInsetStartWithNavigation = 8;
-
- // aapt resource value: 9
- public const int ActionBar_customNavigationLayout = 9;
-
- // aapt resource value: 10
- public const int ActionBar_displayOptions = 10;
-
- // aapt resource value: 11
- public const int ActionBar_divider = 11;
-
- // aapt resource value: 12
- public const int ActionBar_elevation = 12;
-
- // aapt resource value: 13
- public const int ActionBar_height = 13;
-
- // aapt resource value: 14
- public const int ActionBar_hideOnContentScroll = 14;
-
- // aapt resource value: 15
- public const int ActionBar_homeAsUpIndicator = 15;
-
- // aapt resource value: 16
- public const int ActionBar_homeLayout = 16;
-
- // aapt resource value: 17
- public const int ActionBar_icon = 17;
-
- // aapt resource value: 18
- public const int ActionBar_indeterminateProgressStyle = 18;
-
- // aapt resource value: 19
- public const int ActionBar_itemPadding = 19;
-
- // aapt resource value: 20
- public const int ActionBar_logo = 20;
-
- // aapt resource value: 21
- public const int ActionBar_navigationMode = 21;
-
- // aapt resource value: 22
- public const int ActionBar_popupTheme = 22;
-
- // aapt resource value: 23
- public const int ActionBar_progressBarPadding = 23;
-
- // aapt resource value: 24
- public const int ActionBar_progressBarStyle = 24;
-
- // aapt resource value: 25
- public const int ActionBar_subtitle = 25;
-
- // aapt resource value: 26
- public const int ActionBar_subtitleTextStyle = 26;
-
- // aapt resource value: 27
- public const int ActionBar_title = 27;
-
- // aapt resource value: 28
- public const int ActionBar_titleTextStyle = 28;
-
- // aapt resource value: { 0x101013F }
public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
public const int ActionMenuItemView_android_minWidth = 0;
- // aapt resource value: { 0xFFFFFFFF }
- public static int[] ActionMenuView = new int[] {
- -1};
+ public static int[] ActionMenuView;
- // aapt resource value: { 0x7F030042,0x7F030043,0x7F030058,0x7F030098,0x7F03012D,0x7F030151 }
public static int[] ActionMode = new int[] {
- 2130903106,
- 2130903107,
- 2130903128,
- 2130903192,
- 2130903341,
- 2130903377};
-
- // aapt resource value: 0
- public const int ActionMode_background = 0;
-
- // aapt resource value: 1
- public const int ActionMode_backgroundSplit = 1;
-
- // aapt resource value: 2
- public const int ActionMode_closeItemLayout = 2;
+ 2130771978,
+ 2130771984,
+ 2130771985,
+ 2130771989,
+ 2130771991,
+ 2130772007};
// aapt resource value: 3
- public const int ActionMode_height = 3;
+ public const int ActionMode_background = 3;
// aapt resource value: 4
- public const int ActionMode_subtitleTextStyle = 4;
+ public const int ActionMode_backgroundSplit = 4;
// aapt resource value: 5
- public const int ActionMode_titleTextStyle = 5;
-
- // aapt resource value: { 0x7F030085,0x7F0300A2 }
- public static int[] ActivityChooserView = new int[] {
- 2130903173,
- 2130903202};
+ public const int ActionMode_closeItemLayout = 5;
// aapt resource value: 0
- public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+ public const int ActionMode_height = 0;
+
+ // aapt resource value: 2
+ public const int ActionMode_subtitleTextStyle = 2;
// aapt resource value: 1
- public const int ActivityChooserView_initialActivityCount = 1;
+ public const int ActionMode_titleTextStyle = 1;
- // aapt resource value: { 0x10100F2,0x7F030050,0x7F0300AB,0x7F0300AC,0x7F0300B8,0x7F0300DD,0x7F0300DE }
+ public static int[] ActivityChooserView = new int[] {
+ 2130772008,
+ 2130772009};
+
+ // aapt resource value: 1
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+
+ // aapt resource value: 0
+ public const int ActivityChooserView_initialActivityCount = 0;
+
public static int[] AlertDialog = new int[] {
16842994,
- 2130903120,
- 2130903211,
- 2130903212,
- 2130903224,
- 2130903261,
- 2130903262};
+ 2130772010,
+ 2130772011,
+ 2130772012,
+ 2130772013,
+ 2130772014,
+ 2130772015};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -4861,27 +5662,68 @@
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
+ // aapt resource value: 5
+ public const int AlertDialog_listItemLayout = 5;
+
// aapt resource value: 2
- public const int AlertDialog_listItemLayout = 2;
+ public const int AlertDialog_listLayout = 2;
// aapt resource value: 3
- public const int AlertDialog_listLayout = 3;
-
- // aapt resource value: 4
- public const int AlertDialog_multiChoiceItemLayout = 4;
-
- // aapt resource value: 5
- public const int AlertDialog_showTitle = 5;
+ public const int AlertDialog_multiChoiceItemLayout = 3;
// aapt resource value: 6
- public const int AlertDialog_singleChoiceItemLayout = 6;
+ public const int AlertDialog_showTitle = 6;
- // aapt resource value: { 0x1010119,0x7F0300E4,0x7F030146,0x7F030147 }
+ // aapt resource value: 4
+ public const int AlertDialog_singleChoiceItemLayout = 4;
+
+ public static int[] AppBarLayout = new int[] {
+ 16842964,
+ 16843919,
+ 16844096,
+ 2130772005,
+ 2130772223};
+
+ // aapt resource value: 0
+ public const int AppBarLayout_android_background = 0;
+
+ // aapt resource value: 2
+ public const int AppBarLayout_android_keyboardNavigationCluster = 2;
+
+ // aapt resource value: 1
+ public const int AppBarLayout_android_touchscreenBlocksFocus = 1;
+
+ // aapt resource value: 3
+ public const int AppBarLayout_elevation = 3;
+
+ // aapt resource value: 4
+ public const int AppBarLayout_expanded = 4;
+
+ public static int[] AppBarLayoutStates = new int[] {
+ 2130772224,
+ 2130772225};
+
+ // aapt resource value: 0
+ public const int AppBarLayoutStates_state_collapsed = 0;
+
+ // aapt resource value: 1
+ public const int AppBarLayoutStates_state_collapsible = 1;
+
+ public static int[] AppBarLayout_Layout = new int[] {
+ 2130772226,
+ 2130772227};
+
+ // aapt resource value: 0
+ public const int AppBarLayout_Layout_layout_scrollFlags = 0;
+
+ // aapt resource value: 1
+ public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
+
public static int[] AppCompatImageView = new int[] {
16843033,
- 2130903268,
- 2130903366,
- 2130903367};
+ 2130772016,
+ 2130772017,
+ 2130772018};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -4895,12 +5737,11 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
- // aapt resource value: { 0x1010142,0x7F030143,0x7F030144,0x7F030145 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130903363,
- 2130903364,
- 2130903365};
+ 2130772019,
+ 2130772020,
+ 2130772021};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -4914,7 +5755,6 @@
// aapt resource value: 3
public const int AppCompatSeekBar_tickMarkTintMode = 3;
- // aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
public static int[] AppCompatTextHelper = new int[] {
16842804,
16843117,
@@ -4945,267 +5785,265 @@
// 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,
- 2130903101,
- 2130903102,
- 2130903103,
- 2130903104,
- 2130903105,
- 2130903180,
- 2130903347};
+ 2130772022,
+ 2130772023,
+ 2130772024,
+ 2130772025,
+ 2130772026,
+ 2130772027,
+ 2130772028};
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
- // aapt resource value: 1
- public const int AppCompatTextView_autoSizeMaxTextSize = 1;
-
- // aapt resource value: 2
- public const int AppCompatTextView_autoSizeMinTextSize = 2;
-
- // aapt resource value: 3
- public const int AppCompatTextView_autoSizePresetSizes = 3;
-
- // aapt resource value: 4
- public const int AppCompatTextView_autoSizeStepGranularity = 4;
+ // aapt resource value: 6
+ public const int AppCompatTextView_autoSizeMaxTextSize = 6;
// aapt resource value: 5
- public const int AppCompatTextView_autoSizeTextType = 5;
+ public const int AppCompatTextView_autoSizeMinTextSize = 5;
- // aapt resource value: 6
- public const int AppCompatTextView_fontFamily = 6;
+ // aapt resource value: 4
+ public const int AppCompatTextView_autoSizePresetSizes = 4;
+
+ // aapt resource value: 3
+ public const int AppCompatTextView_autoSizeStepGranularity = 3;
+
+ // aapt resource value: 2
+ public const int AppCompatTextView_autoSizeTextType = 2;
// aapt resource value: 7
- public const int AppCompatTextView_textAllCaps = 7;
+ public const int AppCompatTextView_fontFamily = 7;
- // aapt resource value: { 0x1010057,0x10100AE,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 }
+ // aapt resource value: 1
+ public const int AppCompatTextView_textAllCaps = 1;
+
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 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: 2
- public const int AppCompatTheme_actionBarDivider = 2;
-
- // aapt resource value: 3
- public const int AppCompatTheme_actionBarItemBackground = 3;
-
- // aapt resource value: 4
- public const int AppCompatTheme_actionBarPopupTheme = 4;
-
- // aapt resource value: 5
- public const int AppCompatTheme_actionBarSize = 5;
-
- // aapt resource value: 6
- public const int AppCompatTheme_actionBarSplitStyle = 6;
-
- // aapt resource value: 7
- public const int AppCompatTheme_actionBarStyle = 7;
-
- // aapt resource value: 8
- public const int AppCompatTheme_actionBarTabBarStyle = 8;
-
- // aapt resource value: 9
- public const int AppCompatTheme_actionBarTabStyle = 9;
-
- // aapt resource value: 10
- public const int AppCompatTheme_actionBarTabTextStyle = 10;
-
- // aapt resource value: 11
- public const int AppCompatTheme_actionBarTheme = 11;
-
- // aapt resource value: 12
- public const int AppCompatTheme_actionBarWidgetTheme = 12;
-
- // aapt resource value: 13
- public const int AppCompatTheme_actionButtonStyle = 13;
-
- // aapt resource value: 14
- public const int AppCompatTheme_actionDropDownStyle = 14;
-
- // aapt resource value: 15
- public const int AppCompatTheme_actionMenuTextAppearance = 15;
-
- // aapt resource value: 16
- public const int AppCompatTheme_actionMenuTextColor = 16;
-
- // aapt resource value: 17
- public const int AppCompatTheme_actionModeBackground = 17;
-
- // aapt resource value: 18
- public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
-
- // aapt resource value: 19
- public const int AppCompatTheme_actionModeCloseDrawable = 19;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionModeCopyDrawable = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionModeCutDrawable = 21;
-
- // aapt resource value: 22
- public const int AppCompatTheme_actionModeFindDrawable = 22;
+ 2130772029,
+ 2130772030,
+ 2130772031,
+ 2130772032,
+ 2130772033,
+ 2130772034,
+ 2130772035,
+ 2130772036,
+ 2130772037,
+ 2130772038,
+ 2130772039,
+ 2130772040,
+ 2130772041,
+ 2130772042,
+ 2130772043,
+ 2130772044,
+ 2130772045,
+ 2130772046,
+ 2130772047,
+ 2130772048,
+ 2130772049,
+ 2130772050,
+ 2130772051,
+ 2130772052,
+ 2130772053,
+ 2130772054,
+ 2130772055,
+ 2130772056,
+ 2130772057,
+ 2130772058,
+ 2130772059,
+ 2130772060,
+ 2130772061,
+ 2130772062,
+ 2130772063,
+ 2130772064,
+ 2130772065,
+ 2130772066,
+ 2130772067,
+ 2130772068,
+ 2130772069,
+ 2130772070,
+ 2130772071,
+ 2130772072,
+ 2130772073,
+ 2130772074,
+ 2130772075,
+ 2130772076,
+ 2130772077,
+ 2130772078,
+ 2130772079,
+ 2130772080,
+ 2130772081,
+ 2130772082,
+ 2130772083,
+ 2130772084,
+ 2130772085,
+ 2130772086,
+ 2130772087,
+ 2130772088,
+ 2130772089,
+ 2130772090,
+ 2130772091,
+ 2130772092,
+ 2130772093,
+ 2130772094,
+ 2130772095,
+ 2130772096,
+ 2130772097,
+ 2130772098,
+ 2130772099,
+ 2130772100,
+ 2130772101,
+ 2130772102,
+ 2130772103,
+ 2130772104,
+ 2130772105,
+ 2130772106,
+ 2130772107,
+ 2130772108,
+ 2130772109,
+ 2130772110,
+ 2130772111,
+ 2130772112,
+ 2130772113,
+ 2130772114,
+ 2130772115,
+ 2130772116,
+ 2130772117,
+ 2130772118,
+ 2130772119,
+ 2130772120,
+ 2130772121,
+ 2130772122,
+ 2130772123,
+ 2130772124,
+ 2130772125,
+ 2130772126,
+ 2130772127,
+ 2130772128,
+ 2130772129,
+ 2130772130,
+ 2130772131,
+ 2130772132,
+ 2130772133,
+ 2130772134,
+ 2130772135,
+ 2130772136,
+ 2130772137,
+ 2130772138,
+ 2130772139,
+ 2130772140,
+ 2130772141,
+ 2130772142,
+ 2130772143,
+ 2130772144,
+ 2130772145};
// aapt resource value: 23
- public const int AppCompatTheme_actionModePasteDrawable = 23;
+ public const int AppCompatTheme_actionBarDivider = 23;
// aapt resource value: 24
- public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+ public const int AppCompatTheme_actionBarItemBackground = 24;
+
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionBarPopupTheme = 17;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionBarSize = 22;
+
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionBarSplitStyle = 19;
+
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionBarStyle = 18;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionBarTabBarStyle = 13;
+
+ // aapt resource value: 12
+ public const int AppCompatTheme_actionBarTabStyle = 12;
+
+ // aapt resource value: 14
+ public const int AppCompatTheme_actionBarTabTextStyle = 14;
+
+ // aapt resource value: 20
+ public const int AppCompatTheme_actionBarTheme = 20;
+
+ // aapt resource value: 21
+ public const int AppCompatTheme_actionBarWidgetTheme = 21;
+
+ // aapt resource value: 50
+ public const int AppCompatTheme_actionButtonStyle = 50;
+
+ // aapt resource value: 46
+ public const int AppCompatTheme_actionDropDownStyle = 46;
// aapt resource value: 25
- public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+ public const int AppCompatTheme_actionMenuTextAppearance = 25;
// aapt resource value: 26
- public const int AppCompatTheme_actionModeShareDrawable = 26;
-
- // aapt resource value: 27
- public const int AppCompatTheme_actionModeSplitBackground = 27;
-
- // aapt resource value: 28
- public const int AppCompatTheme_actionModeStyle = 28;
+ public const int AppCompatTheme_actionMenuTextColor = 26;
// aapt resource value: 29
- public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+ public const int AppCompatTheme_actionModeBackground = 29;
- // aapt resource value: 30
- public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
// aapt resource value: 31
- public const int AppCompatTheme_actionOverflowMenuStyle = 31;
-
- // aapt resource value: 32
- public const int AppCompatTheme_activityChooserViewStyle = 32;
+ public const int AppCompatTheme_actionModeCloseDrawable = 31;
// aapt resource value: 33
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+ public const int AppCompatTheme_actionModeCopyDrawable = 33;
+
+ // aapt resource value: 32
+ public const int AppCompatTheme_actionModeCutDrawable = 32;
+
+ // aapt resource value: 37
+ public const int AppCompatTheme_actionModeFindDrawable = 37;
// aapt resource value: 34
- public const int AppCompatTheme_alertDialogCenterButtons = 34;
+ public const int AppCompatTheme_actionModePasteDrawable = 34;
+
+ // aapt resource value: 39
+ public const int AppCompatTheme_actionModePopupWindowStyle = 39;
// aapt resource value: 35
- public const int AppCompatTheme_alertDialogStyle = 35;
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
// aapt resource value: 36
- public const int AppCompatTheme_alertDialogTheme = 36;
+ public const int AppCompatTheme_actionModeShareDrawable = 36;
+
+ // aapt resource value: 30
+ public const int AppCompatTheme_actionModeSplitBackground = 30;
+
+ // aapt resource value: 27
+ public const int AppCompatTheme_actionModeStyle = 27;
+
+ // aapt resource value: 38
+ public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+
+ // aapt resource value: 15
+ public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+
+ // aapt resource value: 16
+ public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_activityChooserViewStyle = 58;
+
+ // aapt resource value: 95
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+
+ // aapt resource value: 96
+ public const int AppCompatTheme_alertDialogCenterButtons = 96;
+
+ // aapt resource value: 94
+ public const int AppCompatTheme_alertDialogStyle = 94;
+
+ // aapt resource value: 97
+ public const int AppCompatTheme_alertDialogTheme = 97;
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -5213,272 +6051,270 @@
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
- // aapt resource value: 37
- public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
-
- // aapt resource value: 38
- public const int AppCompatTheme_borderlessButtonStyle = 38;
-
- // aapt resource value: 39
- public const int AppCompatTheme_buttonBarButtonStyle = 39;
-
- // aapt resource value: 40
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
-
- // aapt resource value: 41
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
-
- // aapt resource value: 42
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
-
- // aapt resource value: 43
- public const int AppCompatTheme_buttonBarStyle = 43;
-
- // aapt resource value: 44
- public const int AppCompatTheme_buttonStyle = 44;
-
- // aapt resource value: 45
- public const int AppCompatTheme_buttonStyleSmall = 45;
-
- // aapt resource value: 46
- public const int AppCompatTheme_checkboxStyle = 46;
-
- // aapt resource value: 47
- public const int AppCompatTheme_checkedTextViewStyle = 47;
-
- // aapt resource value: 48
- public const int AppCompatTheme_colorAccent = 48;
-
- // aapt resource value: 49
- public const int AppCompatTheme_colorBackgroundFloating = 49;
-
- // aapt resource value: 50
- public const int AppCompatTheme_colorButtonNormal = 50;
-
- // aapt resource value: 51
- public const int AppCompatTheme_colorControlActivated = 51;
-
- // aapt resource value: 52
- public const int AppCompatTheme_colorControlHighlight = 52;
-
- // aapt resource value: 53
- public const int AppCompatTheme_colorControlNormal = 53;
-
- // aapt resource value: 54
- public const int AppCompatTheme_colorError = 54;
+ // aapt resource value: 102
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
// aapt resource value: 55
- public const int AppCompatTheme_colorPrimary = 55;
+ public const int AppCompatTheme_borderlessButtonStyle = 55;
- // aapt resource value: 56
- public const int AppCompatTheme_colorPrimaryDark = 56;
+ // aapt resource value: 52
+ public const int AppCompatTheme_buttonBarButtonStyle = 52;
+
+ // aapt resource value: 100
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+
+ // aapt resource value: 101
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+
+ // aapt resource value: 99
+ public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
+
+ // aapt resource value: 51
+ public const int AppCompatTheme_buttonBarStyle = 51;
+
+ // aapt resource value: 103
+ public const int AppCompatTheme_buttonStyle = 103;
+
+ // aapt resource value: 104
+ public const int AppCompatTheme_buttonStyleSmall = 104;
+
+ // aapt resource value: 105
+ public const int AppCompatTheme_checkboxStyle = 105;
+
+ // aapt resource value: 106
+ public const int AppCompatTheme_checkedTextViewStyle = 106;
+
+ // aapt resource value: 86
+ public const int AppCompatTheme_colorAccent = 86;
+
+ // aapt resource value: 93
+ public const int AppCompatTheme_colorBackgroundFloating = 93;
+
+ // aapt resource value: 90
+ public const int AppCompatTheme_colorButtonNormal = 90;
+
+ // aapt resource value: 88
+ public const int AppCompatTheme_colorControlActivated = 88;
+
+ // aapt resource value: 89
+ public const int AppCompatTheme_colorControlHighlight = 89;
+
+ // aapt resource value: 87
+ public const int AppCompatTheme_colorControlNormal = 87;
+
+ // aapt resource value: 118
+ public const int AppCompatTheme_colorError = 118;
+
+ // aapt resource value: 84
+ public const int AppCompatTheme_colorPrimary = 84;
+
+ // aapt resource value: 85
+ public const int AppCompatTheme_colorPrimaryDark = 85;
+
+ // aapt resource value: 91
+ public const int AppCompatTheme_colorSwitchThumbNormal = 91;
+
+ // aapt resource value: 92
+ public const int AppCompatTheme_controlBackground = 92;
+
+ // aapt resource value: 44
+ public const int AppCompatTheme_dialogPreferredPadding = 44;
+
+ // aapt resource value: 43
+ public const int AppCompatTheme_dialogTheme = 43;
// aapt resource value: 57
- public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+ public const int AppCompatTheme_dividerHorizontal = 57;
- // aapt resource value: 58
- public const int AppCompatTheme_controlBackground = 58;
-
- // aapt resource value: 59
- public const int AppCompatTheme_dialogPreferredPadding = 59;
-
- // aapt resource value: 60
- public const int AppCompatTheme_dialogTheme = 60;
-
- // aapt resource value: 61
- public const int AppCompatTheme_dividerHorizontal = 61;
-
- // aapt resource value: 62
- public const int AppCompatTheme_dividerVertical = 62;
-
- // aapt resource value: 64
- public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
-
- // aapt resource value: 63
- public const int AppCompatTheme_dropDownListViewStyle = 63;
-
- // aapt resource value: 65
- public const int AppCompatTheme_editTextBackground = 65;
-
- // aapt resource value: 66
- public const int AppCompatTheme_editTextColor = 66;
-
- // aapt resource value: 67
- public const int AppCompatTheme_editTextStyle = 67;
-
- // aapt resource value: 68
- public const int AppCompatTheme_homeAsUpIndicator = 68;
-
- // aapt resource value: 69
- public const int AppCompatTheme_imageButtonStyle = 69;
-
- // aapt resource value: 70
- public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
-
- // aapt resource value: 71
- public const int AppCompatTheme_listDividerAlertDialog = 71;
-
- // aapt resource value: 72
- public const int AppCompatTheme_listMenuViewStyle = 72;
-
- // aapt resource value: 73
- public const int AppCompatTheme_listPopupWindowStyle = 73;
-
- // aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemHeight = 74;
+ // aapt resource value: 56
+ public const int AppCompatTheme_dividerVertical = 56;
// aapt resource value: 75
- public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+ public const int AppCompatTheme_dropDownListViewStyle = 75;
+
+ // aapt resource value: 47
+ public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
+
+ // aapt resource value: 64
+ public const int AppCompatTheme_editTextBackground = 64;
+
+ // aapt resource value: 63
+ public const int AppCompatTheme_editTextColor = 63;
+
+ // aapt resource value: 107
+ public const int AppCompatTheme_editTextStyle = 107;
+
+ // aapt resource value: 49
+ public const int AppCompatTheme_homeAsUpIndicator = 49;
+
+ // aapt resource value: 65
+ public const int AppCompatTheme_imageButtonStyle = 65;
+
+ // aapt resource value: 83
+ public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+
+ // aapt resource value: 45
+ public const int AppCompatTheme_listDividerAlertDialog = 45;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_listMenuViewStyle = 115;
// aapt resource value: 76
- public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+ public const int AppCompatTheme_listPopupWindowStyle = 76;
- // aapt resource value: 77
- public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+ // aapt resource value: 70
+ public const int AppCompatTheme_listPreferredItemHeight = 70;
- // aapt resource value: 78
- public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+ // aapt resource value: 72
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
- // aapt resource value: 79
- public const int AppCompatTheme_panelBackground = 79;
+ // aapt resource value: 71
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+
+ // aapt resource value: 73
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+
+ // aapt resource value: 74
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
// aapt resource value: 80
- public const int AppCompatTheme_panelMenuListTheme = 80;
+ public const int AppCompatTheme_panelBackground = 80;
+
+ // aapt resource value: 82
+ public const int AppCompatTheme_panelMenuListTheme = 82;
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
- // aapt resource value: 82
- public const int AppCompatTheme_popupMenuStyle = 82;
+ // aapt resource value: 61
+ public const int AppCompatTheme_popupMenuStyle = 61;
- // aapt resource value: 83
- public const int AppCompatTheme_popupWindowStyle = 83;
-
- // aapt resource value: 84
- public const int AppCompatTheme_radioButtonStyle = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_ratingBarStyle = 85;
-
- // aapt resource value: 86
- public const int AppCompatTheme_ratingBarStyleIndicator = 86;
-
- // aapt resource value: 87
- public const int AppCompatTheme_ratingBarStyleSmall = 87;
-
- // aapt resource value: 88
- public const int AppCompatTheme_searchViewStyle = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_seekBarStyle = 89;
-
- // aapt resource value: 90
- public const int AppCompatTheme_selectableItemBackground = 90;
-
- // aapt resource value: 91
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
-
- // aapt resource value: 93
- public const int AppCompatTheme_spinnerStyle = 93;
-
- // aapt resource value: 94
- public const int AppCompatTheme_switchStyle = 94;
-
- // aapt resource value: 95
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
-
- // aapt resource value: 96
- public const int AppCompatTheme_textAppearanceListItem = 96;
-
- // aapt resource value: 97
- public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
-
- // aapt resource value: 98
- public const int AppCompatTheme_textAppearanceListItemSmall = 98;
-
- // aapt resource value: 99
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
-
- // aapt resource value: 100
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
-
- // aapt resource value: 101
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
-
- // aapt resource value: 102
- public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
-
- // aapt resource value: 103
- public const int AppCompatTheme_textColorAlertDialogListItem = 103;
-
- // aapt resource value: 104
- public const int AppCompatTheme_textColorSearchUrl = 104;
-
- // aapt resource value: 105
- public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
-
- // aapt resource value: 106
- public const int AppCompatTheme_toolbarStyle = 106;
-
- // aapt resource value: 107
- public const int AppCompatTheme_tooltipForegroundColor = 107;
+ // aapt resource value: 62
+ public const int AppCompatTheme_popupWindowStyle = 62;
// aapt resource value: 108
- public const int AppCompatTheme_tooltipFrameBackground = 108;
+ public const int AppCompatTheme_radioButtonStyle = 108;
// aapt resource value: 109
- public const int AppCompatTheme_windowActionBar = 109;
+ public const int AppCompatTheme_ratingBarStyle = 109;
// aapt resource value: 110
- public const int AppCompatTheme_windowActionBarOverlay = 110;
+ public const int AppCompatTheme_ratingBarStyleIndicator = 110;
// aapt resource value: 111
- public const int AppCompatTheme_windowActionModeOverlay = 111;
+ public const int AppCompatTheme_ratingBarStyleSmall = 111;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_searchViewStyle = 69;
// aapt resource value: 112
- public const int AppCompatTheme_windowFixedHeightMajor = 112;
+ public const int AppCompatTheme_seekBarStyle = 112;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_selectableItemBackground = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
// aapt resource value: 113
- public const int AppCompatTheme_windowFixedHeightMinor = 113;
+ public const int AppCompatTheme_spinnerStyle = 113;
// aapt resource value: 114
- public const int AppCompatTheme_windowFixedWidthMajor = 114;
+ public const int AppCompatTheme_switchStyle = 114;
- // aapt resource value: 115
- public const int AppCompatTheme_windowFixedWidthMinor = 115;
+ // aapt resource value: 40
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
- // aapt resource value: 116
- public const int AppCompatTheme_windowMinWidthMajor = 116;
+ // aapt resource value: 77
+ public const int AppCompatTheme_textAppearanceListItem = 77;
+
+ // aapt resource value: 78
+ public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
+
+ // aapt resource value: 79
+ public const int AppCompatTheme_textAppearanceListItemSmall = 79;
+
+ // aapt resource value: 42
+ public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
+
+ // aapt resource value: 67
+ public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
+
+ // aapt resource value: 66
+ public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
+
+ // aapt resource value: 41
+ public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+
+ // aapt resource value: 98
+ public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_textColorSearchUrl = 68;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_toolbarStyle = 59;
// aapt resource value: 117
- public const int AppCompatTheme_windowMinWidthMinor = 117;
+ public const int AppCompatTheme_tooltipForegroundColor = 117;
- // aapt resource value: 118
- public const int AppCompatTheme_windowNoTitle = 118;
+ // aapt resource value: 116
+ public const int AppCompatTheme_tooltipFrameBackground = 116;
- // aapt resource value: { 0x7F0300E6,0x7F0300E7,0x7F030116 }
+ // aapt resource value: 2
+ public const int AppCompatTheme_windowActionBar = 2;
+
+ // aapt resource value: 4
+ public const int AppCompatTheme_windowActionBarOverlay = 4;
+
+ // aapt resource value: 5
+ public const int AppCompatTheme_windowActionModeOverlay = 5;
+
+ // aapt resource value: 9
+ public const int AppCompatTheme_windowFixedHeightMajor = 9;
+
+ // aapt resource value: 7
+ public const int AppCompatTheme_windowFixedHeightMinor = 7;
+
+ // aapt resource value: 6
+ public const int AppCompatTheme_windowFixedWidthMajor = 6;
+
+ // aapt resource value: 8
+ public const int AppCompatTheme_windowFixedWidthMinor = 8;
+
+ // aapt resource value: 10
+ public const int AppCompatTheme_windowMinWidthMajor = 10;
+
+ // aapt resource value: 11
+ public const int AppCompatTheme_windowMinWidthMinor = 11;
+
+ // aapt resource value: 3
+ public const int AppCompatTheme_windowNoTitle = 3;
+
public static int[] BallPulseFooter = new int[] {
- 2130903270,
- 2130903271,
- 2130903318};
-
- // aapt resource value: 0
- public const int BallPulseFooter_srlAnimatingColor = 0;
+ 2130772317,
+ 2130772338,
+ 2130772339};
// aapt resource value: 1
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
+ public const int BallPulseFooter_srlAnimatingColor = 1;
+
+ // aapt resource value: 0
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
- // aapt resource value: { 0x7F0300E5,0x7F0300F8,0x7F030117 }
public static int[] BezierRadarHeader = new int[] {
- 2130903269,
- 2130903288,
- 2130903319};
+ 2130772316,
+ 2130772324,
+ 2130772326};
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
@@ -5489,33 +6325,67 @@
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
- // aapt resource value: { 0x7F030026 }
+ public static int[] BottomNavigationView = new int[] {
+ 2130772005,
+ 2130772266,
+ 2130772267,
+ 2130772268,
+ 2130772269};
+
+ // aapt resource value: 0
+ public const int BottomNavigationView_elevation = 0;
+
+ // aapt resource value: 4
+ public const int BottomNavigationView_itemBackground = 4;
+
+ // aapt resource value: 2
+ public const int BottomNavigationView_itemIconTint = 2;
+
+ // aapt resource value: 3
+ public const int BottomNavigationView_itemTextColor = 3;
+
+ // aapt resource value: 1
+ public const int BottomNavigationView_menu = 1;
+
+ public static int[] BottomSheetBehavior_Layout = new int[] {
+ 2130772228,
+ 2130772229,
+ 2130772230};
+
+ // aapt resource value: 1
+ public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+
+ // aapt resource value: 0
+ public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
+
+ // aapt resource value: 2
+ public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
+
public static int[] ButtonBarLayout = new int[] {
- 2130903078};
+ 2130772146};
// 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[] {
- 2130903269,
- 2130903271,
- 2130903275,
- 2130903276,
- 2130903277,
- 2130903278,
- 2130903279,
- 2130903280,
- 2130903302,
- 2130903319,
- 2130903322,
- 2130903323,
- 2130903324,
- 2130903325,
- 2130903326,
- 2130903327,
- 2130903328,
- 2130903331};
+ 2130772316,
+ 2130772317,
+ 2130772318,
+ 2130772319,
+ 2130772320,
+ 2130772321,
+ 2130772322,
+ 2130772323,
+ 2130772325,
+ 2130772326,
+ 2130772327,
+ 2130772328,
+ 2130772329,
+ 2130772330,
+ 2130772331,
+ 2130772332,
+ 2130772333,
+ 2130772336};
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
@@ -5571,30 +6441,29 @@
// 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[] {
- 2130903269,
- 2130903271,
- 2130903275,
- 2130903276,
- 2130903277,
- 2130903278,
- 2130903279,
- 2130903280,
- 2130903289,
- 2130903302,
- 2130903319,
- 2130903322,
- 2130903323,
- 2130903324,
- 2130903326,
- 2130903327,
- 2130903328,
- 2130903329,
- 2130903330,
- 2130903331,
- 2130903332,
- 2130903333};
+ 2130772316,
+ 2130772317,
+ 2130772318,
+ 2130772319,
+ 2130772320,
+ 2130772321,
+ 2130772322,
+ 2130772323,
+ 2130772325,
+ 2130772326,
+ 2130772327,
+ 2130772328,
+ 2130772329,
+ 2130772331,
+ 2130772332,
+ 2130772333,
+ 2130772334,
+ 2130772335,
+ 2130772336,
+ 2130772337,
+ 2130772340,
+ 2130772341};
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
@@ -5620,53 +6489,128 @@
// aapt resource value: 7
public const int ClassicsHeader_srlDrawableSize = 7;
+ // aapt resource value: 21
+ public const int ClassicsHeader_srlEnableLastTime = 21;
+
// aapt resource value: 8
- public const int ClassicsHeader_srlEnableLastTime = 8;
+ public const int ClassicsHeader_srlFinishDuration = 8;
// aapt resource value: 9
- public const int ClassicsHeader_srlFinishDuration = 9;
+ public const int ClassicsHeader_srlPrimaryColor = 9;
// aapt resource value: 10
- public const int ClassicsHeader_srlPrimaryColor = 10;
+ public const int ClassicsHeader_srlTextFailed = 10;
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFailed = 11;
+ public const int ClassicsHeader_srlTextFinish = 11;
// aapt resource value: 12
- public const int ClassicsHeader_srlTextFinish = 12;
+ public const int ClassicsHeader_srlTextLoading = 12;
// aapt resource value: 13
- public const int ClassicsHeader_srlTextLoading = 13;
+ public const int ClassicsHeader_srlTextPulling = 13;
// aapt resource value: 14
- public const int ClassicsHeader_srlTextPulling = 14;
+ public const int ClassicsHeader_srlTextRefreshing = 14;
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRefreshing = 15;
+ public const int ClassicsHeader_srlTextRelease = 15;
// aapt resource value: 16
- public const int ClassicsHeader_srlTextRelease = 16;
+ public const int ClassicsHeader_srlTextSecondary = 16;
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSecondary = 17;
+ public const int ClassicsHeader_srlTextSizeTime = 17;
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTime = 18;
-
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextSizeTitle = 19;
+ public const int ClassicsHeader_srlTextSizeTitle = 18;
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
- // aapt resource value: 21
- public const int ClassicsHeader_srlTextUpdate = 21;
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextUpdate = 19;
- // aapt resource value: { 0x10101A5,0x101031F,0x7F030027 }
+ public static int[] CollapsingToolbarLayout = new int[] {
+ 2130771980,
+ 2130772231,
+ 2130772232,
+ 2130772233,
+ 2130772234,
+ 2130772235,
+ 2130772236,
+ 2130772237,
+ 2130772238,
+ 2130772239,
+ 2130772240,
+ 2130772241,
+ 2130772242,
+ 2130772243,
+ 2130772244,
+ 2130772245};
+
+ // aapt resource value: 13
+ public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
+
+ // aapt resource value: 7
+ public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int CollapsingToolbarLayout_contentScrim = 8;
+
+ // aapt resource value: 14
+ public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
+
+ // aapt resource value: 1
+ public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
+
+ // aapt resource value: 5
+ public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
+
+ // aapt resource value: 4
+ public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
+
+ // aapt resource value: 2
+ public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
+
+ // aapt resource value: 3
+ public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
+
+ // aapt resource value: 6
+ public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+
+ // aapt resource value: 12
+ public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+
+ // aapt resource value: 11
+ public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+
+ // aapt resource value: 9
+ public const int CollapsingToolbarLayout_statusBarScrim = 9;
+
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_title = 0;
+
+ // aapt resource value: 15
+ public const int CollapsingToolbarLayout_titleEnabled = 15;
+
+ // aapt resource value: 10
+ public const int CollapsingToolbarLayout_toolbarId = 10;
+
+ public static int[] CollapsingToolbarLayout_Layout = new int[] {
+ 2130772246,
+ 2130772247};
+
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
+
+ // aapt resource value: 1
+ public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
+
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130903079};
+ 2130772147};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -5677,11 +6621,10 @@
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
- // aapt resource value: { 0x1010107,0x7F030053,0x7F030054 }
public static int[] CompoundButton = new int[] {
16843015,
- 2130903123,
- 2130903124};
+ 2130772148,
+ 2130772149};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -5692,223 +6635,324 @@
// 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[] {
- 2130903098,
- 2130903099,
- 2130903111,
- 2130903131,
- 2130903165,
- 2130903189,
- 2130903264,
- 2130903359};
+ public static int[] CoordinatorLayout = new int[] {
+ 2130772248,
+ 2130772249};
// aapt resource value: 0
- public const int DrawerArrowToggle_arrowHeadLength = 0;
+ public const int CoordinatorLayout_keylines = 0;
// aapt resource value: 1
- public const int DrawerArrowToggle_arrowShaftLength = 1;
+ public const int CoordinatorLayout_statusBarBackground = 1;
+
+ public static int[] CoordinatorLayout_Layout = new int[] {
+ 16842931,
+ 2130772250,
+ 2130772251,
+ 2130772252,
+ 2130772253,
+ 2130772254,
+ 2130772255};
+
+ // aapt resource value: 0
+ public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
// aapt resource value: 2
- public const int DrawerArrowToggle_barLength = 2;
-
- // aapt resource value: 3
- public const int DrawerArrowToggle_color = 3;
+ public const int CoordinatorLayout_Layout_layout_anchor = 2;
// aapt resource value: 4
- public const int DrawerArrowToggle_drawableSize = 4;
+ public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
- // aapt resource value: 5
- public const int DrawerArrowToggle_gapBetweenBars = 5;
+ // aapt resource value: 1
+ public const int CoordinatorLayout_Layout_layout_behavior = 1;
// aapt resource value: 6
- public const int DrawerArrowToggle_spinBars = 6;
+ public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
+
+ // aapt resource value: 5
+ public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
+
+ // aapt resource value: 3
+ public const int CoordinatorLayout_Layout_layout_keyline = 3;
+
+ public static int[] DesignTheme = new int[] {
+ 2130772256,
+ 2130772257,
+ 2130772258};
+
+ // aapt resource value: 0
+ public const int DesignTheme_bottomSheetDialogTheme = 0;
+
+ // aapt resource value: 1
+ public const int DesignTheme_bottomSheetStyle = 1;
+
+ // aapt resource value: 2
+ public const int DesignTheme_textColorError = 2;
+
+ 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;
+
+ // aapt resource value: 0
+ public const int DrawerArrowToggle_color = 0;
+
+ // aapt resource value: 2
+ public const int DrawerArrowToggle_drawableSize = 2;
+
+ // aapt resource value: 3
+ public const int DrawerArrowToggle_gapBetweenBars = 3;
+
+ // aapt resource value: 1
+ public const int DrawerArrowToggle_spinBars = 1;
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
- // aapt resource value: { 0x7F03008D,0x7F03008E,0x7F03008F,0x7F030090,0x7F030091,0x7F030092 }
- public static int[] FontFamily = new int[] {
- 2130903181,
- 2130903182,
- 2130903183,
- 2130903184,
- 2130903185,
- 2130903186};
-
- // aapt resource value: { 0x7F03008B,0x7F030093,0x7F030094 }
- public static int[] FontFamilyFont = new int[] {
- 2130903179,
- 2130903187,
- 2130903188};
-
- // aapt resource value: 0
- public const int FontFamilyFont_font = 0;
+ public static int[] FloatingActionButton = new int[] {
+ 2130772005,
+ 2130772221,
+ 2130772222,
+ 2130772259,
+ 2130772260,
+ 2130772261,
+ 2130772262,
+ 2130772263};
// aapt resource value: 1
- public const int FontFamilyFont_fontStyle = 1;
+ public const int FloatingActionButton_backgroundTint = 1;
// aapt resource value: 2
- public const int FontFamilyFont_fontWeight = 2;
+ public const int FloatingActionButton_backgroundTintMode = 2;
+
+ // aapt resource value: 6
+ public const int FloatingActionButton_borderWidth = 6;
+
+ // aapt resource value: 0
+ public const int FloatingActionButton_elevation = 0;
+
+ // aapt resource value: 4
+ public const int FloatingActionButton_fabSize = 4;
+
+ // aapt resource value: 5
+ public const int FloatingActionButton_pressedTranslationZ = 5;
+
+ // aapt resource value: 3
+ public const int FloatingActionButton_rippleColor = 3;
+
+ // aapt resource value: 7
+ public const int FloatingActionButton_useCompatPadding = 7;
+
+ public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+ 2130772264};
+
+ // aapt resource value: 0
+ public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+
+ public static int[] FontFamily = new int[] {
+ 2130772305,
+ 2130772306,
+ 2130772307,
+ 2130772308,
+ 2130772309,
+ 2130772310};
// aapt resource value: 0
public const int FontFamily_fontProviderAuthority = 0;
- // aapt resource value: 1
- public const int FontFamily_fontProviderCerts = 1;
-
- // aapt resource value: 2
- public const int FontFamily_fontProviderFetchStrategy = 2;
-
// aapt resource value: 3
- public const int FontFamily_fontProviderFetchTimeout = 3;
+ public const int FontFamily_fontProviderCerts = 3;
// aapt resource value: 4
- public const int FontFamily_fontProviderPackage = 4;
+ public const int FontFamily_fontProviderFetchStrategy = 4;
// aapt resource value: 5
- public const int FontFamily_fontProviderQuery = 5;
+ public const int FontFamily_fontProviderFetchTimeout = 5;
- // aapt resource value: { 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: 1
+ public const int FontFamily_fontProviderPackage = 1;
+
+ // aapt resource value: 2
+ public const int FontFamily_fontProviderQuery = 2;
+
+ public static int[] FontFamilyFont = new int[] {
+ 2130772311,
+ 2130772312,
+ 2130772313};
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_font = 1;
// aapt resource value: 0
- public const int HDLArcSeekBar_arc_border_color = 0;
-
- // aapt resource value: 1
- public const int HDLArcSeekBar_arc_border_width = 1;
+ public const int FontFamilyFont_fontStyle = 0;
// aapt resource value: 2
- public const int HDLArcSeekBar_arc_colors = 2;
+ public const int FontFamilyFont_fontWeight = 2;
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_max = 3;
+ public static int[] ForegroundLinearLayout = new int[] {
+ 16843017,
+ 16843264,
+ 2130772265};
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_min = 4;
+ // aapt resource value: 0
+ public const int ForegroundLinearLayout_android_foreground = 0;
+
+ // aapt resource value: 1
+ public const int ForegroundLinearLayout_android_foregroundGravity = 1;
+
+ // aapt resource value: 2
+ public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
+
+ public static int[] HDLArcSeekBar = new int[] {
+ 2130772382,
+ 2130772383,
+ 2130772384,
+ 2130772385,
+ 2130772386,
+ 2130772387,
+ 2130772388,
+ 2130772389,
+ 2130772390,
+ 2130772391,
+ 2130772392,
+ 2130772393,
+ 2130772394,
+ 2130772395,
+ 2130772396,
+ 2130772397,
+ 2130772398,
+ 2130772399};
// aapt resource value: 5
- public const int HDLArcSeekBar_arc_open_angle = 5;
+ public const int HDLArcSeekBar_arc_border_color = 5;
+
+ // aapt resource value: 4
+ public const int HDLArcSeekBar_arc_border_width = 4;
+
+ // aapt resource value: 3
+ public const int HDLArcSeekBar_arc_colors = 3;
// aapt resource value: 6
- public const int HDLArcSeekBar_arc_progress = 6;
+ public const int HDLArcSeekBar_arc_max = 6;
// aapt resource value: 7
- public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+ public const int HDLArcSeekBar_arc_min = 7;
+
+ // aapt resource value: 1
+ public const int HDLArcSeekBar_arc_open_angle = 1;
// aapt resource value: 8
- public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+ public const int HDLArcSeekBar_arc_progress = 8;
- // aapt resource value: 9
- public const int HDLArcSeekBar_arc_rotate_angle = 9;
+ // aapt resource value: 16
+ public const int HDLArcSeekBar_arc_progress_bar_color = 16;
+
+ // aapt resource value: 17
+ public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+
+ // aapt resource value: 2
+ public const int HDLArcSeekBar_arc_rotate_angle = 2;
+
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_shadow_radius = 15;
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_shadow_radius = 10;
+ public const int HDLArcSeekBar_arc_thumb_color = 10;
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_color = 11;
-
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_radius = 12;
+ public const int HDLArcSeekBar_arc_thumb_radius = 11;
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
- // aapt resource value: 14
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
+ // aapt resource value: 12
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
- // aapt resource value: 15
- public const int HDLArcSeekBar_arc_thumb_width = 15;
-
- // aapt resource value: 16
- public const int HDLArcSeekBar_arc_width = 16;
-
- // aapt resource value: 17
- public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
-
- // aapt resource value: { 0x7F03006F,0x7F030070,0x7F030071,0x7F030072,0x7F030073,0x7F0300D5 }
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130903151,
- 2130903152,
- 2130903153,
- 2130903154,
- 2130903155,
- 2130903253};
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_thumb_width = 9;
// aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
+ public const int HDLArcSeekBar_arc_width = 0;
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
+ // aapt resource value: 14
+ public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
+
+ public static int[] HDLCurtainSeekBar = new int[] {
+ 2130772400,
+ 2130772401,
+ 2130772402,
+ 2130772403,
+ 2130772404,
+ 2130772405};
// aapt resource value: 2
- public const int HDLCurtainSeekBar_curtain_bar_color = 2;
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_height = 3;
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
+
+ // aapt resource value: 0
+ public const int HDLCurtainSeekBar_curtain_bar_color = 0;
+
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_curtain_bar_height = 5;
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
- // aapt resource value: 5
- public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
- // aapt resource value: { 0x7F0300D6,0x7F03015B,0x7F03015C,0x7F03015D,0x7F03015E,0x7F03015F }
public static int[] HDLWaveSeekBar = new int[] {
- 2130903254,
- 2130903387,
- 2130903388,
- 2130903389,
- 2130903390,
- 2130903391};
-
- // aapt resource value: 0
- public const int HDLWaveSeekBar_second_wave_color = 0;
+ 2130772406,
+ 2130772407,
+ 2130772408,
+ 2130772409,
+ 2130772410,
+ 2130772411};
// aapt resource value: 1
- public const int HDLWaveSeekBar_wave_bg_color = 1;
+ public const int HDLWaveSeekBar_second_wave_color = 1;
// aapt resource value: 2
- public const int HDLWaveSeekBar_wave_border_color = 2;
+ public const int HDLWaveSeekBar_wave_bg_color = 2;
// aapt resource value: 3
- public const int HDLWaveSeekBar_wave_color = 3;
+ public const int HDLWaveSeekBar_wave_border_color = 3;
- // aapt resource value: 4
- public const int HDLWaveSeekBar_wave_height = 4;
+ // aapt resource value: 0
+ public const int HDLWaveSeekBar_wave_color = 0;
// aapt resource value: 5
- public const int HDLWaveSeekBar_wave_width = 5;
+ public const int HDLWaveSeekBar_wave_height = 5;
- // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F030079,0x7F03007B,0x7F0300B7,0x7F0300DB }
+ // aapt resource value: 4
+ public const int HDLWaveSeekBar_wave_width = 4;
+
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130903161,
- 2130903163,
- 2130903223,
- 2130903259};
+ 2130771988,
+ 2130772158,
+ 2130772159,
+ 2130772160};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -5928,10 +6972,15 @@
// aapt resource value: 5
public const int LinearLayoutCompat_divider = 5;
- // aapt resource value: 6
- public const int LinearLayoutCompat_dividerPadding = 6;
+ // aapt resource value: 8
+ public const int LinearLayoutCompat_dividerPadding = 8;
- // aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
+ // aapt resource value: 6
+ public const int LinearLayoutCompat_measureWithLargestChild = 6;
+
+ // aapt resource value: 7
+ public const int LinearLayoutCompat_showDividers = 7;
+
public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
@@ -5950,13 +6999,6 @@
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
- // aapt resource value: 7
- public const int LinearLayoutCompat_measureWithLargestChild = 7;
-
- // aapt resource value: 8
- public const int LinearLayoutCompat_showDividers = 8;
-
- // aapt resource value: { 0x10102AC,0x10102AD }
public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -5967,7 +7009,6 @@
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
- // aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
public static int[] MenuGroup = new int[] {
16842766,
16842960,
@@ -5994,7 +7035,6 @@
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
- // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F03000D,0x7F03001F,0x7F030020,0x7F030028,0x7F030067,0x7F03009D,0x7F03009E,0x7F0300BC,0x7F0300DA,0x7F030156 }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -6009,28 +7049,28 @@
16843236,
16843237,
16843375,
- 2130903053,
- 2130903071,
- 2130903072,
- 2130903080,
- 2130903143,
- 2130903197,
- 2130903198,
- 2130903228,
- 2130903258,
- 2130903382};
-
- // aapt resource value: 13
- public const int MenuItem_actionLayout = 13;
-
- // aapt resource value: 14
- public const int MenuItem_actionProviderClass = 14;
-
- // aapt resource value: 15
- public const int MenuItem_actionViewClass = 15;
+ 2130772161,
+ 2130772162,
+ 2130772163,
+ 2130772164,
+ 2130772165,
+ 2130772166,
+ 2130772167,
+ 2130772168,
+ 2130772169,
+ 2130772170};
// aapt resource value: 16
- public const int MenuItem_alphabeticModifiers = 16;
+ public const int MenuItem_actionLayout = 16;
+
+ // aapt resource value: 18
+ public const int MenuItem_actionProviderClass = 18;
+
+ // aapt resource value: 17
+ public const int MenuItem_actionViewClass = 17;
+
+ // aapt resource value: 13
+ public const int MenuItem_alphabeticModifiers = 13;
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
@@ -6071,25 +7111,24 @@
// aapt resource value: 4
public const int MenuItem_android_visible = 4;
- // aapt resource value: 17
- public const int MenuItem_contentDescription = 17;
-
- // aapt resource value: 18
- public const int MenuItem_iconTint = 18;
-
// aapt resource value: 19
- public const int MenuItem_iconTintMode = 19;
-
- // aapt resource value: 20
- public const int MenuItem_numericModifiers = 20;
+ public const int MenuItem_contentDescription = 19;
// aapt resource value: 21
- public const int MenuItem_showAsAction = 21;
+ public const int MenuItem_iconTint = 21;
// aapt resource value: 22
- public const int MenuItem_tooltipText = 22;
+ public const int MenuItem_iconTintMode = 22;
- // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0300C8,0x7F030128 }
+ // aapt resource value: 14
+ public const int MenuItem_numericModifiers = 14;
+
+ // aapt resource value: 15
+ public const int MenuItem_showAsAction = 15;
+
+ // aapt resource value: 20
+ public const int MenuItem_tooltipText = 20;
+
public static int[] MenuView = new int[] {
16842926,
16843052,
@@ -6098,8 +7137,8 @@
16843055,
16843056,
16843057,
- 2130903240,
- 2130903336};
+ 2130772171,
+ 2130772172};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -6128,45 +7167,52 @@
// 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};
+ public static int[] NavigationView = new int[] {
+ 16842964,
+ 16842973,
+ 16843039,
+ 2130772005,
+ 2130772266,
+ 2130772267,
+ 2130772268,
+ 2130772269,
+ 2130772270,
+ 2130772271};
// aapt resource value: 0
- public const int pickerview_wheelview_dividerColor = 0;
+ public const int NavigationView_android_background = 0;
// aapt resource value: 1
- public const int pickerview_wheelview_gravity = 1;
+ public const int NavigationView_android_fitsSystemWindows = 1;
// aapt resource value: 2
- public const int pickerview_wheelview_lineSpacingMultiplier = 2;
+ public const int NavigationView_android_maxWidth = 2;
// aapt resource value: 3
- public const int pickerview_wheelview_textColorCenter = 3;
+ public const int NavigationView_elevation = 3;
- // aapt resource value: 4
- public const int pickerview_wheelview_textColorOut = 4;
+ // aapt resource value: 9
+ public const int NavigationView_headerLayout = 9;
+
+ // aapt resource value: 7
+ public const int NavigationView_itemBackground = 7;
// aapt resource value: 5
- public const int pickerview_wheelview_textSize = 5;
+ public const int NavigationView_itemIconTint = 5;
- // aapt resource value: { 0x1010176,0x10102C9,0x7F0300BD }
+ // aapt resource value: 8
+ public const int NavigationView_itemTextAppearance = 8;
+
+ // aapt resource value: 6
+ public const int NavigationView_itemTextColor = 6;
+
+ // aapt resource value: 4
+ public const int NavigationView_menu = 4;
+
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130903229};
-
- // aapt resource value: { 0x7F030127 }
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130903335};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
+ 2130772173};
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -6177,10 +7223,15 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- // aapt resource value: { 0x7F0300BE,0x7F0300C1 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130772174};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
+
public static int[] RecycleListView = new int[] {
- 2130903230,
- 2130903233};
+ 2130772175,
+ 2130772176};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -6188,19 +7239,18 @@
// 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,
- 2130903174,
- 2130903175,
- 2130903176,
- 2130903177,
- 2130903178,
- 2130903206,
- 2130903249,
- 2130903263,
- 2130903334};
+ 2130771968,
+ 2130771969,
+ 2130771970,
+ 2130771971,
+ 2130771972,
+ 2130771973,
+ 2130771974,
+ 2130771975,
+ 2130771976};
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
@@ -6208,52 +7258,63 @@
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
- // aapt resource value: 2
- public const int RecyclerView_fastScrollEnabled = 2;
-
- // aapt resource value: 3
- public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
-
- // aapt resource value: 4
- public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
-
- // aapt resource value: 5
- public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
-
// aapt resource value: 6
- public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
-
- // aapt resource value: 7
- public const int RecyclerView_layoutManager = 7;
-
- // aapt resource value: 8
- public const int RecyclerView_reverseLayout = 8;
+ public const int RecyclerView_fastScrollEnabled = 6;
// aapt resource value: 9
- public const int RecyclerView_spanCount = 9;
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
// aapt resource value: 10
- public const int RecyclerView_stackFromEnd = 10;
+ public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
- // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F030057,0x7F030066,0x7F030075,0x7F030096,0x7F03009F,0x7F0300A5,0x7F0300CB,0x7F0300CC,0x7F0300D2,0x7F0300D3,0x7F030129,0x7F03012E,0x7F03015A }
+ // aapt resource value: 7
+ public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
+
+ // aapt resource value: 8
+ public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
+
+ // aapt resource value: 2
+ public const int RecyclerView_layoutManager = 2;
+
+ // aapt resource value: 4
+ public const int RecyclerView_reverseLayout = 4;
+
+ // aapt resource value: 3
+ public const int RecyclerView_spanCount = 3;
+
+ // aapt resource value: 5
+ public const int RecyclerView_stackFromEnd = 5;
+
+ public static int[] ScrimInsetsFrameLayout = new int[] {
+ 2130772272};
+
+ // aapt resource value: 0
+ public const int ScrimInsetsFrameLayout_insetForeground = 0;
+
+ public static int[] ScrollingViewBehavior_Layout = new int[] {
+ 2130772273};
+
+ // aapt resource value: 0
+ public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
+
public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
16843364,
- 2130903127,
- 2130903142,
- 2130903157,
- 2130903190,
- 2130903199,
- 2130903205,
- 2130903243,
- 2130903244,
- 2130903250,
- 2130903251,
- 2130903337,
- 2130903342,
- 2130903386};
+ 2130772177,
+ 2130772178,
+ 2130772179,
+ 2130772180,
+ 2130772181,
+ 2130772182,
+ 2130772183,
+ 2130772184,
+ 2130772185,
+ 2130772186,
+ 2130772187,
+ 2130772188,
+ 2130772189};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -6267,84 +7328,83 @@
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
- // aapt resource value: 4
- public const int SearchView_closeIcon = 4;
-
- // aapt resource value: 5
- public const int SearchView_commitIcon = 5;
-
- // aapt resource value: 6
- public const int SearchView_defaultQueryHint = 6;
-
- // aapt resource value: 7
- public const int SearchView_goIcon = 7;
-
// aapt resource value: 8
- public const int SearchView_iconifiedByDefault = 8;
-
- // aapt resource value: 9
- public const int SearchView_layout = 9;
-
- // aapt resource value: 10
- public const int SearchView_queryBackground = 10;
-
- // aapt resource value: 11
- public const int SearchView_queryHint = 11;
-
- // aapt resource value: 12
- public const int SearchView_searchHintIcon = 12;
+ public const int SearchView_closeIcon = 8;
// aapt resource value: 13
- public const int SearchView_searchIcon = 13;
+ public const int SearchView_commitIcon = 13;
- // aapt resource value: 14
- public const int SearchView_submitBackground = 14;
+ // aapt resource value: 7
+ public const int SearchView_defaultQueryHint = 7;
+
+ // aapt resource value: 9
+ public const int SearchView_goIcon = 9;
+
+ // aapt resource value: 5
+ public const int SearchView_iconifiedByDefault = 5;
+
+ // aapt resource value: 4
+ public const int SearchView_layout = 4;
// aapt resource value: 15
- public const int SearchView_suggestionRowLayout = 15;
+ public const int SearchView_queryBackground = 15;
+
+ // aapt resource value: 6
+ public const int SearchView_queryHint = 6;
+
+ // aapt resource value: 11
+ public const int SearchView_searchHintIcon = 11;
+
+ // aapt resource value: 10
+ public const int SearchView_searchIcon = 10;
// aapt resource value: 16
- public const int SearchView_voiceIcon = 16;
+ public const int SearchView_submitBackground = 16;
- // aapt resource value: { 0x10100EA,0x10100EB,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 }
+ // aapt resource value: 14
+ public const int SearchView_suggestionRowLayout = 14;
+
+ // aapt resource value: 12
+ public const int SearchView_voiceIcon = 12;
+
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 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};
+ 2130772316,
+ 2130772326,
+ 2130772342,
+ 2130772343,
+ 2130772344,
+ 2130772345,
+ 2130772346,
+ 2130772347,
+ 2130772348,
+ 2130772349,
+ 2130772350,
+ 2130772351,
+ 2130772352,
+ 2130772353,
+ 2130772354,
+ 2130772355,
+ 2130772356,
+ 2130772357,
+ 2130772358,
+ 2130772359,
+ 2130772360,
+ 2130772361,
+ 2130772362,
+ 2130772363,
+ 2130772364,
+ 2130772365,
+ 2130772366,
+ 2130772367,
+ 2130772368,
+ 2130772369,
+ 2130772370,
+ 2130772371,
+ 2130772372,
+ 2130772373,
+ 2130772374};
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -6352,129 +7412,141 @@
// 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: 3
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
-
- // aapt resource value: 4
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlDragRate = 5;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
-
- // aapt resource value: 7
- public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
-
- // aapt resource value: 8
- public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
-
- // aapt resource value: 9
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
-
- // aapt resource value: 10
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
-
- // aapt resource value: 11
- public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
-
- // aapt resource value: 12
- public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
-
- // aapt resource value: 13
- public const int SmartRefreshLayout_srlEnableLoadMore = 13;
-
- // aapt resource value: 14
- public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
-
- // aapt resource value: 15
- public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
-
- // aapt resource value: 16
- public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
-
- // aapt resource value: 17
- public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
-
- // aapt resource value: 18
- public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
-
- // aapt resource value: 19
- public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
-
- // aapt resource value: 20
- public const int SmartRefreshLayout_srlEnableRefresh = 20;
-
- // aapt resource value: 21
- public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
-
- // aapt resource value: 22
- public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
-
- // aapt resource value: 23
- public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
-
- // aapt resource value: 24
- public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
-
- // aapt resource value: 25
- public const int SmartRefreshLayout_srlFooterHeight = 25;
-
- // aapt resource value: 26
- public const int SmartRefreshLayout_srlFooterInsetStart = 26;
-
- // aapt resource value: 27
- public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
-
- // aapt resource value: 28
- public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
-
- // aapt resource value: 29
- public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
-
- // aapt resource value: 30
- public const int SmartRefreshLayout_srlHeaderHeight = 30;
-
- // aapt resource value: 31
- public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
-
- // aapt resource value: 32
- public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+ // aapt resource value: 34
+ public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
// aapt resource value: 33
- public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+ public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
- // aapt resource value: 34
- public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+ // aapt resource value: 9
+ public const int SmartRefreshLayout_srlDragRate = 9;
- // aapt resource value: 35
- public const int SmartRefreshLayout_srlPrimaryColor = 35;
+ // aapt resource value: 21
+ public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
+
+ // aapt resource value: 31
+ public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
+
+ // aapt resource value: 30
+ public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
+
+ // aapt resource value: 28
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
+
+ // aapt resource value: 29
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
+
+ // aapt resource value: 17
+ public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
+
+ // aapt resource value: 16
+ public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
+
+ // aapt resource value: 15
+ public const int SmartRefreshLayout_srlEnableLoadMore = 15;
+
+ // aapt resource value: 27
+ public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
+
+ // aapt resource value: 24
+ public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
+
+ // aapt resource value: 22
+ public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
+
+ // aapt resource value: 32
+ public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
+
+ // aapt resource value: 20
+ public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
+
+ // aapt resource value: 23
+ public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
+
+ // aapt resource value: 14
+ public const int SmartRefreshLayout_srlEnableRefresh = 14;
+
+ // aapt resource value: 25
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
+
+ // aapt resource value: 26
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
// aapt resource value: 36
- public const int SmartRefreshLayout_srlReboundDuration = 36;
+ public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
- // aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0300C6 }
+ // aapt resource value: 35
+ public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
+
+ // aapt resource value: 6
+ public const int SmartRefreshLayout_srlFooterHeight = 6;
+
+ // aapt resource value: 8
+ public const int SmartRefreshLayout_srlFooterInsetStart = 8;
+
+ // aapt resource value: 11
+ public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
+
+ // aapt resource value: 19
+ public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
+
+ // aapt resource value: 13
+ public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
+
+ // aapt resource value: 5
+ public const int SmartRefreshLayout_srlHeaderHeight = 5;
+
+ // aapt resource value: 7
+ public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
+
+ // aapt resource value: 10
+ public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
+
+ // aapt resource value: 18
+ public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
+
+ // aapt resource value: 12
+ public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
+
+ // aapt resource value: 3
+ public const int SmartRefreshLayout_srlPrimaryColor = 3;
+
+ // aapt resource value: 4
+ public const int SmartRefreshLayout_srlReboundDuration = 4;
+
+ public static int[] SmartRefreshLayout_Layout = new int[] {
+ 2130772315,
+ 2130772375};
+
+ // aapt resource value: 1
+ public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+
+ // aapt resource value: 0
+ public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+
+ public static int[] SnackbarLayout = new int[] {
+ 16843039,
+ 2130772005,
+ 2130772274};
+
+ // aapt resource value: 0
+ public const int SnackbarLayout_android_maxWidth = 0;
+
+ // aapt resource value: 1
+ public const int SnackbarLayout_elevation = 1;
+
+ // aapt resource value: 2
+ public const int SnackbarLayout_maxActionInlineWidth = 2;
+
public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
16843362,
- 2130903238};
+ 2130772006};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -6491,22 +7563,21 @@
// 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,
- 2130903260,
- 2130903267,
- 2130903343,
- 2130903344,
- 2130903346,
- 2130903360,
- 2130903361,
- 2130903362,
- 2130903383,
- 2130903384,
- 2130903385};
+ 2130772190,
+ 2130772191,
+ 2130772192,
+ 2130772193,
+ 2130772194,
+ 2130772195,
+ 2130772196,
+ 2130772197,
+ 2130772198,
+ 2130772199,
+ 2130772200};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -6517,40 +7588,119 @@
// aapt resource value: 2
public const int SwitchCompat_android_thumb = 2;
- // aapt resource value: 3
- public const int SwitchCompat_showText = 3;
+ // aapt resource value: 13
+ public const int SwitchCompat_showText = 13;
- // aapt resource value: 4
- public const int SwitchCompat_splitTrack = 4;
+ // aapt resource value: 12
+ public const int SwitchCompat_splitTrack = 12;
- // aapt resource value: 5
- public const int SwitchCompat_switchMinWidth = 5;
+ // aapt resource value: 10
+ public const int SwitchCompat_switchMinWidth = 10;
- // aapt resource value: 6
- public const int SwitchCompat_switchPadding = 6;
+ // aapt resource value: 11
+ public const int SwitchCompat_switchPadding = 11;
- // aapt resource value: 7
- public const int SwitchCompat_switchTextAppearance = 7;
+ // aapt resource value: 9
+ public const int SwitchCompat_switchTextAppearance = 9;
// aapt resource value: 8
public const int SwitchCompat_thumbTextPadding = 8;
- // aapt resource value: 9
- public const int SwitchCompat_thumbTint = 9;
+ // aapt resource value: 3
+ public const int SwitchCompat_thumbTint = 3;
- // aapt resource value: 10
- public const int SwitchCompat_thumbTintMode = 10;
+ // aapt resource value: 4
+ public const int SwitchCompat_thumbTintMode = 4;
- // aapt resource value: 11
- public const int SwitchCompat_track = 11;
+ // aapt resource value: 5
+ public const int SwitchCompat_track = 5;
- // aapt resource value: 12
- public const int SwitchCompat_trackTint = 12;
+ // aapt resource value: 6
+ public const int SwitchCompat_trackTint = 6;
+
+ // aapt resource value: 7
+ public const int SwitchCompat_trackTintMode = 7;
+
+ public static int[] TabItem = new int[] {
+ 16842754,
+ 16842994,
+ 16843087};
+
+ // aapt resource value: 0
+ public const int TabItem_android_icon = 0;
+
+ // aapt resource value: 1
+ public const int TabItem_android_layout = 1;
+
+ // aapt resource value: 2
+ public const int TabItem_android_text = 2;
+
+ public static int[] TabLayout = new int[] {
+ 2130772275,
+ 2130772276,
+ 2130772277,
+ 2130772278,
+ 2130772279,
+ 2130772280,
+ 2130772281,
+ 2130772282,
+ 2130772283,
+ 2130772284,
+ 2130772285,
+ 2130772286,
+ 2130772287,
+ 2130772288,
+ 2130772289,
+ 2130772290};
+
+ // aapt resource value: 3
+ public const int TabLayout_tabBackground = 3;
+
+ // aapt resource value: 2
+ public const int TabLayout_tabContentStart = 2;
+
+ // aapt resource value: 5
+ public const int TabLayout_tabGravity = 5;
+
+ // aapt resource value: 0
+ public const int TabLayout_tabIndicatorColor = 0;
+
+ // aapt resource value: 1
+ public const int TabLayout_tabIndicatorHeight = 1;
+
+ // aapt resource value: 7
+ public const int TabLayout_tabMaxWidth = 7;
+
+ // aapt resource value: 6
+ public const int TabLayout_tabMinWidth = 6;
+
+ // aapt resource value: 4
+ public const int TabLayout_tabMode = 4;
+
+ // aapt resource value: 15
+ public const int TabLayout_tabPadding = 15;
+
+ // aapt resource value: 14
+ public const int TabLayout_tabPaddingBottom = 14;
// aapt resource value: 13
- public const int SwitchCompat_trackTintMode = 13;
+ public const int TabLayout_tabPaddingEnd = 13;
- // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F03008C,0x7F030133 }
+ // aapt resource value: 11
+ public const int TabLayout_tabPaddingStart = 11;
+
+ // aapt resource value: 12
+ public const int TabLayout_tabPaddingTop = 12;
+
+ // aapt resource value: 10
+ public const int TabLayout_tabSelectedTextColor = 10;
+
+ // aapt resource value: 8
+ public const int TabLayout_tabTextAppearance = 8;
+
+ // aapt resource value: 9
+ public const int TabLayout_tabTextColor = 9;
+
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -6563,8 +7713,8 @@
16843107,
16843108,
16843692,
- 2130903180,
- 2130903347};
+ 2130772022,
+ 2130772028};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -6599,43 +7749,108 @@
// 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_fontFamily = 11;
+ public const int TextAppearance_textAllCaps = 11;
+
+ public static int[] TextInputLayout = new int[] {
+ 16842906,
+ 16843088,
+ 2130772291,
+ 2130772292,
+ 2130772293,
+ 2130772294,
+ 2130772295,
+ 2130772296,
+ 2130772297,
+ 2130772298,
+ 2130772299,
+ 2130772300,
+ 2130772301,
+ 2130772302,
+ 2130772303,
+ 2130772304};
+
+ // aapt resource value: 1
+ public const int TextInputLayout_android_hint = 1;
+
+ // aapt resource value: 0
+ public const int TextInputLayout_android_textColorHint = 0;
+
+ // aapt resource value: 6
+ public const int TextInputLayout_counterEnabled = 6;
+
+ // aapt resource value: 7
+ public const int TextInputLayout_counterMaxLength = 7;
+
+ // aapt resource value: 9
+ public const int TextInputLayout_counterOverflowTextAppearance = 9;
+
+ // aapt resource value: 8
+ public const int TextInputLayout_counterTextAppearance = 8;
+
+ // aapt resource value: 4
+ public const int TextInputLayout_errorEnabled = 4;
+
+ // aapt resource value: 5
+ public const int TextInputLayout_errorTextAppearance = 5;
+
+ // aapt resource value: 10
+ public const int TextInputLayout_hintAnimationEnabled = 10;
+
+ // aapt resource value: 3
+ public const int TextInputLayout_hintEnabled = 3;
+
+ // aapt resource value: 2
+ public const int TextInputLayout_hintTextAppearance = 2;
+
+ // aapt resource value: 13
+ public const int TextInputLayout_passwordToggleContentDescription = 13;
// aapt resource value: 12
- public const int TextAppearance_textAllCaps = 12;
+ public const int TextInputLayout_passwordToggleDrawable = 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 }
+ // aapt resource value: 11
+ public const int TextInputLayout_passwordToggleEnabled = 11;
+
+ // aapt resource value: 14
+ public const int TextInputLayout_passwordToggleTint = 14;
+
+ // aapt resource value: 15
+ public const int TextInputLayout_passwordToggleTintMode = 15;
+
public static int[] Toolbar = new int[] {
16842927,
16843072,
- 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};
+ 2130771980,
+ 2130771983,
+ 2130771987,
+ 2130771999,
+ 2130772000,
+ 2130772001,
+ 2130772002,
+ 2130772003,
+ 2130772004,
+ 2130772006,
+ 2130772201,
+ 2130772202,
+ 2130772203,
+ 2130772204,
+ 2130772205,
+ 2130772206,
+ 2130772207,
+ 2130772208,
+ 2130772209,
+ 2130772210,
+ 2130772211,
+ 2130772212,
+ 2130772213,
+ 2130772214,
+ 2130772215,
+ 2130772216,
+ 2130772217};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -6643,20 +7858,20 @@
// aapt resource value: 1
public const int Toolbar_android_minHeight = 1;
- // aapt resource value: 2
- public const int Toolbar_buttonGravity = 2;
+ // aapt resource value: 21
+ public const int Toolbar_buttonGravity = 21;
- // aapt resource value: 3
- public const int Toolbar_collapseContentDescription = 3;
+ // aapt resource value: 23
+ public const int Toolbar_collapseContentDescription = 23;
- // aapt resource value: 4
- public const int Toolbar_collapseIcon = 4;
-
- // aapt resource value: 5
- public const int Toolbar_contentInsetEnd = 5;
+ // aapt resource value: 22
+ public const int Toolbar_collapseIcon = 22;
// aapt resource value: 6
- public const int Toolbar_contentInsetEndWithActions = 6;
+ public const int Toolbar_contentInsetEnd = 6;
+
+ // aapt resource value: 10
+ public const int Toolbar_contentInsetEndWithActions = 10;
// aapt resource value: 7
public const int Toolbar_contentInsetLeft = 7;
@@ -6664,106 +7879,118 @@
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
+ // aapt resource value: 5
+ public const int Toolbar_contentInsetStart = 5;
+
// aapt resource value: 9
- public const int Toolbar_contentInsetStart = 9;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetStartWithNavigation = 10;
-
- // aapt resource value: 11
- public const int Toolbar_logo = 11;
-
- // aapt resource value: 12
- public const int Toolbar_logoDescription = 12;
-
- // aapt resource value: 13
- public const int Toolbar_maxButtonHeight = 13;
-
- // aapt resource value: 14
- public const int Toolbar_navigationContentDescription = 14;
-
- // aapt resource value: 15
- public const int Toolbar_navigationIcon = 15;
-
- // aapt resource value: 16
- public const int Toolbar_popupTheme = 16;
-
- // aapt resource value: 17
- public const int Toolbar_subtitle = 17;
-
- // aapt resource value: 18
- public const int Toolbar_subtitleTextAppearance = 18;
-
- // aapt resource value: 19
- public const int Toolbar_subtitleTextColor = 19;
-
- // aapt resource value: 20
- public const int Toolbar_title = 20;
-
- // aapt resource value: 21
- public const int Toolbar_titleMargin = 21;
-
- // aapt resource value: 22
- public const int Toolbar_titleMarginBottom = 22;
-
- // aapt resource value: 23
- public const int Toolbar_titleMarginEnd = 23;
-
- // aapt resource value: 26
- public const int Toolbar_titleMargins = 26;
-
- // aapt resource value: 24
- public const int Toolbar_titleMarginStart = 24;
-
- // aapt resource value: 25
- public const int Toolbar_titleMarginTop = 25;
-
- // aapt resource value: 27
- public const int Toolbar_titleTextAppearance = 27;
-
- // aapt resource value: 28
- public const int Toolbar_titleTextColor = 28;
-
- // aapt resource value: { 0x7F030100,0x7F030105,0x7F030109,0x7F03010A,0x7F030115,0x7F030119 }
- public static int[] TwoLevelHeader = new int[] {
- 2130903296,
- 2130903301,
- 2130903305,
- 2130903306,
- 2130903317,
- 2130903321};
-
- // aapt resource value: 0
- public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
-
- // aapt resource value: 1
- public const int TwoLevelHeader_srlEnableTwoLevel = 1;
-
- // aapt resource value: 2
- public const int TwoLevelHeader_srlFloorDuration = 2;
-
- // aapt resource value: 3
- public const int TwoLevelHeader_srlFloorRage = 3;
+ public const int Toolbar_contentInsetStartWithNavigation = 9;
// aapt resource value: 4
- public const int TwoLevelHeader_srlMaxRage = 4;
+ public const int Toolbar_logo = 4;
+
+ // aapt resource value: 26
+ public const int Toolbar_logoDescription = 26;
+
+ // aapt resource value: 20
+ public const int Toolbar_maxButtonHeight = 20;
+
+ // aapt resource value: 25
+ public const int Toolbar_navigationContentDescription = 25;
+
+ // aapt resource value: 24
+ public const int Toolbar_navigationIcon = 24;
+
+ // aapt resource value: 11
+ public const int Toolbar_popupTheme = 11;
+
+ // aapt resource value: 3
+ public const int Toolbar_subtitle = 3;
+
+ // aapt resource value: 13
+ public const int Toolbar_subtitleTextAppearance = 13;
+
+ // aapt resource value: 28
+ public const int Toolbar_subtitleTextColor = 28;
+
+ // aapt resource value: 2
+ public const int Toolbar_title = 2;
+
+ // aapt resource value: 14
+ public const int Toolbar_titleMargin = 14;
+
+ // aapt resource value: 18
+ public const int Toolbar_titleMarginBottom = 18;
+
+ // aapt resource value: 16
+ public const int Toolbar_titleMarginEnd = 16;
+
+ // aapt resource value: 15
+ public const int Toolbar_titleMarginStart = 15;
+
+ // aapt resource value: 17
+ public const int Toolbar_titleMarginTop = 17;
+
+ // aapt resource value: 19
+ public const int Toolbar_titleMargins = 19;
+
+ // aapt resource value: 12
+ public const int Toolbar_titleTextAppearance = 12;
+
+ // aapt resource value: 27
+ public const int Toolbar_titleTextColor = 27;
+
+ public static int[] TwoLevelHeader = new int[] {
+ 2130772376,
+ 2130772377,
+ 2130772378,
+ 2130772379,
+ 2130772380,
+ 2130772381};
// aapt resource value: 5
- public const int TwoLevelHeader_srlRefreshRage = 5;
+ public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
- // aapt resource value: { 0x1010000,0x10100DA,0x7F0300BF,0x7F0300C0,0x7F03013E }
+ // aapt resource value: 4
+ public const int TwoLevelHeader_srlEnableTwoLevel = 4;
+
+ // aapt resource value: 3
+ public const int TwoLevelHeader_srlFloorDuration = 3;
+
+ // aapt resource value: 1
+ public const int TwoLevelHeader_srlFloorRage = 1;
+
+ // aapt resource value: 0
+ public const int TwoLevelHeader_srlMaxRage = 0;
+
+ // aapt resource value: 2
+ public const int TwoLevelHeader_srlRefreshRage = 2;
+
public static int[] View = new int[] {
16842752,
16842970,
- 2130903231,
- 2130903232,
- 2130903358};
+ 2130772218,
+ 2130772219,
+ 2130772220};
- // aapt resource value: { 0x10100D4,0x7F030045,0x7F030046 }
+ // aapt resource value: 1
+ public const int View_android_focusable = 1;
+
+ // aapt resource value: 0
+ public const int View_android_theme = 0;
+
+ // aapt resource value: 3
+ public const int View_paddingEnd = 3;
+
+ // aapt resource value: 2
+ public const int View_paddingStart = 2;
+
+ // aapt resource value: 4
+ public const int View_theme = 4;
+
public static int[] ViewBackgroundHelper = new int[] {
16842964,
- 2130903109,
- 2130903110};
+ 2130772221,
+ 2130772222};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -6774,7 +8001,6 @@
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
- // aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
@@ -6789,20 +8015,31 @@
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
- // aapt resource value: 1
- public const int View_android_focusable = 1;
-
- // aapt resource value: 0
- public const int View_android_theme = 0;
-
- // aapt resource value: 2
- public const int View_paddingEnd = 2;
-
- // aapt resource value: 3
- public const int View_paddingStart = 3;
+ public static int[] pickerview = new int[] {
+ 2130772412,
+ 2130772413,
+ 2130772414,
+ 2130772415,
+ 2130772416,
+ 2130772417};
// aapt resource value: 4
- public const int View_theme = 4;
+ public const int pickerview_wheelview_dividerColor = 4;
+
+ // aapt resource value: 0
+ public const int pickerview_wheelview_gravity = 0;
+
+ // aapt resource value: 5
+ public const int pickerview_wheelview_lineSpacingMultiplier = 5;
+
+ // aapt resource value: 3
+ public const int pickerview_wheelview_textColorCenter = 3;
+
+ // aapt resource value: 2
+ public const int pickerview_wheelview_textColorOut = 2;
+
+ // aapt resource value: 1
+ public const int pickerview_wheelview_textSize = 1;
static Styleable()
{
@@ -6810,25 +8047,6 @@
}
private Styleable()
- {
- }
- }
-
- 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()
{
}
}
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index a0742ca..7bca522 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -48,6 +48,7 @@
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
+ <MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -59,6 +60,9 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
+ <MtouchI18n>cjk</MtouchI18n>
+ <DeviceSpecificBuild>true</DeviceSpecificBuild>
+ <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -412,6 +416,7 @@
<BundleResource Include="Resources\Phone\Item\Down.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected.png" />
<BundleResource Include="Resources\Phone\Item\Room.png" />
+ <BundleResource Include="Resources\Phone\Item\SeekBarIcon.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\Remote.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
@@ -504,6 +509,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\ac.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\curtain.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\doorlock.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nodelay.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
@@ -514,6 +520,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\security1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\delay.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sunrise.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn_2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\temperature.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\AddSelected.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\light_1.png" />
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 25d3bc8..6610a60 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -226,6 +226,8 @@
220=瀵嗙爜鍙兘涓嶅瓨鍦紝灏濊瘯閲嶆柊楠岃瘉杩滅▼寮�閿佸瘑鐮�
221=缁戝畾澶辫触锛岀粦瀹氬嚭鐜版湭鐭ラ敊璇�
222=绂荤嚎鍦烘櫙
+223=纭鍒犻櫎鎸夐敭妯″紡鍙婃竻绌烘墍鏈夌洰鏍�
+224=缁戝畾鐩爣涓虹┖锛岃閫夋嫨闇�瑕佺粦瀹氱洰鏍�
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -603,7 +605,10 @@
5366=鑱斿姩浜嬩欢
5367=褰撳墠
5368=閫夋嫨妤煎眰
-
+5369=璇烽�夋嫨寤舵椂鏃堕棿锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5370=璇烽�夋嫨鐢ㄦ埛锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5371=璇烽�夋嫨鍦烘櫙锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5372=璇烽�夋嫨瀹夐槻妯″紡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
@@ -778,7 +783,8 @@
13506=5鎸�
13511=璇锋竻娲佹护缃�
-
+13600=娌″姛鑳� {\r\n} 璇峰厛娣诲姞
+13601=娌″満鏅� {\r\n} 璇峰厛娣诲姞
@@ -835,7 +841,7 @@
15050=鍋滄鎼滅储
15051=姝ｅ湪鎼滅储缃戝叧鈥�
15052=璇风◢鍊櫬仿仿�
-15053=璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+15053=璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
15054=缃戝叧鍚嶇О
15055=浣忓畢鍚嶇О
15056=瀹屾垚
@@ -1495,9 +1501,9 @@
15776=杩樻病鏈夊叡浜尯鍩熺粰鎴愬憳{0}鍙偣鍑诲彸涓婅鈥�+鈥濇坊鍔�
15777=纭鍒犻櫎鍏变韩鎴块棿锛�
15778=杩樻病缁戝畾缃戝叧鍝�
-15779=瑙ｅ喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
-15780=1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
-15781=2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+15779=瑙ｅ喅鏂规硶,鍙�夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
+15780=1.鐭寜HID/WCFG鎸夐敭,绯荤粺鎸囩ず鐏揩闂�3绉�,缃戝叧杩涘叆鎹㈢粦妯″紡,寮哄埗缃戝叧缁戝畾鍒板綋鍓岮PP
+15781=2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓�,鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏�,鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
15782=3.璇烽噸璇曪紝閲嶆柊娣诲姞缃戝叧銆�
15783=4.杩斿洖缃戝叧绠＄悊銆�
15784=閲嶈瘯
@@ -1623,12 +1629,12 @@
15904=AP妯″紡
15905=璺宠浆鍒扮Щ鍔ㄨ澶�
15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
-15907=闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
-15908=闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
-15909=璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15907=缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
+15908=璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
+15909=鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
15910=璇疯緭鍏ュ搴璚IFI璐﹀彿
-15911=璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
-15912=绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+15911=鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
+15912=缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
15915=閫夋嫨鍦扮偣
15916=鎮ㄧ殑鍙嶉鍜屾剰瑙佷細璁╂垜浠彉寰楁洿濂�
15917=鍙嶉绫诲瀷
@@ -1698,6 +1704,22 @@
15981=閫夋嫨hdlZigbeeGW-xxxx缃戠粶
15982=璇疯繛鎺ュ搴璚iFi
15983=姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
+15984=璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+15985=缃戝叧娣诲姞鎸囧紩
+15986=1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒,骞惰瀵熺綉鍙ED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+15987=2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓,杩欐椂瑙傚療澶栧３绯荤粺鎸囩ず鐏�,濡傛灉1绉掗棯鐑�,琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯�,鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+15988=缃戝叧纭欢闂甯姪
+15989=1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+15990=2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+15991=绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+15992=2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+15993=1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+15994=1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+15995=1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+15996=2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+15997=3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+15998=璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+15999=鏈煡妤煎眰
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1777,7 +1799,7 @@
30003=姘翠镜浼犳劅鍣�
30004=閽ュ寵鎵�
30005=闂ㄧ獥浼犳劅鍣�
-30006=Zigbee寰柇浜戞帶鍒跺櫒
+30006=鏅鸿兘绌哄紑
30007=Zigbee鏅鸿兘寮�鍚堝笜鐢垫満
30008=4鎸夐敭瑙︽懜闈㈡澘(4璺户鐢靛櫒搴曞骇)
30009=220Pir浼犳劅鍣�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/AC/Swing_5Selected.png b/ZigbeeApp/Home.Ios/Resources/Phone/AC/Swing_5Selected.png
index e794a92..0451429 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/AC/Swing_5Selected.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/AC/Swing_5Selected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/SeekBarIcon.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/SeekBarIcon.png
new file mode 100755
index 0000000..44571e0
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/SeekBarIcon.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn2.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn2.png
new file mode 100755
index 0000000..589a226
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn_2.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn_2.png
new file mode 100755
index 0000000..3bb5739
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn_2.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 6464ae9..6e16115 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.19120901";
+ public static string CodeIDString = "1.0.19121201";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -158,9 +158,8 @@
/// <summary>
/// 鐢ㄤ簬涓浗澶ч檰楠岃瘉鎵嬫満鍙锋鍒欒〃杈惧紡
- /// 绛夊悓浜�--- "^[1]+\\d{10}"
/// </summary>
- public static string PhoneRegexStr = "^[1]+[0,1,2,3,4,5,6,7,8,9]+\\d{9}";
+ public static string PhoneRegexStr = "^[1][0-9]{10}$";
/// <summary>
/// 鐢ㄤ簬楠岃瘉闈炰腑鍥藉ぇ闄嗘墜鏈哄彿姝ｅ垯琛ㄨ揪寮�
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index d732082..409b460 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -107,8 +107,14 @@
List<string> listFile = this.GetAllDeviceFile();
foreach (string file in listFile)
{
+ CommonDevice device = null;
//鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�
- var device = ZigBee.Device.CommonDevice.CommonDeviceByFilePath(file);
+ try
+ {
+ device = CommonDevice.CommonDeviceByFilePath(file);
+ }
+ catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+
if (device == null || device.CurrentGateWayId == null)
{
#if DEBUG
@@ -1745,53 +1751,61 @@
int receiveCount = 0;
//璁惧鍒楄〃
var listDevice = new List<CommonDevice>();
-
+ //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+ var listCheck = new HashSet<string>();
Action<string, string> getDeviceAction = (topic, message) =>
{
- try
+ if (topic == gatewayID + "/" + "DeviceInfoRespon")
{
- if (topic == gatewayID + "/" + "DeviceInfoRespon")
+ try
{
- TimeOut = 0;
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
- if (totalNum == 0)
+ lock (listDevice)
{
- //杩欎釜缃戝叧娌℃湁璁惧
- canBreak = true;
- return;
- }
- if (deviceCount == -1)
- {
- //璁剧疆闇�瑕佹帴鏀跺灏戜釜璁惧
- deviceCount = totalNum;
- }
- //璁惧鎺ユ敹鏁�
- receiveCount++;
+ //璁惧鎺ユ敹鏁�
+ receiveCount++;
- var deviceID = (DeviceType)jobject.Value<int>("Device_ID");
- //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
- var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, zbGateway);
- if (device != null)
- {
- try
+ TimeOut = 0;
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+ var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
+ if (totalNum == 0)
{
- //鍥炶皟鍑芥暟
- deviceComingAction?.Invoke(device);
+ //杩欎釜缃戝叧娌℃湁璁惧
+ canBreak = true;
+ return;
}
- //Log鍑哄姏
- catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+ if (deviceCount == -1)
+ {
+ //璁剧疆闇�瑕佹帴鏀跺灏戜釜璁惧
+ deviceCount = totalNum;
+ }
- listDevice.Add(device);
- }
- if (deviceCount == receiveCount)
- {
- //璁惧鍏ㄩ儴鎺ユ敹瀹屾垚
- canBreak = true;
+ var deviceID = (DeviceType)jobject.Value<int>("Device_ID");
+ //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+ var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, zbGateway);
+ if (device != null)
+ {
+ string mainkeys = this.GetDeviceMainKeys(device);
+ //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+ if (listCheck.Contains(mainkeys) == false)
+ {
+ //鍥炶皟鍑芥暟
+ deviceComingAction?.Invoke(device);
+ listDevice.Add(device);
+
+ listCheck.Add(mainkeys);
+ }
+ }
}
}
+ //Log鍑哄姏
+ catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+
+ if (receiveCount == deviceCount && deviceCount != -1)
+ {
+ //璁惧鍏ㄩ儴鎺ユ敹瀹屾垚
+ canBreak = true;
+ }
}
- catch { }
};
realWay.Actions += getDeviceAction;
@@ -2258,7 +2272,7 @@
/// </summary>
AirSwitch = -4100,
/// <summary>
- /// 寰柇浜戞帶鍒跺櫒 闀滃儚id锛�4100
+ /// 鏅鸿兘绌哄紑 闀滃儚id锛�4100
/// </summary>
AirSwitch_CloudContr = 4100,
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index b11598c..65f8a03 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -323,15 +323,45 @@
homeTemp.AddRoomListFilePath(fRoom);
}
+ var listRoomFile = new List<string>();
foreach (string fileName in listFile)
{
if (fileName.StartsWith("Room_"))
{
homeTemp.AddRoomListFilePath(fileName);
+ listRoomFile.Add(fileName);
}
}
+ //妫�娴嬫ゼ灞傛暟鎹殑鍚堟硶鎬�
+ CheckFloorData(listRoomFile);
+
homeTemp.Save(false);
InitAllRoom();
+ }
+
+ /// <summary>
+ /// 妫�娴嬫ゼ灞傛暟鎹殑鍚堟硶鎬�
+ /// </summary>
+ /// <param name="listRoomFile"></param>
+ private static void CheckFloorData(List<string> listRoomFile)
+ {
+ for (int i = 0; i < listRoomFile.Count; i++)
+ {
+ try
+ {
+ var byteData = Global.ReadFileByHomeId(listRoomFile[i]);
+ string valueData = System.Text.Encoding.UTF8.GetString(byteData);
+ var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);
+
+ //妫�娴嬪涓墜鏈烘潵鍥炲垱寤�,鐒跺悗鍙堝垹闄や箣鍚�,妤煎眰鏁版嵁涓嶈兘淇濊瘉100%鍚屾鐨勯棶棰�
+ if (roomTemp.FloorId != string.Empty && Config.Instance.Home.FloorDics.ContainsKey(roomTemp.FloorId) == false)
+ {
+ //鏈煡妤煎眰
+ Config.Instance.Home.FloorDics[roomTemp.FloorId] = Language.StringByID(R.MyInternationalizationString.uUnKnownFloor);
+ }
+ }
+ catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+ }
}
#endregion
@@ -591,6 +621,10 @@
/// <returns></returns>
public List<Room> GetRoomsByFloorId(string id)
{
+ if (Config.Instance.Home.FloorDics.Count == 0)
+ {
+ return Lists;
+ }
return Lists.FindAll((obj) => obj.FloorId == id);
}
/// <summary>
@@ -598,12 +632,12 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<string> GetRoomNamesByFloorId(string id)
+ public List<string> GetRoomNamesByFloorId(string id)
{
List<string> names = new List<string> { };
- foreach(var r in Lists)
+ foreach (var r in Lists)
{
- if(r.FloorId==id)
+ if (r.FloorId == id)
{
names.Add(r.Name);
}
@@ -618,6 +652,10 @@
/// <returns></returns>
public List<Room> GetRoomsByFloorIdAppendLoveRoom(string id)
{
+ if (Config.Instance.Home.FloorDics.Count == 0)
+ {
+ return Lists;
+ }
var r= Lists.FindAll((obj) => obj.FloorId == id);
r.Insert(0, GetLoveRoom());
return r;
diff --git a/ZigbeeApp/Shared/Common/SendDataToServer.cs b/ZigbeeApp/Shared/Common/SendDataToServer.cs
index a47e25b..afce452 100755
--- a/ZigbeeApp/Shared/Common/SendDataToServer.cs
+++ b/ZigbeeApp/Shared/Common/SendDataToServer.cs
@@ -226,6 +226,10 @@
///绗笁鏂圭敤鎴峰敮涓�鏍囪瘑
/// </summary>
public string OpenID;
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string UserName;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 0a92ff2..0abb720 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 fd78fa1..2eb1eaf 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 51bc9e8..5b52ea8 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Xamarin.Android.Support.Design.dll b/ZigbeeApp/Shared/DLL/Android/Xamarin.Android.Support.Design.dll
new file mode 100755
index 0000000..53886a2
--- /dev/null
+++ b/ZigbeeApp/Shared/DLL/Android/Xamarin.Android.Support.Design.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 42759c0..1343a3b 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 25e449c..cf7afbf 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 14601b1..230ce9c 100755
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
@@ -931,7 +931,7 @@
Width = Application.GetRealWidth(modeItem_Width - modeItem_X),
Height = Application.GetRealHeight(modeItem_Height),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextID = R.MyInternationalizationString.SelectFanMode,
+ TextID = R.MyInternationalizationString.SelectMode,
TextAlignment = TextAlignment.CenterLeft
};
changeModeFL.AddChidren(changeModeBtn);
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
index 9a7efab..2e2d466 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
@@ -241,7 +241,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)
{
@@ -261,7 +261,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)
{
resetBtn.Enable = resetBtn.IsSelected = true;
@@ -284,18 +284,6 @@
{
if (CheckAccount(account) == false)
{
- return;
- }
- //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
- if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
- {
- errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
- return;
- }
-
- if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
- {
- errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index 6bdec6f..0316b32 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -653,7 +653,19 @@
AccessToken = authRes.access_token,
RefreshToken = authRes.refresh_token,
OpenID = authRes.openid
- };
+ };
+ //鑾峰彇寰俊鏄电О
+ var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + authRes.access_token;
+ strUrl += "&openid=" + authRes.openid;
+ var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
+ if (byteData == null)
+ {
+ return false;
+ }
+ var receipData = System.Text.Encoding.UTF8.GetString(byteData);
+ var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserCenter.NicknameInfo>(receipData);
+ auth.UserName = nickData.nickname;
+
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (revertObj == null)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
index d5ee032..b5a99bb 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
@@ -306,6 +306,7 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
var revertData = responseDataObj;
Config.ReFresh();
+ Config.Instance.Password = string.Empty;
Config.Instance.Account = revertData.Account;
Config.Instance.Guid = revertData.Guid;
Config.Instance.MD5PWD = revertData.MD5PWD;
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
index da5814b..58bb7b5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
@@ -266,7 +266,6 @@
{
return;
}
- //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
{
errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 4aaf309..4860b66 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1962,7 +1962,7 @@
var logicRowlayout = new RowLayout
{
Height = Application.GetRealHeight(190 + 30),
- Width = Application.GetRealWidth(1080),
+ Width = Application.GetRealWidth(1080-58),
LineColor = ZigbeeColor.Current.LogicBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index e1661ef..a025338 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -631,7 +631,7 @@
{
curRoom = rooms[index1][index2];
zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(floorIds[index1])} , {rooms[index1][index2].Name}");
- }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
+ }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongZone),
Language.StringByID(R.MyInternationalizationString.Confrim),
Language.StringByID(R.MyInternationalizationString.Cancel));
}
@@ -651,7 +651,7 @@
{
curRoom = rs[index1];
zoneRow.SetTitle(rs[index1].Name);
- }, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
+ }, 0, Language.StringByID(R.MyInternationalizationString.BelongZone),
Language.StringByID(R.MyInternationalizationString.Confrim),
Language.StringByID(R.MyInternationalizationString.Cancel));
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
index dac1b70..3394193 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
@@ -179,9 +179,16 @@
confirmBtn.SetTitle(R.MyInternationalizationString.Save);
confirmBtn.MouseUpEventHandler += (sender, e) =>
{
- sceneTargetDevice.DelayTime = totalSecond;
- selectedTimeAction?.Invoke(sceneTargetDevice);
- RemoveFromParent();
+ if (totalSecond == 0)
+ {
+ RemoveFromParent();
+ }
+ else
+ {
+ sceneTargetDevice.DelayTime = totalSecond;
+ selectedTimeAction?.Invoke(sceneTargetDevice);
+ RemoveFromParent();
+ }
};
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
index a6fc541..ce78534 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.GXCTextWhiteColor,
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextAlignment=TextAlignment.CenterLeft
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index bca6db1..a110acf 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -36,6 +36,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 09f0fd1..86475d9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -47,6 +47,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addscene,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -153,8 +154,8 @@
if (clickTag == "no" || tempScene == null)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.scenetip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index a8a3b9d..3ad9a3d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -30,6 +30,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.custompush,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -74,7 +75,7 @@
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(600),
- TextAlignment = TextAlignment.CenterLeft,
+ TextAlignment = TextAlignment.TopLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
Text = Common.Logic.CurrentLogic.LogicCustomPushText,
@@ -83,9 +84,9 @@
middle.AddChidren(textBox);
textBox.HideSoftInput();
- var btnsave = new Button
+ var btnsave = new Button
{
- Y= middle.Height-Application.GetRealHeight(260),
+ Y = middle.Height - Application.GetRealHeight(260),
X = Application.GetRealWidth(85),
Height = Application.GetRealHeight(130),
Width = Application.GetRealWidth(910),
@@ -93,20 +94,19 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.confrim,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- TextSize = 16,
- };
+ TextSize = 16,
+ };
middle.AddChidren(btnsave);
-
+
middle.AddChidren(btnsave);
btnsave.MouseUpEventHandler += (sender, e) =>
{
+ Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
if (Common.Logic.CurrentLogic.LogicId != 0)
{
+ ///鍙敼鎺ㄩ�佸唴瀹癸紱
Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- }
- else {
- Send.AddModifyLogic(Common.Logic.CurrentLogic);
}
RemoveFromParent();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
index 0878bf6..9396089 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
@@ -39,6 +39,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.cycle,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -433,7 +434,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 788b4f4..257b69c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -20,6 +20,7 @@
public void Show(int isInt = 0, bool edit = false)
{
+
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
{
@@ -39,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.adddelay,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -109,9 +111,9 @@
color.AddChidren(btnicon);
var titleText = new Button
{
- Width = Application.GetMinRealAverage(480),
+ Width = Application.GetMinRealAverage(580),
Height = Application.GetMinRealAverage(60),
- X = Application.GetRealWidth(300),
+ X = Application.GetRealWidth(250),
Y = blancolor.Bottom + Application.GetRealHeight(50),
TextID = MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -162,18 +164,18 @@
{
timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString());
- if (timevalue > 3600)
- {
- //鏇存柊鏈�鏂扮姸鎬�
- mUIPickerView.setCurrentItems(60, timevalue - 3600, 0);
- }
- else
- {
+ if (timevalue > 3600)
+ {
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(60, timevalue - 3600, 0);
+ }
+ else
+ {
- var minutevalue1 = timevalue / 60;
- var secondvalue1 = timevalue % 60;
- //鏇存柊鏈�鏂扮姸鎬�
- mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ var minutevalue1 = timevalue / 60;
+ var secondvalue1 = timevalue % 60;
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
}
value = timevalue;
@@ -229,8 +231,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
old mode 100644
new mode 100755
index 311d957..e2355c2
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -49,6 +49,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.devicestate,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -243,7 +244,6 @@
foolrname.Text = btnfoolrname.Text;
flMain.RemoveFromParent();
var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
-
AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
};
foolrRowLayout.MouseUpEventHandler += foolrnameclick;
@@ -284,6 +284,7 @@
/// </summary>
void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
{
+
for (int i = 0; i < roomlist.Count; i++)
{
var room = roomlist[i];
@@ -1239,7 +1240,7 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
- TextSize=14,
+ TextSize = 14,
};
timeoutrowlayout.AddChidren(btntimeout);
@@ -1454,21 +1455,26 @@
};
devicefra.AddChidren(Btntemperaturevalue);
- var horizontalSeekBarVol = new HorizontalSeekBar
+ var horizontalSeekBarVol = new DiyImageSeekBar
{
- Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(80),
- Radius = (uint)Application.GetRealHeight(25),
Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
X = Application.GetRealWidth(80),
- ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
- Max = 100,
- SleepTime = 1000,
- ThumbRadius = 9,
+ Width = Application.GetRealWidth(920),
+ Height = Application.GetRealHeight(160),
+ IsProgressTextShow = false,//鏄剧ず鐧惧垎姣�
+ IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
+ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//杩涘害鏉℃寜閽浘鏍�
+ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊
+ //ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
devicefra.AddChidren(horizontalSeekBarVol);
- horizontalSeekBarVol.MouseUpEventHandler += (sender, e) =>
+
+ EventHandler<int> progressclick = (sender, e) =>
{
+
SelectedDeviceStatuscondition = "TemperatureSensor";
if (temperatureSensor.SensorDiv == 1)
{
@@ -1482,8 +1488,10 @@
Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%";
dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//娓╁害鍊�
}
- };
+ };
+ horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+ horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
if (temperatureSensor.SensorDiv == 1)
@@ -1538,7 +1546,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
index d349226..56ff12d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
@@ -37,6 +37,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addaction,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
index d56fc1b..7ec80cf 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
@@ -35,6 +35,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addaction,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 36a7fc5..d4470ad 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -36,6 +36,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.userlist,
+ IsBold = true,
//Text = "閫夋嫨鐢ㄦ埛",
};
topRowLayout.AddChidren(titleName);
@@ -433,8 +434,8 @@
if (conditionsIndex == -1)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.usertip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
index 3d9eb71..568e567 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -46,6 +46,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.devicestate,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -696,6 +697,7 @@
};
flMain.AddChidren(devicefra);
devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
{
@@ -745,7 +747,6 @@
};
timetype.AddChidren(Btncomplete);
#endregion
-
string SelectedDeviceStatusaction = "no";
actionsInfo.Add("LinkType", 0);
@@ -1054,20 +1055,22 @@
LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
openframelayout.AddChidren(horizontalSeekBarRow);
- var horizontalSeekBarVol = new HorizontalSeekBar
+ var horizontalSeekBarVol = new DiyImageSeekBar
{
+ Y = openrowlayout.Bottom,
Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(80),
- Radius = (uint)Application.GetRealHeight(25),
- Y = Application.GetRealHeight(25),
- //Gravity = Gravity.CenterVertical,
- ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
- Max = 100,
- SleepTime = 1000,
- ThumbRadius = 9,
- IsCanMove = false
+ Height = Application.GetRealHeight(160),
+ X = Application.GetRealWidth(80),
+ IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+ IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
+ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
- horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+ openframelayout.AddChidren(horizontalSeekBarVol);
#endregion
@@ -1140,7 +1143,7 @@
#endregion
int Progressvalue = 100;
- horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+ EventHandler<int> progressclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
Progressvalue = horizontalSeekBarVol.Progress;
@@ -1158,12 +1161,14 @@
switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
};
+ horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+ horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = false;
@@ -1190,8 +1195,8 @@
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
takebackBtnSelected.Visible = false;
@@ -1215,8 +1220,8 @@
EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
openBtnSelected.Visible = false;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = true;
@@ -1258,8 +1263,8 @@
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
takebackBtnSelected.Visible = false;
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
}
else if (value["Data1"] == "2")
{
@@ -1267,8 +1272,8 @@
openBtnSelected.Visible = false;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = true;
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
}
}
@@ -1279,8 +1284,8 @@
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = false;
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
horizontalSeekBarVol.Progress = int.Parse(value["Data1"]) * 100 / 254;
Progressvalue = horizontalSeekBarVol.Progress;
@@ -1352,20 +1357,22 @@
LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
openframelayout.AddChidren(horizontalSeekBarRow);
- var horizontalSeekBarVol = new HorizontalSeekBar
- {
+ var horizontalSeekBarVol = new DiyImageSeekBar
+ {
+ Y = openrowlayout.Bottom,
Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(80),
- Radius = (uint)Application.GetRealHeight(25),
- Y = Application.GetRealHeight(25),
- //Gravity = Gravity.CenterVertical,
- ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
- Max = 100,
- SleepTime = 1000,
- ThumbRadius = 9,
- IsCanMove = false
+ Height = Application.GetRealHeight(160),
+ X = Application.GetRealWidth(80),
+ IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+ IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
+ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
- horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+ openframelayout.AddChidren(horizontalSeekBarVol);
#endregion
@@ -1405,7 +1412,7 @@
#endregion
int Progressvalue = 100;
- horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+ EventHandler<int> progressclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
Progressvalue = horizontalSeekBarVol.Progress;
@@ -1421,12 +1428,14 @@
switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
};
+ horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+ horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
horizontalSeekBarVol.Progress = Progressvalue;
@@ -1450,8 +1459,8 @@
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
@@ -1492,8 +1501,8 @@
}
switchdictionary.Add("Data1", "5");
switchdictionary.Add("Data2", value["Data2"]);
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
@@ -1508,8 +1517,8 @@
switchdictionary.Add("Data1", "1");
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
}
}
@@ -1740,7 +1749,6 @@
}
}
break;
-
case DeviceType.Thermostat:
{
@@ -2065,7 +2073,6 @@
}
-
Btncomplete.MouseUpEventHandler += (sender, e) =>
{
@@ -2079,7 +2086,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
index 819b229..6c5fade 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
@@ -45,6 +45,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addscene,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -151,8 +152,8 @@
if (clickTag == "no" || tempScene == null)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.scenetip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index d15eb32..8c63dd5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index 46746f5..81eb56e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -35,6 +35,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.linkageevent,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index 32a11a6..cec9520 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -37,6 +37,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
Text = titlename,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -203,7 +204,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs
index fcde260..5cb6ab0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs
@@ -27,6 +27,7 @@
TextID = MyInternationalizationString.cycle,
TextSize = 16,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ IsBold = true,
};
topFrameLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
index e944344..229002d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
@@ -38,6 +38,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
Text = name,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -160,8 +161,18 @@
}
}
- int selectIndex1 = timevalue / 60;
- int selectIndex2 = timevalue % 60;
+ int selectIndex1 = 0;
+ int selectIndex2 = 0;
+ if (timevalue > 3600)
+ {
+ selectIndex1 = 60;
+ selectIndex2 = timevalue - 3600;
+ }
+ else
+ {
+ selectIndex1 = timevalue / 60;
+ selectIndex2 = timevalue % 60;
+ }
PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) =>
{
selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
@@ -237,8 +248,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index cff085e..cdf1612 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
@@ -617,14 +618,24 @@
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
}
@@ -643,14 +654,24 @@
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index fffe741..1db0408 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -25,7 +25,6 @@
Button clicktextcolcrbutton = new Button();
public void Show()
{
-
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -47,6 +46,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.devicestate,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -1040,7 +1040,7 @@
};
openrowlayout.AddChidren(btnopen);
- var openBtnSelected = new SelectedButton();
+ var openBtnSelected = new SelectedButton();
openrowlayout.AddChidren(openBtnSelected);
var horizontalSeekBarRow = new RowLayout
@@ -1049,25 +1049,27 @@
Width = Application.GetRealWidth(920),
Height = Application.GetRealHeight(160),
X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
openframelayout.AddChidren(horizontalSeekBarRow);
- var horizontalSeekBarVol = new HorizontalSeekBar
+ var horizontalSeekBarVol = new DiyImageSeekBar
{
+ Y = openrowlayout.Bottom,
+ X = Application.GetRealWidth(80),
Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(80),
- Radius = (uint)Application.GetRealHeight(25),
- Y = Application.GetRealHeight(25),
- //Gravity = Gravity.CenterVertical,
- ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
- Max = 100,
- SleepTime = 1000,
- ThumbRadius = 9,
- IsCanMove = false
- };
- horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+ Height = Application.GetRealHeight(160),
+ IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+ IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
+ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
- #endregion
+ };
+ openframelayout.AddChidren(horizontalSeekBarVol);
+ #endregion
#region 鍏�
var closeframelayout = new FrameLayout
@@ -1138,30 +1140,33 @@
#endregion
int Progressvalue = 100;
- horizontalSeekBarVol.ProgressChanged += (sender, e) =>
- {
- SelectedDeviceStatusaction = "yes";
- Progressvalue = horizontalSeekBarVol.Progress;
- if (switchdictionary.ContainsKey("TaskType"))
- {
- switchdictionary.Remove("TaskType");
- }
- if (switchdictionary.ContainsKey("Data1"))
- {
- switchdictionary.Remove("Data1");
- }
- switchdictionary.Add("TaskType", "3");
+ EventHandler<int> progressclick = (sender, e) =>
+ {
+ Console.WriteLine("12345");
+ SelectedDeviceStatusaction = "yes";
+ Progressvalue = horizontalSeekBarVol.Progress;
+ if (switchdictionary.ContainsKey("TaskType"))
+ {
+ switchdictionary.Remove("TaskType");
+ }
+ if (switchdictionary.ContainsKey("Data1"))
+ {
+ switchdictionary.Remove("Data1");
+ }
+ switchdictionary.Add("TaskType", "3");
//鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
- switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+ switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
- };
+ };
+ horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+ horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = false;
@@ -1188,8 +1193,8 @@
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
takebackBtnSelected.Visible = false;
@@ -1213,8 +1218,8 @@
EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
openBtnSelected.Visible = false;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = true;
@@ -1256,8 +1261,8 @@
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
takebackBtnSelected.Visible = false;
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
}
else if (value["Data1"] == "2")
{
@@ -1265,8 +1270,8 @@
openBtnSelected.Visible = false;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = true;
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
}
}
@@ -1277,8 +1282,8 @@
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
takebackBtnSelected.Visible = false;
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
horizontalSeekBarVol.Progress = int.Parse(value["Data1"])*100/254;
Progressvalue = horizontalSeekBarVol.Progress;
@@ -1350,20 +1355,22 @@
LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
openframelayout.AddChidren(horizontalSeekBarRow);
- var horizontalSeekBarVol = new HorizontalSeekBar
+ var horizontalSeekBarVol = new DiyImageSeekBar
{
+ X = Application.GetRealWidth(80),
+ Y = openrowlayout.Bottom,
Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(80),
- Radius = (uint)Application.GetRealHeight(25),
- Y = Application.GetRealHeight(25),
- //Gravity = Gravity.CenterVertical,
- ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
- Max = 100,
- SleepTime = 1000,
- ThumbRadius = 9,
- IsCanMove = false
+ Height = Application.GetRealHeight(160),
+ IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+ IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
+ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ ProgressTextSize = 14,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
- horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+ openframelayout.AddChidren(horizontalSeekBarVol);
#endregion
@@ -1403,7 +1410,8 @@
#endregion
int Progressvalue = 100;
- horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+
+ EventHandler<int> progressclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
Progressvalue = horizontalSeekBarVol.Progress;
@@ -1419,12 +1427,14 @@
switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
};
+ horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+ horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
///纭浜嬩欢
- EventHandler<MouseEventArgs> openclick = (sender, e) =>
+ EventHandler <MouseEventArgs> openclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
horizontalSeekBarVol.Progress = Progressvalue;
@@ -1448,8 +1458,8 @@
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
@@ -1490,8 +1500,8 @@
}
switchdictionary.Add("Data1", "5");
switchdictionary.Add("Data2", value["Data2"]);
- horizontalSeekBarVol.IsCanMove = true;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+ horizontalSeekBarVol.IsClickable = true;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
@@ -1506,8 +1516,8 @@
switchdictionary.Add("Data1", "1");
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
- horizontalSeekBarVol.IsCanMove = false;
- horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+ horizontalSeekBarVol.IsClickable = false;
+ horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
}
}
@@ -2075,7 +2085,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs
index e2e67b1..5115045 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs
@@ -32,6 +32,7 @@
TextID = MyInternationalizationString.automation,
TextSize = 16,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ IsBold = true,
};
topFrameLayout.AddChidren (titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs
index e88e06a..cdc5a3d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs
@@ -36,6 +36,7 @@
TextID = MyInternationalizationString.automation,
TextSize = 16,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ IsBold = true,
};
topFrameLayout.AddChidren (titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 2ac86ac..c3b8852 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -43,6 +43,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.userlist,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index cb140ff..9c96d7a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.securitymode,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -391,6 +392,10 @@
{
if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
{
+ var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+ Language.StringByID(MyInternationalizationString.securitytip),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs
index d3001d6..ac28ea7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs
@@ -42,6 +42,7 @@
//Text = "鏃堕棿鏉′欢",
TextID = MyInternationalizationString.Timecondition,
TextSize = 17,
+ IsBold = true,
};
topFrameLayout.AddChidren (titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs
index c57ed36..f81143f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs
@@ -33,6 +33,7 @@
TextID = MyInternationalizationString.automation,
TextSize = 16,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ IsBold = true,
};
topFrameLayout.AddChidren (titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs
index 875aef2..89c84c6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs
@@ -33,6 +33,7 @@
TextID = MyInternationalizationString.automation,
TextSize = 16,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ IsBold = true,
};
topFrameLayout.AddChidren (titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 15ca0f0..21c171d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -711,8 +711,31 @@
public static List<Common.Room> GetRoomList(string floorId)
{
return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
-
+ //var list1 = new List<Common.Room>();
+ /////鎵惧埌鏌愭ゼ灞傛埧闂村垪琛紱
+ //var list = Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
+ //for (int i = 0; i < list.Count; i++)
+ //{
+ // if (str == "device")
+ // {
+ // if (list[i].DeviceUIList.Count != 0)
+ // { ///杩囨护鎺夋病鏈夎澶囩殑鎴块棿
+ // list1.Add(list[i]);
+ // }
+ // }
+ // else
+ // {
+ // if (list[i].SceneUIList.Count != 0)
+ // { ///杩囨护鎺夋病鏈夊満鏅殑鎴块棿
+ // list1.Add(list[i]);
+ // }
+ // }
+ //}
+ /////杩斿洖鎴块棿鍒楄〃锛�
+ //return list1;
}
+
+
#endregion
#region ----鑾峰彇闂ㄩ攣
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
index c59eb1f..73ad5a5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
@@ -46,6 +46,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.devicestate,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
index bc06c67..9c1f7c0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -47,6 +47,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.devicestate,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -1119,7 +1120,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
index 09ec1cd..6c9f1f6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
@@ -36,6 +36,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
Text = name,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -158,8 +159,18 @@
}
}
- int selectIndex1 = timevalue / 60;
- int selectIndex2 = timevalue % 60;
+ int selectIndex1 = 0;
+ int selectIndex2 = 0;
+ if (timevalue > 3600)
+ {
+ selectIndex1 = 60;
+ selectIndex2 = timevalue - 3600;
+ }
+ else
+ {
+ selectIndex1 = timevalue / 60;
+ selectIndex2 = timevalue % 60;
+ }
PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) =>
{
selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
@@ -235,8 +246,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 92f05bc..5ee0d16 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -44,6 +44,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
@@ -138,7 +139,7 @@
logicTextBox = new EditText
{
Y = Application.GetRealHeight(35),
- Width = Application.GetRealWidth(900),
+ Width = Application.GetRealWidth(1080 - 58 - 300),
Height = Application.GetRealHeight(60),
X = text.Right,
TextAlignment = TextAlignment.CenterLeft,
@@ -441,14 +442,24 @@
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 93d702f..9b01d9d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addtime,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -253,6 +254,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Tag = "0",
+ TextSize = 14,
};
timeendrow.AddChidren(btnendtime);
@@ -485,7 +487,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.completeNext),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
@@ -493,7 +495,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.sametime),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
index 57a97f7..e55454c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
@@ -88,6 +88,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addtime,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
index ae51cf5..d1a0f0f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -37,6 +37,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
Text = titlename,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -283,7 +284,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index f9eb44b..f32f6f5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -162,30 +162,31 @@
var floorRow = new DeviceInfoRow(308);
floorRow.Init();
floorRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongFloor)} :");
- infoFL.AddChidren(floorRow);
- if (!room.IsLove)
+ if (Config.Instance.Home.FloorDics.Count > 0 && room.IsLove == false)
{
- floorRow.SetTitle(room.FloorName);
- floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
- {
- if (Config.Instance.Home.FloorDics != null)
- {
- List<string> floorIds = new List<string> { };
- List<string> floorNames = new List<string> { };
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- floorIds.Add(floor.Key);
- floorNames.Add(floor.Value);
- }
-
- PickerView.Show(floorNames, (index) =>
- {
- room.FloorId = floorIds[index];
- floorRow.SetTitle(room.FloorName);
- }, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
- }
- };
+ infoFL.AddChidren(floorRow);
}
+ floorRow.SetTitle(room.FloorName);
+ floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (Config.Instance.Home.FloorDics != null)
+ {
+ List<string> floorIds = new List<string> { };
+ List<string> floorNames = new List<string> { };
+ foreach (var floor in Config.Instance.Home.FloorDics)
+ {
+ floorIds.Add(floor.Key);
+ floorNames.Add(floor.Value);
+ }
+
+ PickerView.Show(floorNames, (index) =>
+ {
+ room.FloorId = floorIds[index];
+ floorRow.SetTitle(room.FloorName);
+ }, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
+ }
+ };
+
var temperatureRow = new DeviceInfoRow(446);
temperatureRow.Init();
@@ -249,7 +250,6 @@
(selectTemp as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
};
};
-
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
@@ -297,6 +297,7 @@
(dev as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
}
}
+
var humidityRow = new DeviceInfoRow(585);
humidityRow.Init();
@@ -390,6 +391,11 @@
}
}
+ if (Config.Instance.Home.FloorDics.Count == 0 || room.IsLove)
+ {
+ temperatureRow.Y = Application.GetRealHeight(308);
+ humidityRow.Y= Application.GetRealHeight(446);
+ }
var confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
confirm.SetTitle(R.MyInternationalizationString.Confrim);
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 52ebd3b..b367168 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -76,8 +76,11 @@
};
floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
- top.topView.AddChidren(floorBtn);
- top.topView.AddChidren(selectFloorBtn);
+ if(Config.Instance.Home.FloorDics.Count>0)
+ {
+ top.topView.AddChidren(floorBtn);
+ top.topView.AddChidren(selectFloorBtn);
+ }
selectFloorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
floorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index fca2cd7..813d7c9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -244,12 +244,15 @@
public void ShowFunction(bool selectAll)
{
SelectAll = selectAll;
+
+ var devList = Common.Room.AllRoomDeviceUIList;
+
//閫夋嫨鍔熻兘--鐩存帴浠庢埧闂寸殑devicelist涓幏鍙�
- if (Common.Room.AllRoomDeviceUIList == null)
+ if (devList == null)
{
return;
}
- if (Common.Room.AllRoomDeviceUIList.Count == 0)
+ if (devList.Count == 0)
{
ShowNoFunctionTip();
}
@@ -302,7 +305,7 @@
functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
- if (deviceType == Shared.Common.Room.AllRoomDeviceUIList[0].CommonDevice.Type)
+ if (deviceType == devList[0].CommonDevice.Type)
{
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
@@ -433,8 +436,7 @@
Height = Application.GetRealHeight(200),
Width = Application.GetRealWidth(700),
Gravity = Gravity.CenterHorizontal,
- TextID = R.MyInternationalizationString.NoFunction,
- //Text = "娌℃湁鍔熻兘 \n 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�",
+ Text= Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
TextAlignment = TextAlignment.Center,
IsMoreLines = true
@@ -613,7 +615,7 @@
Height = Application.GetRealHeight(200),
Width = Application.GetRealWidth(700),
Gravity = Gravity.CenterHorizontal,
- TextID = R.MyInternationalizationString.NoScene,
+ Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
TextAlignment = TextAlignment.Center,
IsMoreLines = true
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
index 87e1f1d..368d3c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
@@ -116,15 +116,23 @@
{
return new AccountOption();
}
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
- string strValue = System.Text.Encoding.UTF8.GetString(varByte);
- var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOption>(strValue);
- //瑙ｅ瘑瀵嗙爜
- string hdlKey = "hD1(La3o";
- info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);
- info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);
+ try
+ {
+ var varByte = Shared.IO.FileUtils.ReadFile(fileName);
+ string strValue = System.Text.Encoding.UTF8.GetString(varByte);
+ var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOption>(strValue);
+ //瑙ｅ瘑瀵嗙爜
+ string hdlKey = "hD1(La3o";
+ info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);
+ info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);
- return info;
+ return info;
+ }
+ catch (Exception ex)
+ {
+ HdlLogLogic.Current.WriteLog(ex);
+ return new AccountOption();
+ }
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 9a2a54d..65e77ea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -568,6 +568,21 @@
dic["NoExist"] = R.MyInternationalizationString.uErrorAndLostOtherPatyInfo;
//鎸囧畾璐﹀彿涓嶅瓨鍦�
dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;
+
+ //淇敼瀛愬笎鍙疯繙绋嬫潈闄�
+ keys = "ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["HomeIdNoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+ //鎸囧畾璐﹀彿涓嶅瓨鍦�
+ dic["DistributedMarkNoRecord"] = R.MyInternationalizationString.uAccountNoExists;
+ //鏉冮檺涓嶈冻
+ dic["BeRestrict"] = R.MyInternationalizationString.uBeRestrict;
}
/// <summary>
@@ -586,14 +601,15 @@
}
string statuCode = revertObj.StateCode;
- HdlLogLogic.Current.WriteLog(-1, "鎺ュ彛璁块棶澶辫触锛�" + requestName + " " + statuCode + " " + revertObj.ErrorInfo == null ? string.Empty : revertObj.ErrorInfo);
- HdlLogLogic.Current.WriteLog(-1, "褰撳墠婵�娲荤殑鐣岄潰锛�" + UserCenterResourse.NowActionFormID);
+ string errorMsg = "鎺ュ彛璁块棶澶辫触锛�" + requestName + " " + statuCode + " " + revertObj.ErrorInfo == null ? string.Empty : revertObj.ErrorInfo + "\r\n";
+ errorMsg += "褰撳墠婵�娲荤殑鐣岄潰锛�" + UserCenterResourse.NowActionFormID + "\r\n";
if (pra != null)
{
//搴忓垪鍖栧璞�
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
- HdlLogLogic.Current.WriteLog(-1, "鍙傛暟锛歕r\n" + requestJson);
+ errorMsg += "鍙傛暟锛歕r\n" + requestJson;
}
+ HdlLogLogic.Current.WriteLog(-1, errorMsg);
//鍏遍�氱爜
if (statuCode == "ParameterOrEmpty")
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 4fad441..468de53 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -103,6 +103,17 @@
public string UserName = string.Empty;
}
+ /// <summary>
+ /// 鏄电О淇℃伅
+ /// </summary>
+ public class NicknameInfo
+ {
+ /// <summary>
+ /// 鏄电О
+ /// </summary>
+ public string nickname = string.Empty;
+ }
+
#endregion
#region 鈻� 鎴愬憳淇℃伅绫籣_________________________
@@ -143,6 +154,10 @@
/// AccountType
/// </summary>
public int AccountType = 0;
+ /// <summary>
+ /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+ /// </summary>
+ public bool IsAllowRemoteCtrl = false;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
new file mode 100755
index 0000000..3af1925
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
@@ -0,0 +1,128 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 宸﹀彸婊戝姩鐨勮繘搴︽潯鎺т欢
+ /// </summary>
+ public class SeekBarControl : DiyImageSeekBar
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ private uint nowProgressBarColor = 0;
+ /// <summary>
+ /// 鎺т欢鑳藉惁浣跨敤
+ /// </summary>
+ public new bool Enable
+ {
+ set
+ {
+ this.IsClickable = value;
+ if (value == true)
+ {
+ //鍘熸潵鐨勯鑹�
+ base.ProgressBarColor = nowProgressBarColor;
+ }
+ else
+ {
+ //鐏拌壊
+ base.ProgressBarColor = 0xffe8e8e8;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 杩涘害鏉￠鑹�
+ /// </summary>
+ public new uint ProgressBarColor
+ {
+ set
+ {
+ nowProgressBarColor = value;
+ base.ProgressBarColor = value;
+ }
+ }
+
+ /// <summary>
+ /// 杩涘害鍊兼敼鍙�,濡傛灉瑕佽缃垵濮嬭繘搴﹀��,姝ゅ彉閲忚鍦ㄨ缃垵濮嬭繘搴﹀�间箣鍓嶈繘琛岃缃�(绗竴涓弬鏁�0:婊戝姩鐨勬椂鍊�,1:鎵嬫寚寮硅捣鐨勬椂鍊�)
+ /// </summary>
+ public Action<int, int> ProgressChangedEvent = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 宸﹀彸婊戝姩鐨勮繘搴︽潯鎺т欢
+ /// </summary>
+ /// <param name="i_width">瀹藉害,闈炵湡瀹炲��</param>
+ public SeekBarControl(int i_width = 962)
+ {
+ this.Width = Application.GetRealWidth(i_width);
+ this.Height = Application.GetRealHeight(84);
+ this.ThumbImageHeight = Application.GetRealHeight(84);
+ this.ThumbImagePath = "Item/SeekBarIcon.png";
+ this.SeekBarViewHeight = Application.GetRealHeight(10);
+ this.SeekBarBackgroundColor = 0xfff5f5f5;
+ this.IsProgressTextShow = false;
+ this.MaxValue = 100;
+ this.Gravity = Gravity.CenterHorizontal;
+
+ //杩涘害鏉″�兼敼鍙樹簨浠�
+ this.OnProgressChangedEvent += this.MyProgressChangedEvent;
+ //鎵嬫寚寮硅捣浜嬩欢
+ this.OnStopTrackingTouchEvent += this.MyStopTrackingTouchEvent;
+ }
+
+ #endregion
+
+ #region 鈻� 浜嬩欢_______________________________
+
+ /// <summary>
+ /// 杩涘害鏉″�兼敼鍙樹簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="value"></param>
+ private void MyProgressChangedEvent(object sender, int value)
+ {
+ if (this.ProgressChangedEvent == null)
+ {
+ this.OnProgressChangedEvent -= this.MyProgressChangedEvent;
+ return;
+ }
+ this.ProgressChangedEvent(0, value);
+ }
+
+ /// <summary>
+ /// 鎵嬫寚寮硅捣浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="value"></param>
+ private void MyStopTrackingTouchEvent(object sender, int value)
+ {
+ if (this.ProgressChangedEvent == null)
+ {
+ this.OnStopTrackingTouchEvent -= this.MyStopTrackingTouchEvent;
+ return;
+ }
+ this.ProgressChangedEvent(1, value);
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鎺т欢鎽ф瘉
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ this.ProgressChangedEvent = null;
+ base.RemoveFromParent();
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
index f14a19a..ff87091 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
@@ -46,7 +46,7 @@
public MostRightIconControl(int i_width, int i_height)
{
this.Width = Application.GetMinRealAverage(110);
- this.Height = ControlCommonResourse.ListViewRowHeight;
+ this.Height = this.Parent != null ? this.Parent.Height : ControlCommonResourse.ListViewRowHeight;
this.Gravity = Gravity.CenterVertical;
var XX = Application.CurrentWidth - Application.GetMinRealAverage(i_width) - ControlCommonResourse.XXLeft;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
index a3a4704..cb8e6e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
@@ -63,7 +63,7 @@
frameBack.AddChidren(listView);
//璇烽�夋嫨鍖哄彿
- var btnTitle = new NormalViewControl(230, 60, true);
+ var btnTitle = new NormalViewControl(270, 60, true);
btnTitle.X = ControlCommonResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(69);
btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectAreaCode;
@@ -77,12 +77,6 @@
btnSearch.Y = Application.GetRealHeight(46);
frameBack.AddChidren(btnSearch);
btnSearch.BindEvent(this.SearchEvent);
-
- HdlThreadLogic.Current.RunThread(() =>
- {
- //鍒濆鍖栧湴鍖哄垪琛�
- this.InitAreaList();
- });
//璁╄繖涓寜閽繖涓尯鍩熶笉鑳界偣鍑昏彍鍗�
var frameTemp = new FrameLayout();
@@ -102,6 +96,12 @@
}
this.CloseForm();
};
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍒濆鍖栧湴鍖哄垪琛�
+ this.InitAreaList();
+ });
}
#endregion
@@ -302,7 +302,7 @@
this.Height = Application.GetRealHeight(104);
this.Radius = (uint)Application.GetRealHeight(17);
this.BorderColor = 0xffbfc1c2;
- this.BorderWidth = (uint)Application.GetMinRealAverage(3);
+ this.BorderWidth = 1;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index cafdac5..0788c92 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -577,13 +577,27 @@
{
try
{
- //鍒犻櫎鏈湴鍏ㄩ儴Log
- Global.CreateEmptyDirectory(Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory), true);
+ var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);
+ if (listAllFile.Count > 10)
+ {
+ listAllFile.Sort();
+ while (listAllFile.Count >= 10)
+ {
+ System.IO.File.Delete(listAllFile[0]);
+ listAllFile.RemoveAt(0);
+ }
+ }
}
catch { }
}
ProgressFormBar.Current.Close();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "Log涓婁紶鎴愬姛");
+ contr.Show();
+ });
+
return result;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index 9e23559..de95fbe 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -122,63 +122,18 @@
foreach (var data in result.addedDeviceBindResponseData.BindList)
{
string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
- //0:娣诲姞鎴愬姛 3:宸茬粡瀛樺湪锛屼篃鍙互浠ｈ〃鎴愬姛
- if (data.Result == 0 || data.Result == 3)
+ if (dicDevice.ContainsKey(mainkeys) == true)
{
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- listSuccess.Add(dicDevice[mainkeys]);
- }
- }
- //1锛氬け璐ワ紝鑺傜偣璁惧鎴栧満鏅笉瀛樺湪
- else if (data.Result == 1)
- {
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- }
- //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 2)
- {
- if (result.addBindResultResponseData == null)
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- else
- {
- //娣诲姞鎴愬姛
- if (result.addBindResultResponseData.Result == 0)
- {
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- listSuccess.Add(dicDevice[mainkeys]);
- }
- }
- //璁惧鍚嶇О 缁戝畾鍒楄〃宸叉弧
- else if (result.addBindResultResponseData.Result == 140)
- {
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.uBindListIsFull);
- this.ShowTipMsg(msg);
- }
- else
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- }
+ listSuccess.Add(dicDevice[mainkeys]);
}
}
+ if (listSuccess.Count == 0)
+ {
+ //缁戝畾鐩爣璁剧疆澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail);
+ this.ShowTipMsg(msg);
+ }
return listSuccess;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
index dee93fc..d6127f8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
@@ -320,12 +320,13 @@
/// </summary>
/// <param name="realGateway">鐪熷疄鐗╃悊缃戝叧瀵硅薄</param>
/// <param name="backupId">澶囦唤涓婚敭</param>
- public bool RecoverGateway(ZbGateway realGateway, string backupId)
+ /// <param name="isAutoBack">0:鑾峰彇缃戝叧鎵嬪姩澶囦唤鏂囦欢鍒楄〃 1:鑾峰彇缃戝叧鑷姩澶囦唤鏂囦欢鍒楄〃</param>
+ public bool RecoverGateway(ZbGateway realGateway, string backupId, int isAutoBack)
{
//灞曞紑杩涘害鏉�
ProgressFormBar.Current.Start();
//浠庝簯绔幏鍙栧浠芥枃浠跺垪琛�
- var result = this.GetGatewayFileList(realGateway, backupId);
+ var result = this.GetGatewayFileList(realGateway, backupId, isAutoBack);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -334,7 +335,7 @@
}
//浠庝簯绔笅杞藉浠芥枃浠�
- result = this.DownloadGatewayFile(realGateway, backupId);
+ result = this.DownloadGatewayFile(realGateway, backupId, isAutoBack);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -377,7 +378,7 @@
/// <param name="realGateway"></param>
/// <param name="backupClassId"></param>
/// <returns></returns>
- private bool GetGatewayFileList(ZbGateway realGateway, string backupClassId)
+ private bool GetGatewayFileList(ZbGateway realGateway, string backupClassId, int isAutoBack)
{
//姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileListGetting));
@@ -419,7 +420,7 @@
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 6202 } };
var data = new Newtonsoft.Json.Linq.JObject {
{ "url", fullUrl }, { "RequestVersion", Common.CommonPage.RequestVersion },
- { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", 0 },
+ { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", isAutoBack },
{ "BackupClassId", backupClassId },{ "GatewayUniqueId",HdlGatewayLogic.Current.GetGatewayId(realGateway)},
{ "IsOtherAccountCtrl",connectMode == HttpConnectMode.Admin?1:0}
};
@@ -457,7 +458,7 @@
/// <param name="realGateway"></param>
/// <param name="backupClassId"></param>
/// <returns></returns>
- private bool DownloadGatewayFile(ZbGateway realGateway, string backupClassId)
+ private bool DownloadGatewayFile(ZbGateway realGateway, string backupClassId, int isAutoBack)
{
//姝ｅ湪涓嬭浇澶囦唤鏂囦欢
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileDownloading));
@@ -517,7 +518,7 @@
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 6203 } };
var data = new Newtonsoft.Json.Linq.JObject {
{ "url", fullUrl }, { "RequestVersion", Common.CommonPage.RequestVersion },
- { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", 0 },
+ { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", isAutoBack },
{ "BackupClassId", backupClassId },{ "GatewayUniqueId",HdlGatewayLogic.Current.GetGatewayId(realGateway)},
{ "IsOtherAccountCtrl",connectMode == HttpConnectMode.Admin?1:0}
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 0993102..023fb10 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -178,10 +178,18 @@
/// <returns></returns>
private ZbGateway GetGatewayFromFile(string file)
{
- byte[] filebyte = Global.ReadFileByHomeId(file);
- string strvalue = System.Text.Encoding.UTF8.GetString(filebyte);
- var gateway = JsonConvert.DeserializeObject<ZbGateway>(strvalue);
- return gateway;
+ try
+ {
+ byte[] filebyte = Global.ReadFileByHomeId(file);
+ string strvalue = System.Text.Encoding.UTF8.GetString(filebyte);
+ var gateway = JsonConvert.DeserializeObject<ZbGateway>(strvalue);
+ return gateway;
+ }
+ catch (Exception ex)
+ {
+ HdlLogLogic.Current.WriteLog(ex);
+ return null;
+ }
}
#endregion
@@ -212,11 +220,13 @@
}
return false;
}
- if (result != 1)
+ if (result == -1)
{
return false;
}
- return true;
+ //璁剧疆缃戝叧鐨勭粡绾害
+ bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
+ return falge;
}
/// <summary>
@@ -422,6 +432,12 @@
//閿欒:缃戝叧瀵硅薄涓㈠け
string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
this.ShowTipMsg(msg);
+ return -1;
+ }
+ //璁剧疆缃戝叧鐨勭粡绾害
+ bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
+ if (falge == false)
+ {
return -1;
}
@@ -1832,7 +1848,15 @@
return;
}
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 85 } };
- realWay.Send("GwLinuxLocate_Respon", jObject.ToString());
+ if (this.IsGatewayExist(zbGateway) == true)
+ {
+ realWay.Send("GwLinuxLocate_Respon", jObject.ToString());
+ }
+ else
+ {
+ //濡傛灉杩欎釜缃戝叧杩樻病鏈夌粦瀹氱殑璇濓紝鍒欏己鍒朵娇鐢ㄦ湰鍦拌繛鎺�
+ realWay.SendLocation("GwLinuxLocate_Respon", System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
+ }
}
#endregion
@@ -2205,7 +2229,15 @@
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 2013 } };
var data = new Newtonsoft.Json.Linq.JObject { { "Longitude", intLongitude }, { "Latitude", intLatitude } };
jObject.Add("Data", data);
- realWay.Send("Logic/SetSite", jObject.ToString());
+ if (this.IsGatewayExist(gateway) == true)
+ {
+ realWay.Send("Logic/SetSite", jObject.ToString());
+ }
+ else
+ {
+ //濡傛灉杩欎釜缃戝叧杩樻病鏈夌粦瀹氱殑璇濓紝鍒欏己鍒朵娇鐢ㄦ湰鍦拌繛鎺�
+ realWay.SendLocation("Logic/SetSite", System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
+ }
int TimeOut = 0;
while (result == -1 && TimeOut < 30)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 6993d9f..51ed3a9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -502,8 +502,7 @@
{
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
- HdlLogLogic.Current.WriteLog(-1, msg);
- HdlLogLogic.Current.WriteLog(ex);
+ HdlLogLogic.Current.WriteLog(ex, msg);
}
}
});
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index f1b5642..c3c9468 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -43,10 +43,12 @@
/// Log鍑哄姏
/// </summary>
/// <param name="ex"></param>
- public void WriteLog(Exception ex)
+ /// <param name="appendMsg">闄勫姞娑堟伅</param>
+ public void WriteLog(Exception ex, string appendMsg = "")
{
//Log鍑哄姏
- string msg = ex.Message + "\r\n";
+ string msg = appendMsg == "" ? string.Empty : appendMsg + "\r\n";
+ msg += ex.Message + "\r\n";
msg += ex.StackTrace;
this.WriteLog(-1, msg);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
index 42ad680..6efd7dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
@@ -60,8 +60,7 @@
}
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
- HdlLogLogic.Current.WriteLog(-1, msg);
- HdlLogLogic.Current.WriteLog(ex);
+ HdlLogLogic.Current.WriteLog(ex, msg);
}
})
{ IsBackground = true }.Start();
@@ -93,8 +92,7 @@
}
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
- HdlLogLogic.Current.WriteLog(-1, msg);
- HdlLogLogic.Current.WriteLog(ex);
+ HdlLogLogic.Current.WriteLog(ex, msg);
}
});
@@ -127,8 +125,7 @@
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
- HdlLogLogic.Current.WriteLog(-1, msg);
- HdlLogLogic.Current.WriteLog(ex);
+ HdlLogLogic.Current.WriteLog(ex, msg);
}
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
old mode 100644
new mode 100755
index d34f704..1052a4c
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -54,12 +54,12 @@
public string SSID
{
get
- {
+ {
#if iOS
- string ssiD = Shared.WiimuUPnP.SSID;
- if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
- {
- ssiD = ssiD.Substring(1, ssiD.Length - 2);
+ string ssiD = Shared.WiimuUPnP.SSID;
+ if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
+ {
+ ssiD = ssiD.Substring(1, ssiD.Length - 2);
}
return ssiD;
#endif
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 41f14f5..eaaeb52 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -345,7 +345,6 @@
var formTemp = UserCenterResourse.DicActionForm[formName];
formTemp.CloseForm();
UserCenterResourse.DicActionForm.Remove(formName);
- formTemp = null;
return true;
}
@@ -466,9 +465,7 @@
//绉婚櫎ID
UserCenterResourse.listActionFormId.Remove(UserCenterResourse.DicActionForm[formName].FormID);
//绉婚櫎鐢婚潰
- var formTemp = UserCenterResourse.DicActionForm[formName];
UserCenterResourse.DicActionForm.Remove(formName);
- formTemp = null;
}
}
@@ -807,6 +804,8 @@
{
//APP缂撳瓨鍔犺浇寮�濮�
UserCenterResourse.Option.AppCanSignout = false;
+ //杩樺師杩滅▼杩炴帴鍙橀噺
+ ZigBee.Device.ZbGateway.AllowRemoteCtrl = true;
//鍙湁鍦ㄤ綇瀹匢D涓嶄竴鏍风殑鏃跺�欐墠鍋氳繖涓搷浣�
if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
index b61a0b0..bdfa99d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
@@ -20,6 +20,10 @@
/// 鎺т欢淇℃伅
/// </summary>
private Dictionary<string, RowControlInfo> dicControl = new Dictionary<string, RowControlInfo>();
+ /// <summary>
+ /// 婵�娲荤殑璁惧鍦板潃
+ /// </summary>
+ private string actionDeviceKeys = null;
#endregion
@@ -114,6 +118,7 @@
btnDeviceName.X = Application.GetRealWidth(193);
btnDeviceName.Y = Application.GetRealHeight(45);
frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
+ rowInfo.btnDeviceName = btnDeviceName;
//鎴块棿
var btnRoom = new NormalViewControl(400, 50, true);
btnRoom.X = btnDeviceName.X;
@@ -122,6 +127,7 @@
btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
+ rowInfo.btnRoom = btnRoom;
//鎽勬皬搴�
var btnValue = new NormalViewControl(300, 60, true);
btnValue.Y = Application.GetRealHeight(58);
@@ -183,6 +189,8 @@
frameTable.ButtonClickEvent += (sender, e) =>
{
+ this.actionDeviceKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+
var form = new IndoorUnitSettionForm();
form.AddForm(device);
};
@@ -308,6 +316,31 @@
#endregion
+ #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+
+ /// <summary>
+ /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
+ /// </summary>
+ public override int FormActionAgainEvent()
+ {
+ if (this.actionDeviceKeys != null && dicControl.ContainsKey(this.actionDeviceKeys) == true)
+ {
+ //鍒锋柊璁惧淇℃伅
+ var device = Common.LocalDevice.Current.GetDevice(this.actionDeviceKeys);
+ if (device != null)
+ {
+ var contr = dicControl[this.actionDeviceKeys];
+ contr.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ contr.btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
+ }
+ }
+ this.actionDeviceKeys = null;
+
+ return 1;
+ }
+
+ #endregion
+
#region 鈻� 缁撴瀯浣揰____________________________
/// <summary>
@@ -316,6 +349,14 @@
private class RowControlInfo
{
/// <summary>
+ /// 璁惧鍚嶅瓧
+ /// </summary>
+ public NormalViewControl btnDeviceName = null;
+ /// <summary>
+ /// 璁惧鎴块棿
+ /// </summary>
+ public NormalViewControl btnRoom = null;
+ /// <summary>
/// 璁惧鍥炬爣鑳屾櫙
/// </summary>
public FrameLayout btnIconBack = null;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index 3fed027..ef62d30 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -105,6 +105,12 @@
Gravity = Gravity.CenterVertical,
};
btnAddFrameLayout.AddChidren(btnBindDown);
+
+ if (Common.Config.Instance.Home.FloorDics.Count == 0)
+ {
+ btnBindDown.Visible = false;
+ }
+
btnBindDown.MouseDownEventHandler += (sender, e) =>
{
SideslipFramelayout();
@@ -165,19 +171,34 @@
dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
- // 鑾峰彇妤煎眰瀵瑰簲瀵规埧闂�
- foreach (var room in Shared.Common.Room.Lists)
+
+ if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
- if (room.FloorId == currentKey.currentSelectFloorId)
+ // 鑾峰彇娌℃湁妤煎眰鎴块棿
+ foreach (var room in Shared.Common.Room.Lists)
{
- roomList.Add(room);
+ if (string.IsNullOrEmpty(room.FloorId))
+ {
+ roomList.Add(room);
+ }
+ }
+ }
+ else
+ {
+ // 鑾峰彇妤煎眰瀵瑰簲瀵规埧闂�
+ foreach (var room in Shared.Common.Room.Lists)
+ {
+ if (room.FloorId == currentKey.currentSelectFloorId)
+ {
+ roomList.Add(room);
+ }
}
}
//棣栨鎷垮埌鎵�鏈夋埧闂翠腑鎸夐敭鐨勭洰鏍囧苟瀛樺偍
GetALlDispalyRoomDeviceList();
if (currentKeyAllRoomDeviceList.Count != 0)
{
- if (currentKey.bindList != null && currentKey.bindList.Count != 0)
+ if (currentKey.bindList.Count != 0)
{
foreach (var devA in currentKeyAllRoomDeviceList)
{
@@ -220,9 +241,23 @@
btnChooseKeyMode.Enable = true;
btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
-
+ if (targetList.Count == 0)
+ {
+ btnChooseKeyMode.Enable = false;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnChooseKeyMode.Enable = true;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
btnChooseKeyMode.MouseUpEventHandler += (sender, e) =>
{
+ if (targetList.Count == 0)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnChooseKeyMode);
+ return;
+ }
this.RemoveFromParent();
var chooseKeyModePage = new Shared.Phone.UserCenter.DeviceBind.ChooseKeyModePage(currentKey, curDeviceBindType, targetList);
@@ -275,12 +310,11 @@
var btnRoomFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(78),
- Width = Application.GetRealWidth(187),
- Y = Application.GetRealHeight(58),
- X = Application.GetRealWidth(58),
- Radius = (uint)Application.GetMinRealAverage(78 / 2),
- BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange,
+ Height = Application.GetRealHeight(159),
+ Width = Application.GetRealWidth(255),
+ Y = Application.GetRealHeight(23),
+ X = Application.GetRealWidth(5),
+ BackgroundImagePath = "Item/RoomIconBackground.png",
BorderWidth = 1,
};
btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayout);
@@ -301,9 +335,7 @@
btnRoom.IsSelected = false;
if (index == 0)
{
- btnRoom.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- btnRoomFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- btnRoomFrameLayout.BorderWidth = 0;
+ btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
curentOldRoom = btnRoom;
curentOldRoomFrameLayout = btnRoomFrameLayout;
@@ -315,24 +347,9 @@
if (curentOldRoom != null)
{
curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
- curentOldRoom.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
}
curentOldRoom = btnRoom;
curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
- curentOldRoom.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- curRoom = room;
- currentKey.RoomId = room.Id;
- RefreshDeviceList(curRoom);
- if (curTypeDeviceList.Count == 0)
- {
- btnChooseKeyMode.Enable = false;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
- }
- else
- {
- btnChooseKeyMode.Enable = true;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- }
}
if (btnRoomFrameLayout.BorderWidth == 1)
@@ -340,35 +357,39 @@
if (curentOldRoomFrameLayout != null)
{
curentOldRoomFrameLayout.BorderWidth = 1;
- curentOldRoomFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
+ curentOldRoomFrameLayout.BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange;
+ curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackground.png";
}
curentOldRoomFrameLayout = btnRoomFrameLayout;
curentOldRoomFrameLayout.BorderWidth = 0;
- curentOldRoomFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- curRoom = room;
- currentKey.RoomId = room.Id;
- RefreshDeviceList(curRoom);
- if (curTypeDeviceList.Count == 0)
- {
- btnChooseKeyMode.Enable = false;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
- }
- else
- {
- btnChooseKeyMode.Enable = true;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- }
+ curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+ }
+ curRoom = room;
+ currentKey.RoomId = room.Id;
+ RefreshDeviceList(curRoom);
+ if (curTypeDeviceList.Count == 0)
+ {
+ btnChooseKeyMode.Enable = false;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnChooseKeyMode.Enable = true;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
+ if (targetList.Count == 0)
+ {
+ btnChooseKeyMode.Enable = false;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnChooseKeyMode.Enable = true;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
};
btnRoom.MouseUpEventHandler += eHandlerRoom;
btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
-
- var btnEmpty = new Button
- {
- Width = Application.GetRealWidth(58),
- X = btnRoom.Right,
- };
- btnHorizontalScrolViewLayout.AddChidren(btnEmpty);
index++;
}
BindInfo.FinishDisplay(roomTempList, btnChooseKeyMode);
@@ -384,10 +405,6 @@
case "AddSwitch":
foreach (var r in Shared.Common.Room.Lists)
{
- if (r.IsLove == true)
- {
- var aa = 0; ;
- }
if (r.DeviceUIList.Count == 0)
{
continue;
@@ -556,7 +573,6 @@
X = Application.GetRealWidth(861 + 81),
Y = Application.GetRealHeight(35),
SelectedImagePath = "DoorLock/SelectedIcon.png",
- //Text = device.CommonDevice?.DeviceEpointName,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
Visible = false,
Tag = device.CommonDevice?.DeviceEpointName,
@@ -591,7 +607,7 @@
}
else
{
- if (targetList.Count > 9)
+ if (targetList.Count > 7)
{
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
}
@@ -601,6 +617,16 @@
btnChoose.IsSelected = true;
btnChoose.Visible = true;
}
+ }
+ if (targetList.Count == 0)
+ {
+ btnChooseKeyMode.Enable = false;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnChooseKeyMode.Enable = true;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
};
rowLayout.MouseUpEventHandler += hander;
@@ -628,7 +654,16 @@
curIndex++;
}
- //IsInitEntry = false;
+ if (targetList.Count == 0)
+ {
+ btnChooseKeyMode.Enable = false;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnChooseKeyMode.Enable = true;
+ btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
}
// 渚ц竟瀵艰埅鏍�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
index e6e56e9..15f40b7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -20,7 +20,6 @@
{
Shared.Application.RunOnMainThread(() =>
{
- //var dev = common as Panel;
});
}
@@ -40,15 +39,18 @@
/// <summary>
/// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
/// </summary>
- List<CommonDevice> targetList = new List<CommonDevice>();
- List<Room> roomList = new List<Room>();
+ List<CommonDevice> targetList = new List<CommonDevice>();//涓存椂鐩爣鍒楄〃
+ List<Room> roomList = new List<Room>();//鏈湴鎴块棿鍒楄〃
public Action<List<BindListResponseObj>> action;
Button btnFinifh;
Button btnFloorText;
- Dictionary<string, string> dicFloor;
-
+ Dictionary<string, string> dicFloor;//妤煎眰鍒楄〃
+ List<SceneUI> currentKeyAllRoomSceneList = new List<SceneUI>();
#endregion
+ /// <summary>
+ /// 娣诲姞鍦烘櫙椤垫樉绀�
+ /// </summary>
public void Show()
{
this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.AddScene));
@@ -144,17 +146,54 @@
dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
- // 鑾峰彇妤煎眰瀵瑰簲瀵规埧闂�
- foreach (var room in Shared.Common.Room.Lists)
+
+ if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
- if (room.FloorId == currentKey.currentSelectFloorId)
+ // 鑾峰彇娌℃湁妤煎眰鎴块棿
+ foreach (var room in Shared.Common.Room.Lists)
{
- roomList.Add(room);
+ if (string.IsNullOrEmpty(room.FloorId))
+ {
+ roomList.Add(room);
+ }
}
}
+ else
+ {
+ // 鑾峰彇妤煎眰瀵瑰簲瀵规埧闂�
+ foreach (var room in Shared.Common.Room.Lists)
+ {
+ if (room.FloorId == currentKey.currentSelectFloorId)
+ {
+ roomList.Add(room);
+ }
+ }
+ }
+ if (roomList.Count == 0)
+ {
+ return;
+ }
+ //棣栨鎷垮埌鎵�鏈夋埧闂翠腑鎸夐敭鐨勭洰鏍囧苟瀛樺偍
+ GetALlDispalyRoomSceneList();
+
+ if (currentKeyAllRoomSceneList.Count != 0)
+ {
+ if (currentKey.bindList.Count != 0)
+ {
+ foreach (var scTemp in currentKeyAllRoomSceneList)
+ {
+ var sc = currentKey.bindList.Find(obj => (obj != null) && (obj.BindScenesId == scTemp.Id));
+ if (sc != null)
+ {
+ targetList.Add(scTemp);
+ }
+ }
+ }
+ }
+
Shared.Common.Room curRoom = roomList[0];
int index = 0;
- RefreshRoomList(curRoom, btnFinifh, ref index);
+ RefreshRoomList(curRoom, ref index);
RefreshSceneList(roomList[index]);
if (curRoom.SceneUIList.Count == 0)
@@ -167,14 +206,34 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
-
+ if (targetList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
btnFinifh.MouseUpEventHandler += async (sender, e) =>
{
bool isFinish = false;
- btnFinifh.Enable = false;
- btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
try
{
+ if (targetList.Count == 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ var myTip = new Tip();
+ myTip.Direction = AMPopTipDirection.None;
+ myTip.CloseTime = 2;
+ myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
+ myTip.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
+
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
if (currentKey.bindList.Count != 0)
{
@@ -188,7 +247,6 @@
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
CommonPage.Loading.Hide();
});
- this.RemoveFromParent();
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
return;
@@ -202,17 +260,36 @@
{
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
var myTip = new Tip();
myTip.Direction = AMPopTipDirection.None;
myTip.CloseTime = 2;
myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
myTip.Show(Common.CommonPage.Instance);
});
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
}
}
var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Scene_Trigger);
- if (temp.setWritableValueResponData?.Status != 0)
+ if (temp == null || temp.setWritableValueResponData == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ var myTip = new Tip();
+ myTip.Direction = AMPopTipDirection.None;
+ myTip.CloseTime = 2;
+ myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ myTip.Show(Common.CommonPage.Instance);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
+ if (temp.setWritableValueResponData.Status != 0)
{
Application.RunOnMainThread(() =>
{
@@ -221,10 +298,10 @@
myTip.CloseTime = 2;
myTip.Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode);
myTip.Show(Common.CommonPage.Instance);
- //new Tip() { Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(btnFinifh);
- btnFinifh.Enable = true;
- btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
});
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
return;
}
else
@@ -233,7 +310,6 @@
var addBindeDev = new AddBindData();
addBindeDev.DeviceAddr = currentKey.DeviceAddr;
addBindeDev.Epoint = currentKey.DeviceEpoint;
-
foreach (var de in targetList)
{
if (de.DeviceAddr != null)
@@ -258,112 +334,81 @@
var dev = new AddedDeviceBindResponseAllData();
dev = await currentKey.AddDeviceBindAsync(addBindeDev);
- foreach (var ab in dev.addedDeviceBindResponseData?.BindList)
+ if (dev.addedDeviceBindResponseData == null)
{
- switch (ab.Result)
+ Application.RunOnMainThread(() =>
{
- case 0:
- currentKey.bindList.Add((BindListResponseObj)ab);
-
- for (int i = 0; i < targetList.Count; i++)
+ CommonPage.Loading.Hide();
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
+ else
+ {
+ if (dev.addedDeviceBindResponseData.Result == 0)
+ {
+ currentKey.bindList = dev.addedDeviceBindResponseData.BindList;
+ targetList.Clear();
+ isFinish = true;
+ if (isFinish)
+ {
+ if (action != null)
{
- var de = targetList[i];
- var sc1 = new SceneUI();
- if (de.DeviceAddr == null)
- {
- sc1 = (SceneUI)de;
-
- if (sc1.Id == ab.BindScenesId)
- {
- targetList.RemoveAt(i);
- i--;
- }
- }
+ action(currentKey.bindList);
}
- isFinish = true;
- break;
- case 1:
- Application.RunOnMainThread(() =>
+ this.RemoveFromParent();
+ }
+ else
+ {
+ this.RemoveFromParent();
+ }
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ });
+ }
+ else if (dev.addedDeviceBindResponseData.Result == 1)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip()
{
- new Tip()
- {
- MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindErrorAbsence),
- Direction = AMPopTipDirection.Up,
- CloseTime = 1
- }.Show(btnFinifh);
- });
- break;
- case 2:
- switch (dev.addBindResultResponseData?.Result)
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
+ Direction = AMPopTipDirection.Up,
+ CloseTime = 1
+ }.Show(btnFinifh);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip()
{
- case 0:
- currentKey.bindList.Add((BindListResponseObj)ab);
- for (int i = 0; i < targetList.Count; i++)
- {
- var de = targetList[i];
- if (de.DeviceAddr == ab.BindMacAddr && de.DeviceEpoint == ab.BindEpoint)
- {
- targetList.RemoveAt(i);
- i--;
- }
- }
- isFinish = true;
- break;
- case 140:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- default:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- }
- break;
- case 3:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindErrorExisted), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- case 4:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- default:
- break;
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
+ Direction = AMPopTipDirection.Up,
+ CloseTime = 1
+ }.Show(btnFinifh);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
}
}
}
}
catch { }
- finally
- {
- if (isFinish)
- {
- if (action != null)
- {
- action(currentKey.bindList);
- }
- this.RemoveFromParent();
- }
- else
- {
- this.RemoveFromParent();
- }
- Application.RunOnMainThread(() =>
- {
- CommonPage.Loading.Hide();
- btnFinifh.Enable = true;
- btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- });
- }
};
#endregion
}
@@ -373,7 +418,7 @@
/// </summary>
/// <param name="gateway">Gateway.</param>
/// <param name="key">Key.</param>
- void RefreshRoomList(Shared.Common.Room curRoom, Button btnChooseKeyMode, ref int index2)
+ void RefreshRoomList(Shared.Common.Room curRoom, ref int index2)
{
if (roomList.Count == 0)
{
@@ -410,12 +455,11 @@
var btnRoomFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(78),
- Width = Application.GetRealWidth(187),
- Y = Application.GetRealHeight(58),
- X = Application.GetRealWidth(58),
- Radius = (uint)Application.GetMinRealAverage(78 / 2),
- BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange,
+ Height = Application.GetRealHeight(159),
+ Width = Application.GetRealWidth(255),
+ Y = Application.GetRealHeight(23),
+ X = Application.GetRealWidth(5),
+ BackgroundImagePath = "Item/RoomIconBackground.png",
BorderWidth = 1,
};
btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayout);
@@ -436,9 +480,7 @@
btnRoom.IsSelected = false;
if (index == 0)
{
- btnRoom.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- btnRoomFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- btnRoomFrameLayout.BorderWidth = 0;
+ btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
curentOldRoom = btnRoom;
curentOldRoomFrameLayout = btnRoomFrameLayout;
@@ -450,75 +492,63 @@
if (curentOldRoom != null)
{
curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
- curentOldRoom.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
}
curentOldRoom = btnRoom;
curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
- curentOldRoom.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- curRoom = room;
- currentKey.RoomId = room.Id;
- RefreshSceneList(curRoom);
- if (curRoom.SceneUIList.Count == 0)
- {
- btnChooseKeyMode.Enable = false;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
- }
- else
- {
- btnChooseKeyMode.Enable = true;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- }
}
-
if (btnRoomFrameLayout.BorderWidth == 1)
{
if (curentOldRoomFrameLayout != null)
{
curentOldRoomFrameLayout.BorderWidth = 1;
- curentOldRoomFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
+ curentOldRoomFrameLayout.BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange;
+ curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackground.png";
}
curentOldRoomFrameLayout = btnRoomFrameLayout;
curentOldRoomFrameLayout.BorderWidth = 0;
- curentOldRoomFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- curRoom = room;
- currentKey.RoomId = room.Id;
- RefreshSceneList(curRoom);
- if (curRoom.SceneUIList.Count == 0)
- {
- btnChooseKeyMode.Enable = false;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
- }
- else
- {
- btnChooseKeyMode.Enable = true;
- btnChooseKeyMode.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- }
+ curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
}
+ curRoom = room;
+ currentKey.RoomId = room.Id;
+ if (curRoom.SceneUIList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
+ if (targetList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
+ RefreshSceneList(curRoom);
+
};
btnRoom.MouseUpEventHandler += eHandlerRoom;
btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
-
- var btnEmpty = new Button
- {
- Width = Application.GetRealWidth(58),
- X = btnRoom.Right,
- };
- btnHorizontalScrolViewLayout.AddChidren(btnEmpty);
index++;
}
- BindInfo.FinishDisplay(roomTempList, btnChooseKeyMode);
+ BindInfo.FinishDisplay(roomTempList, btnFinifh);
RefreshSceneList(curRoom);
}
//鎸夐敭缁戝畾鍦烘櫙琛ㄦ樉绀�
void RefreshSceneList(Shared.Common.Room curRoom)
{
+ midVerticalScrolViewLayout.RemoveAll();
if (curRoom.SceneUIList.Count == 0)
{
return;
}
- midVerticalScrolViewLayout.RemoveAll();
-
Button oldScene = null;
int curIndex = 0;
foreach (var scene in curRoom.SceneUIList)
@@ -586,15 +616,30 @@
{
btnBindName.Text = scene.Name;
}
-
- foreach (var bindedSc in currentKey.bindList)
+ if (targetList.Count == 0)
{
- if (scene.Id == bindedSc.BindScenesId)
+ foreach (var bindedSc in currentKey.bindList)
{
- btnChoose.IsSelected = true;
- btnChoose.Visible = true;
- oldScene = btnChoose;
- targetList.Add(scene);
+ if (scene.Id == bindedSc.BindScenesId)
+ {
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ oldScene = btnChoose;
+ targetList.Add(scene);
+ }
+ }
+ }
+ else
+ {
+ foreach (var bindedSc in targetList)
+ {
+ var sc1 = (SceneUI)bindedSc;
+ if (scene.Id == sc1.Id)
+ {
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ oldScene = btnChoose;
+ }
}
}
@@ -621,7 +666,6 @@
{
oldScene.IsSelected = false;
oldScene.Visible = false;
- targetList.Clear();
}
oldScene = btnChoose;
oldScene.IsSelected = true;
@@ -630,12 +674,32 @@
targetList.Clear();
targetList.Add(scene);
}
+ if (targetList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
};
rowLayout.MouseUpEventHandler += hander;
devicePic.MouseUpEventHandler += hander;
btnBindName.MouseUpEventHandler += hander;
btnChoose.MouseUpEventHandler += hander;
curIndex++;
+ }
+ if (targetList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
}
@@ -735,7 +799,6 @@
currentKey.currentSelectFloorId = curFloorId;
btnFloorText.Text = dicFloor[floorId];
roomList.Clear();
-
if (!btnMethodText.IsSelected)
{
if (oldbutton != null)
@@ -772,9 +835,18 @@
roomList.Add(curRoom);
}
int index = 0;
- RefreshRoomList(curRoom, btnFinifh, ref index);
+ RefreshRoomList(curRoom, ref index);
RefreshSceneList(roomList[0]);
-
+ if (targetList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
dialog.Close();
};
btnAllMethod.MouseUpEventHandler += hander;
@@ -783,6 +855,32 @@
}
}
+ //褰撳墠鎸夐敭鎵�鏈夋樉绀烘埧闂寸殑鎵�鏈夊満鏅鐞�
+ List<SceneUI> GetALlDispalyRoomSceneList()
+ {
+ currentKeyAllRoomSceneList.Clear();
+ // 鑾峰彇鎵�鏈夋埧闂�
+ foreach (var room in Shared.Common.Room.Lists)
+ {
+ //濡傛灉鎴块棿涓哄枩鐖憋紝鍒欎笉鏄剧ず
+ if (room.IsLove == true)
+ {
+ continue;
+ }
+ //濡傛灉鎴块棿涓病鏈夊満鏅紝鍒欎笉鏄剧ず
+ if (room.SceneUIList.Count == 0)
+ {
+ continue;
+ }
+
+ foreach (var scene in room.SceneUIList)
+ {
+ currentKeyAllRoomSceneList.Add(scene);
+ }
+ }
+ return currentKeyAllRoomSceneList;
+ }
+
public void DeviceInfoChange(CommonDevice common, string typeTag)
{
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index a804ced..c77cf96 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -231,7 +231,7 @@
/// <returns></returns>
public static string GetCurrentSelectFloorId()
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();//
foreach (var floorId in dicFloor.Keys)
{
//绗竴涓ゼ灞�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index c6c03c8..bc46f31 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -43,6 +43,7 @@
Action<List<BindListResponseObj>> devicBindAction;//璁惧琚粦瀹氶�氱煡
private System.Collections.Generic.List<CommonDevice> localDeviceList = new System.Collections.Generic.List<CommonDevice>();//鏈湴璁惧鍒楄〃
private System.Collections.Generic.List<SceneUI> scList = new System.Collections.Generic.List<SceneUI> { };//鏈湴鍦烘櫙鍒楄〃
+ FrameLayout blankFrameLayout;//绌烘暟鎹樉绀哄竷灞�
#endregion
//鍒濆鍖栨寜閿暟鎹�
@@ -255,6 +256,7 @@
}
else
{
+ currentKey.panelMode = 65535;
SideslipFramelayout();
}
};
@@ -262,40 +264,15 @@
btnAddFrameLayout.MouseDownEventHandler += eHandlerAdd;
#endregion
CommonPage.Loading.Start("");
+ middleFrameLayout();
InitListInfo();
}
-
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
void middleFrameLayout()
- {
- topFrameLayout = new FrameLayout
- {
- Height = Application.GetMinRealAverage(0),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
- };
- this.midFrameLayout.AddChidren(topFrameLayout);
-
- #region BindEmptyPic UI
- entryStatusPic = new Button
- {
- X = Application.GetRealWidth(213),
- Y = Application.GetRealHeight(418),
- UnSelectedImagePath = "BindPic/BindEmptyPic.png",
- Visible = false,
- };
- this.midFrameLayout.AddChidren(entryStatusPic);
-
- btnPicTip = new Button
- {
- Y = Application.GetRealHeight(1020),
- Text = Language.StringByID(R.MyInternationalizationString.NoControlTargets),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- Gravity = Gravity.CenterHorizontal,
- Visible = false,
- };
- this.midFrameLayout.AddChidren(btnPicTip);
- #endregion
-
+ {
midVerticalRefreshLayout = new VerticalRefreshLayout()
{
};
@@ -306,17 +283,53 @@
InitListInfo();
midVerticalRefreshLayout.EndHeaderRefreshing();
};
+ topFrameLayout = new FrameLayout
+ {
+ Height = Application.GetMinRealAverage(0),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ };
+ midVerticalRefreshLayout.AddChidren(topFrameLayout);
+
+ BlankPicUI();
}
+ /// <summary>
+ /// 绌烘暟鎹甎I鏄剧ず
+ /// </summary>
+ void BlankPicUI()
+ {
+ blankFrameLayout = new FrameLayout
+ {
+ };
+ midVerticalRefreshLayout.AddChidren(blankFrameLayout);
+
+ entryStatusPic = new Button
+ {
+ X = Application.GetRealWidth(213),
+ Y = Application.GetRealHeight(418),
+ UnSelectedImagePath = "BindPic/BindEmptyPic.png",
+ Visible = false,
+ };
+ blankFrameLayout.AddChidren(entryStatusPic);
+
+ btnPicTip = new Button
+ {
+ Y = Application.GetRealHeight(1020),
+ Text = Language.StringByID(R.MyInternationalizationString.NoControlTargets),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ Gravity = Gravity.CenterHorizontal,
+ Visible = false,
+ };
+ blankFrameLayout.AddChidren(btnPicTip);
+ }
/// <summary>
/// 鎸夐敭缁戝畾琛ㄦ樉绀�
/// </summary>
async void RefreshList()
{
+ midVerticalRefreshLayout.RemoveAll();
this.midFrameLayout.RemoveAll();
middleFrameLayout();
- midVerticalRefreshLayout.RemoveAll();
-
var frameLayoutRow = new FrameLayout()
{
Height = Application.GetMinRealAverage(0),
@@ -332,7 +345,7 @@
btnPicTip.Height = Application.GetRealHeight(49);
btnPicTip.Visible = true;
entryStatusPic.Visible = true;
- midVerticalRefreshLayout.Height = Application.GetRealHeight(0);
+ blankFrameLayout.Height = midVerticalRefreshLayout.Height;
}
else
{
@@ -341,6 +354,7 @@
btnPicTip.Height = Application.GetRealHeight(0);
btnPicTip.Visible = false;
entryStatusPic.Visible = false;
+ blankFrameLayout.Height = Application.GetRealHeight(0);
if (currentKey.panelMode == 1)
{
topFrameLayout.Height = Application.GetRealHeight(0);
@@ -348,8 +362,7 @@
}
else
{
- topFrameLayout.Height = Application.GetRealHeight(150);
- midVerticalRefreshLayout.Y = Application.GetRealHeight(150);
+ topFrameLayout.Height = Application.GetRealHeight(150);
BindModeDisplay();
}
int curIndex = 0;
@@ -445,7 +458,10 @@
{
devicePic.UnSelectedImagePath = curSceneUI.IconPath;
btnBindName.Text = curSceneUI.Name;
- btnFloorRoomName.Text = curSceneUI.GetZone();
+ if (curSceneUI.GetZone() != null)
+ {
+ btnFloorRoomName.Text = curSceneUI.GetZone();
+ }
}
}
else
@@ -459,16 +475,25 @@
//鑾峰彇璁惧鎵�灞炴埧闂�
var tempDevRoom = Common.Room.CurrentRoom.GetRoomByDevice(tempDev);
//鑾峰彇璁惧鎵�鍦ㄦゼ灞�
- var tempDevFloorId = tempDevRoom.FloorId;
- //鑾峰彇妤煎眰鐨勫悕瀛�
- var tempDevRoomName = tempDevRoom.Name;
- //鑾峰彇妤煎眰鐨勫悕瀛�
- var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
- btnFloorRoomName.Text = tempDevFloorName + "," + tempDevRoomName;
+ if (Common.Config.Instance.Home.FloorDics.Count == 0)
+ {
+ }
+ if (tempDevRoom != null)
+ {
+ var tempDevFloorId = tempDevRoom.FloorId;
+ //鑾峰彇妤煎眰鐨勫悕瀛�
+ var tempDevRoomName = tempDevRoom.Name;
+ //鑾峰彇妤煎眰鐨勫悕瀛�
+ var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
+ btnFloorRoomName.Text = tempDevFloorName + "," + tempDevRoomName;
+ }
var deviceUi = Common.LocalDevice.Current.GetDeviceUI(tempDev);
- devicePic.UnSelectedImagePath = deviceUi.IconPath;
- devicePic.Width = Application.GetRealWidth(110);
- devicePic.Text = "";
+ if (deviceUi != null)
+ {
+ devicePic.UnSelectedImagePath = deviceUi.IconPath;
+ devicePic.Width = Application.GetRealWidth(110);
+ devicePic.Text = "";
+ }
if (tempDev.DeviceEpointName == "")
{
btnBindName.Text = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
@@ -596,59 +621,74 @@
//涓�閿竻闄ゆ寜閿簨浠�
btnDel.MouseUpEventHandler += async (sender, e) =>
{
- bool isDelSuccess = false;
- try
+ var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureClearKeyModeAndTargets),
+ Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
+ alert.Show();
+
+ alert.ResultEventHandler += async (s1, e1) =>
{
- CommonPage.Loading.Start("");
- var bindResult = await currentKey.ClearBindInfoAsync();
- if (bindResult != null && bindResult.clearBindInfoResponseData != null)
+ if (e1)
{
- if (bindResult.clearBindInfoResponseData.Result != 0)
+ bool isDelSuccess = false;
+ try
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
- CommonPage.Loading.Hide();
- return;
- }
- else
- {
- var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
- if (temp.setWritableValueResponData?.Status != 0)
+ CommonPage.Loading.Start("");
+ var bindResult = await currentKey.ClearBindInfoAsync();
+ if (bindResult != null && bindResult.clearBindInfoResponseData != null)
{
- var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
- if (temp1.setWritableValueResponData?.Status != 0)
+ if (bindResult.clearBindInfoResponseData.Result != 0)
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
+ CommonPage.Loading.Hide();
+ return;
}
else
{
- isDelSuccess = true;
+ var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
+ if (temp.setWritableValueResponData?.Status != 0)
+ {
+ var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
+ if (temp1.setWritableValueResponData?.Status != 0)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ }
+ else
+ {
+ isDelSuccess = true;
+ }
+ }
+ else
+ {
+ isDelSuccess = true;
+ }
}
}
else
{
- isDelSuccess = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
}
+ }
+ catch { }
+ finally
+ {
+ if (isDelSuccess)
+ {
+ currentKey.panelMode = 65535;
+ currentKey.bindList.Clear();
+ RefreshList();
+ //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
+ currentKey.RoomId = "";
+ currentKey.ReSave();
+ }
+ CommonPage.Loading.Hide();
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+
}
- }
- catch { }
- finally
- {
- if (isDelSuccess)
- {
- currentKey.panelMode = 65535;
- currentKey.bindList.Clear();
- RefreshList();
- //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
- currentKey.RoomId = "";
- currentKey.ReSave();
- }
- CommonPage.Loading.Hide();
- }
+ };
+
};
}
@@ -1071,48 +1111,8 @@
{
CommonPage.Loading.Start("");
var delResult = new DelDeviceBindResponseAllData();
- delResult = await currentKey.DelDeviceBindAsync(delDevice);
- //if (delResult != null)
- //{
- // if (delResult.removeBindResultResponseData != null)
- // {
- // 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.None, CloseTime = 2 }.Show(CommonPage.Instance);
- // }
- // }
- // else if (delResult.delDeviceBindResponseData != null)
- // {
- // foreach (var remTarget in delResult.delDeviceBindResponseData.RemoveBindList)
- // {
- // if (remTarget.Result == 0)
- // {
- // currentKey.bindList.Remove(bindDevice);
- // RefreshList();
- // //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
- // currentKey.RoomId = "";
- // currentKey.ReSave();
- // return 0;
- // }
- // else
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
- // }
- // }
- // }
- //}
- //else
- //{
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
- //}
-
- if (delResult != null && delResult.removeBindResultResponseData != null)
+ delResult = await currentKey.DelDeviceBindAsync(delDevice);
+ if (delResult != null && delResult.delDeviceBindResponseData != null)
{
if (delResult.delDeviceBindResponseData?.RemoveBindList != null)
{
@@ -1124,6 +1124,10 @@
currentKey.bindList.Remove(bindDevice);
RefreshList();
//濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
+ if(re.BindType == 2)
+ {
+ currentKey.panelMode = 65535;
+ }
currentKey.RoomId = "";
currentKey.ReSave();
return 0;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
index 1819ec7..e1f47a1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
@@ -25,32 +25,32 @@
{
this.currentKey = key;
this.currentModeID = key.panelMode;
- this.oldModeID = key.panelMode;
this.curDeviceBindType = deviceBindType;
this.targetList = targetSelectList;
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
- ZigBee.Device.Panel currentKey;
+ ZigBee.Device.Panel currentKey;//褰撳墠鎸夐敭
//鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
- VerticalScrolViewLayout midVerticalScrolViewLayout;
- HorizontalScrolViewLayout btnHorizontalScrolViewLayout;
+ VerticalScrolViewLayout midVerticalScrolViewLayout;//涓儴鍒锋柊鍒楄〃
+ HorizontalScrolViewLayout btnHorizontalScrolViewLayout;//鎴块棿鍒楄〃宸﹀彸婊戝姩甯冨眬
/// <summary>
/// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
/// </summary>
- List<CommonDevice> targetList = new List<CommonDevice>();
+ List<CommonDevice> targetList = new List<CommonDevice>();//鏈湴涓存椂閫変腑鍒楄〃
/// <summary>
/// 鏂扮殑鎸夐敭閰嶇疆鐩爣鍒楄〃涓紝鐩爣瀹為檯瀛樺湪鎸夐敭涓紝姝ゆ椂瑕佸垹鎺夌殑鏁版嵁
/// </summary>
- List<CommonDevice> oldTargetList = new List<CommonDevice>();
- List<Room> roomList = new List<Room>();
- int currentClusterID = 6;
- public Action<List<BindListResponseObj>> action;
- int currentModeID = 0;
- int oldModeID = 0;
- string curDeviceBindType = "";
+ List<CommonDevice> oldTargetList = new List<CommonDevice>();//鏈湴鏃х殑閫変腑鍒楄〃
+ int currentClusterID = 6;//褰撳墠绨嘔D
+ public Action<List<BindListResponseObj>> action;//鍥炶皟缁戝畾鐩爣椤甸潰鍒锋柊
+ int currentModeID = 0;//褰撳墠妯″紡ID
+ string curDeviceBindType = "";//褰撳墠璁惧缁戝畾绫诲瀷
#endregion
+ /// <summary>
+ /// 鏄剧ず鎸夐敭妯″紡椤�
+ /// </summary>
public void Show()
{
this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.ChooseKeyMode));
@@ -66,6 +66,9 @@
MidFrameLayoutContent();
}
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
async void MidFrameLayoutContent()
{
#region UI
@@ -97,11 +100,7 @@
#endregion
#region 鏁版嵁澶勭悊
- roomList = Shared.Common.Room.Lists;
- Shared.Common.Room curRoom = roomList[0];
- int index = 0;
- KeyModeList(roomList[index]);
-
+ KeyModeList();
btnFinifh.MouseUpEventHandler += async (sender, e) =>
{
oldTargetList.Clear();
@@ -115,17 +114,15 @@
if (currentKey.bindList != null)
{
var bindResult = await currentKey.ClearBindInfoAsync();
-
if (bindResult != null && bindResult.clearBindInfoResponseData != null)
{
if (bindResult.clearBindInfoResponseData.Result != 0)
{
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
- CommonPage.Loading.Hide();
- this.RemoveFromParent();
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
return;
@@ -139,9 +136,9 @@
{
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
- CommonPage.Loading.Hide();
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
return;
@@ -214,105 +211,97 @@
}
}
+ //鏄寒搴﹀啀娆″彂6鍛戒护
+ if (currentClusterID == 8)
+ {
+ foreach (var de in targetList)
+ {
+ if (de.DeviceAddr != null)
+ {
+ var addBindInfo = new AddBindListObj();
+ addBindInfo.BindType = 0;
+ addBindInfo.BindCluster = 6;
+ addBindInfo.BindMacAddr = de.DeviceAddr;
+ addBindInfo.BindEpoint = de.DeviceEpoint;
+ addBindeDev.BindList.Add(addBindInfo);
+ }
+ }
+ }
+
var dev = new AddedDeviceBindResponseAllData();
dev = await currentKey.AddDeviceBindAsync(addBindeDev);
if (dev.addedDeviceBindResponseData == null)
{
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
}
else
{
- foreach (var ab in dev.addedDeviceBindResponseData?.BindList)
+ if (dev.addedDeviceBindResponseData.Result == 0)
{
- switch (ab.Result)
+ if (currentClusterID == 8)
{
- case 0:
- currentKey.bindList.Add((BindListResponseObj)ab);
-
- for (int i = 0; i < targetList.Count; i++)
+ foreach (var de in dev.addedDeviceBindResponseData.BindList)
+ {
+ if (de.BindCluster == 8)
{
- var de = targetList[i];
- var sc1 = new SceneUI();
- if (de.DeviceAddr == null)
- {
- sc1 = (SceneUI)de;
-
- if (sc1.Id == ab.BindScenesId)
- {
- targetList.RemoveAt(i);
- i--;
- }
- }
+ currentKey.bindList.Add(de);
}
- //isFinish = true;
- break;
- case 1:
- Application.RunOnMainThread(() =>
- {
- new Tip()
- {
- MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindErrorAbsence),
- Direction = AMPopTipDirection.Up,
- CloseTime = 1
- }.Show(btnFinifh);
- });
- break;
- case 2:
- var abr = dev.addBindResultResponseData?.Result;
- switch (dev.addBindResultResponseData?.Result)
- {
- case 0:
- currentKey.bindList.Add((BindListResponseObj)ab);
- for (int i = 0; i < targetList.Count; i++)
- {
- var de = targetList[i];
- if (de.DeviceAddr == ab.BindMacAddr && de.DeviceEpoint == ab.BindEpoint)
- {
- targetList.RemoveAt(i);
- i--;
- }
- }
- //isFinish = true;
- break;
- case 140:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- default:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = ab.ESName + Language.StringByID(R.MyInternationalizationString.BindUnknownError), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- }
- break;
- case 3:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = ab.ESName + Language.StringByID(R.MyInternationalizationString.BindErrorExisted), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- case 4:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = ab.ESName + Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
- default:
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = ab.ESName + Language.StringByID(R.MyInternationalizationString.BindUnknownError), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- break;
+ }
}
+ else
+ {
+ currentKey.bindList = dev.addedDeviceBindResponseData.BindList;
+ }
+ if (action != null)
+ {
+ action(currentKey.bindList);
+ }
+ this.RemoveFromParent();
+ targetList.Clear();
+ CommonPage.Loading.Hide();
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
+ else if (dev.addedDeviceBindResponseData.Result == 1)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip()
+ {
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
+ Direction = AMPopTipDirection.Up,
+ CloseTime = 1
+ }.Show(btnFinifh);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip()
+ {
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
+ Direction = AMPopTipDirection.Up,
+ CloseTime = 1
+ }.Show(btnFinifh);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
}
}
}
@@ -320,6 +309,7 @@
{
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnFinifh);
});
btnFinifh.Enable = true;
@@ -331,6 +321,7 @@
{
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnFinifh);
});
btnFinifh.Enable = true;
@@ -338,26 +329,8 @@
return;
}
}
- catch { }
- finally
+ catch
{
- //if (isFinish)
- //{
- // if (action != null)
- // {
- // action(currentKey.bindList);
- // }
- // this.RemoveFromParent();
- //}
- //else
- //{
- // this.RemoveFromParent();
- //}
- if (action != null)
- {
- action(currentKey.bindList);
- }
- this.RemoveFromParent();
CommonPage.Loading.Hide();
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
@@ -371,10 +344,9 @@
/// </summary>
/// <param name="gateway">Gateway.</param>
/// <param name="key">Key.</param>
- void KeyModeList(Shared.Common.Room curRoom)
+ private void KeyModeList()
{
midVerticalScrolViewLayout.RemoveAll();
-
switch (curDeviceBindType)
{
case "AddSwitch":
@@ -392,7 +364,7 @@
}
}
- public void AddSwitchMode()
+ private void AddSwitchMode()
{
Button oldMode = null;
for (int i = 0; i < 3; i++)
@@ -470,6 +442,15 @@
btnChoose.Visible = true;
oldMode = btnChoose;
}
+ else if ((currentKey.panelMode == 65535) && i == 0)
+ {
+ //榛樿绗竴涓�
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ oldMode = btnChoose;
+ currentModeID = 100;
+ currentKey.panelMode = currentModeID;
+ }
EventHandler<MouseEventArgs> hander = async (sender, e) =>
{
@@ -508,7 +489,7 @@
}
}
- public void AddDimmerMode()
+ private void AddDimmerMode()
{
Button oldMode = null;
for (int i = 0; i < 5; i++)
@@ -606,6 +587,15 @@
btnChoose.Visible = true;
oldMode = btnChoose;
}
+ else if ((currentKey.panelMode == 65535) && i == 0)
+ {
+ //榛樿绗竴涓�
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ oldMode = btnChoose;
+ currentModeID = 200;
+ currentKey.panelMode = currentModeID;
+ }
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
@@ -654,7 +644,7 @@
}
}
- public void AddCurtainMode()
+ private void AddCurtainMode()
{
Button oldMode = null;
for (int i = 0; i < 5; i++)
@@ -752,6 +742,15 @@
btnChoose.Visible = true;
oldMode = btnChoose;
}
+ else if ((currentKey.panelMode == 65535) && i == 0)
+ {
+ //榛樿绗竴涓�
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ oldMode = btnChoose;
+ currentModeID = 300;
+ currentKey.panelMode = currentModeID;
+ }
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
@@ -799,6 +798,11 @@
}
}
+ private void FinisfhEventHandler(object sender, MouseEventArgs e)
+ {
+
+ }
+
public void DeviceInfoChange(CommonDevice common, string typeTag)
{
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index 741411a..7a96447 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -439,7 +439,8 @@
frameBorder.Gravity = Gravity.CenterHorizontal;
frameBorder.Width = Application.GetRealWidth(887);
frameBorder.Height = Application.GetRealHeight(423);
- frameBorder.BorderWidth = (uint)Application.GetMinRealAverage(3);
+ frameBorder.Radius = (uint)Application.GetRealHeight(6);
+ frameBorder.BorderWidth = 1;
frameBorder.BorderColor = 0xffd0d0d0;
bodyFrameLayout.AddChidren(frameBorder);
@@ -513,7 +514,7 @@
btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;
btnIcon.X = defultXX + i * (frame.Height + space);
btnIcon.Radius = (uint)frame.Height / 2;
- btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);
+ btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
btnIcon.TextAlignment = TextAlignment.Center;
btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
index 7a7fcc6..52b60db 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -371,9 +371,10 @@
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(147);
frameBorder.Gravity = Gravity.CenterHorizontal;
- frameBorder.Width = Application.GetMinRealAverage(887);
- frameBorder.Height = Application.GetMinRealAverage(423);
- frameBorder.BorderWidth = 3;
+ frameBorder.Width = Application.GetRealWidth(887);
+ frameBorder.Height = Application.GetRealHeight(423);
+ frameBorder.Radius = (uint)Application.GetRealHeight(6);
+ frameBorder.BorderWidth = 1;
frameBorder.BorderColor = 0xffd0d0d0;
bodyFrameLayout.AddChidren(frameBorder);
@@ -449,7 +450,7 @@
btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;
btnIcon.X = defultXX + i * (frame.Height + space);
btnIcon.Radius = (uint)frame.Height / 2;
- btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);
+ btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
btnIcon.TextAlignment = TextAlignment.Center;
btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index ce2046e..6c27ad4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -428,8 +428,8 @@
if (info.Result != 0)
{
//鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
- //HdlLogLogic.Current.WriteLog(-1, resultData);
+ //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
+ HdlLogLogic.Current.WriteLog(-1, resultData);
return 2;
}
this.topTimeOut = topMaxTime;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs
index e7bf9bb..4612143 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs
@@ -32,7 +32,7 @@
btnHelp.ButtonClickEvent += (sender, e) =>
{
var form = new DeviceDirectionHelpForm();
- form.AddForm("Device");
+ form.AddForm();
};
//涓嬩竴姝�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
index 8ed318f..4611304 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
@@ -13,36 +13,26 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_deviceDiv">璁惧鍖哄垎</param>
- public void ShowForm(string i_deviceDiv)
+ /// </summary>
+ public void ShowForm()
{
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uSearchHelp));
//鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame(i_deviceDiv);
+ this.InitMiddleFrame();
}
/// <summary>
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- /// <param name="deviceDiv">璁惧鍖哄垎</param>
- private void InitMiddleFrame(string i_deviceDiv)
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
- if (i_deviceDiv == "Device")
- {
- //鍒濆鍖栬澶囧府鍔╂帶浠�
- this.InitDeviceHelpControl();
- }
- else
- {
- //鍒濆鍖栫綉鍏冲府鍔╂帶浠�
- this.InitGatewayHelpControl();
- }
+ //鍒濆鍖栬澶囧府鍔╂帶浠�
+ this.InitDeviceHelpControl();
}
/// <summary>
@@ -52,6 +42,7 @@
{
//璁惧娣诲姞鎸囧紩
var btnHelp1 = new NormalViewControl(942, 60, true);
+ btnHelp1.IsBold = true;
btnHelp1.TextID = R.MyInternationalizationString.uAddDeviceHelp1;
btnHelp1.X = ControlCommonResourse.XXLeft;
btnHelp1.Y = Application.GetRealHeight(58);
@@ -91,14 +82,6 @@
btnHelp5.TextSize = 12;
btnHelp5.TextColor = UserCenterColor.Current.TextGrayColor3;
bodyFrameLayout.AddChidren(btnHelp5);
- }
-
- /// <summary>
- /// 鍒濆鍖栫綉鍏冲府鍔╂帶浠�
- /// </summary>
- private void InitGatewayHelpControl()
- {
-
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index a7e1804..9425bde 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -155,23 +155,17 @@
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(253);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xff3e99f4;
- seekBar1.Progress = energyModeInfo.level;
+ seekBar1.ProgressBarColor = 0xff3e99f4;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
energyModeInfo.level = value;
};
+ seekBar1.Progress = energyModeInfo.level;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -240,23 +234,16 @@
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(147);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xfffdb500;
- seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
linghtLevelInfo.panelDirectionsLevel = value;
};
+ seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -301,6 +288,9 @@
btnColor.BackgroundColor = backColor;
frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = backColor;
+
var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
btnRight.UnSelectedImagePath = "Item/Next.png";
btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
@@ -322,6 +312,8 @@
this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
}
@@ -367,23 +359,16 @@
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(147);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xff2b62fd;
- seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
linghtLevelInfo.panelBacklightLevel = value;
};
+ seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -428,6 +413,9 @@
btnColor.BackgroundColor = backColor;
frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = backColor;
+
var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
btnRight.UnSelectedImagePath = "Item/Next.png";
btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
@@ -448,7 +436,9 @@
this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
- btnColor.BackgroundColor= this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 9fd6a4f..f7bffe6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
@@ -48,6 +48,7 @@
/// <param name="i_iasZone">浼犳劅鍣ㄨ澶�</param>
public void ShowForm(IASZone i_iasZone)
{
+ UserView.HomePage.Instance.ScrollEnabled = false;
deviceIASZone = i_iasZone;
//璁剧疆澶撮儴淇℃伅
@@ -70,8 +71,6 @@
var result = await this.GetDeviceAllDefultData();
if (result == false)
{
- //鏄剧ず閲嶆柊鍔犺浇鐨勭晫闈�
- this.ShowReLoadView();
return;
}
@@ -130,22 +129,19 @@
btnLight.Y = Application.GetRealHeight(58);
frameLight.AddChidren(btnLight);
//杩涘害鏉�
- var seekBar = new HorizontalSeekBar();
- seekBar.X = Application.GetRealWidth(138);
- seekBar.Y = Application.GetRealHeight(152);
- seekBar.Width = Application.GetRealWidth(884);
- seekBar.Height = Application.GetRealHeight(84);
- seekBar.Max = lightLevelCount - 1;
- seekBar.BackgroundColor = 0xfff5f5f5;
- seekBar.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar.ProgressColor = 0xfffdb500;
- seekBar.Progress = lightLevelCount - Lightconfigure.levelSize;
+ var seekBar = new SeekBarControl(900);
+ seekBar.Gravity = Gravity.Frame;
+ seekBar.X = Application.GetRealWidth(125);
+ seekBar.Y = Application.GetRealHeight(142);
+ seekBar.MaxValue = lightLevelCount - 1;
+ seekBar.ProgressBarColor = 0xfffdb500;
frameLight.AddChidren(seekBar);
- seekBar.ProgressChanged += (sender, value) =>
+ seekBar.ProgressChangedEvent += (div, value) =>
{
//鍥犱负瀹冪殑绛夌骇鍒诲害浠庡乏寰�鍙虫槸浠庡ぇ鍒板皬鐨�
this.Lightconfigure.levelSize = lightLevelCount - value;
};
+ seekBar.Progress = lightLevelCount - Lightconfigure.levelSize;
//浣�
var btnDown = new NormalViewControl(300, 50, true);
@@ -463,5 +459,18 @@
}
#endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 9ab7f3f..8f382b3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -186,24 +186,18 @@
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(253);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xff3e99f4;
- seekBar1.Progress = energyModeInfo.level;
+ seekBar1.ProgressBarColor = 0xff3e99f4;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
energyModeInfo.level = value;
valueChanged = true;
};
+ seekBar1.Progress = energyModeInfo.level;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -258,24 +252,18 @@
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(124);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xfffdb500;
- seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
+ seekBar1.ProgressBarColor = 0xfffdb500;
frameLinght.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
linghtLevelInfo.panelDirectionsLevel = value;
valueChanged = true;
};
+ seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -328,24 +316,18 @@
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(464);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xfffdb500;
- seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
+ seekBar1.ProgressBarColor = 0xfffdb500;
frameLinght.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
linghtLevelInfo.panelBacklightLevel = value;
valueChanged = true;
};
+ seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index c78f4f1..348c207 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -28,7 +28,6 @@
Application.RunOnMainThread(() =>
{
-
});
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/AddGatewayHelpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/AddGatewayHelpForm.cs
new file mode 100755
index 0000000..56274d2
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/AddGatewayHelpForm.cs
@@ -0,0 +1,272 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.GatewayAdd
+{
+ /// <summary>
+ /// 娣诲姞缃戝叧鐨勫府鍔╃晫闈�
+ /// </summary>
+ public class AddGatewayHelpForm : EditorCommonForm
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_div">鍖哄垎</param>
+ public void ShowForm(string i_div)
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uSearchHelp));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(i_div);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame(string i_div)
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //缃戝叧娣诲姞鎸囧紩
+ var btnHelp1 = new NormalViewControl(942, 60, true);
+ btnHelp1.IsBold = true;
+ btnHelp1.TextID = R.MyInternationalizationString.uAddGatewayGuide;
+ btnHelp1.X = ControlCommonResourse.XXLeft;
+ btnHelp1.Y = Application.GetRealHeight(58);
+ bodyFrameLayout.AddChidren(btnHelp1);
+
+ if (i_div == "Wired")
+ {
+ //鍒濆鍖栨湁绾跨綉鍏冲府鍔╂帶浠�
+ this.InitWiredGatewayHelpControl();
+ }
+ else if (i_div == "Udp")
+ {
+ //鍒濆鍖栨棤绾跨綉鍏砋dp妯″紡甯姪鎺т欢
+ this.InitWirelessUdpGatewayHelpControl();
+ }
+ else if (i_div == "Ap")
+ {
+ //鍒濆鍖栨棤绾跨綉鍏矨p妯″紡甯姪鎺т欢
+ this.InitWirelessApGatewayHelpControl();
+ }
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨湁绾跨綉鍏冲府鍔╂帶浠�
+ /// </summary>
+ private void InitWiredGatewayHelpControl()
+ {
+ //1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+ var btnHelp1 = new NormalViewControl(942, 100, true);
+ btnHelp1.TextID = R.MyInternationalizationString.uAddWiredGatewayHelp1;
+ btnHelp1.X = ControlCommonResourse.XXLeft;
+ btnHelp1.Y = Application.GetRealHeight(164);
+ btnHelp1.TextSize = 12;
+ btnHelp1.IsMoreLines = true;
+ btnHelp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp1);
+ //2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+ var btnHelp2 = new NormalViewControl(942, 150, true);
+ btnHelp2.TextID = R.MyInternationalizationString.uAddWiredGatewayHelp2;
+ btnHelp2.IsMoreLines = true;
+ btnHelp2.X = ControlCommonResourse.XXLeft;
+ btnHelp2.Y = btnHelp1.Bottom + Application.GetRealHeight(35);
+ btnHelp2.TextSize = 12;
+ btnHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp2);
+
+ //缃戝叧纭欢闂甯姪
+ var btnHardHelp = new NormalViewControl(942, 60, true);
+ btnHardHelp.IsBold = true;
+ btnHardHelp.TextID = R.MyInternationalizationString.uGatewayHardDeviceHelp;
+ btnHardHelp.X = ControlCommonResourse.XXLeft;
+ btnHardHelp.Y = btnHelp2.Bottom + Application.GetRealHeight(60);
+ bodyFrameLayout.AddChidren(btnHardHelp);
+
+ //1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+ var btnHardHelp1 = new NormalViewControl(942, 50, true);
+ btnHardHelp1.TextID = R.MyInternationalizationString.uWiredGatewayHardDeviceHelp1;
+ btnHardHelp1.X = ControlCommonResourse.XXLeft;
+ btnHardHelp1.Y = btnHardHelp.Bottom + Application.GetRealHeight(46);
+ btnHardHelp1.TextSize = 12;
+ btnHardHelp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp1);
+
+ //2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ var btnHardHelp2 = new NormalViewControl(942, 150, true);
+ btnHardHelp2.TextID = R.MyInternationalizationString.uWiredGatewayHardDeviceHelp2;
+ btnHardHelp2.X = ControlCommonResourse.XXLeft;
+ btnHardHelp2.Y = btnHardHelp1.Bottom + Application.GetRealHeight(35);
+ btnHardHelp2.TextSize = 12;
+ btnHardHelp2.IsMoreLines = true;
+ btnHardHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp2);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨棤绾跨綉鍏砋dp妯″紡甯姪鎺т欢
+ /// </summary>
+ private void InitWirelessUdpGatewayHelpControl()
+ {
+ //绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ var btnHelp1 = new NormalViewControl(942, 50, true);
+ btnHelp1.TextID = R.MyInternationalizationString.uAddWirelessGatewayHelp1;
+ btnHelp1.X = ControlCommonResourse.XXLeft;
+ btnHelp1.Y = Application.GetRealHeight(164);
+ btnHelp1.TextSize = 12;
+ btnHelp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp1);
+ //1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ var btnHelp2 = new NormalViewControl(942, 100, true);
+ btnHelp2.TextID = R.MyInternationalizationString.uAddWirelessUdpGatewayHelp1;
+ btnHelp2.IsMoreLines = true;
+ btnHelp2.X = ControlCommonResourse.XXLeft;
+ btnHelp2.Y = btnHelp1.Bottom + Application.GetRealHeight(46);
+ btnHelp2.TextSize = 12;
+ btnHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp2);
+ //2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+ var btnHelp3 = new NormalViewControl(942, 50, true);
+ btnHelp3.TextID = R.MyInternationalizationString.uAddWirelessGatewayHelp2;
+ btnHelp3.X = ControlCommonResourse.XXLeft;
+ btnHelp3.Y = btnHelp2.Bottom + Application.GetRealHeight(35);
+ btnHelp3.TextSize = 12;
+ btnHelp3.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp3);
+
+ //缃戝叧纭欢闂甯姪
+ var btnHardHelp = new NormalViewControl(942, 60, true);
+ btnHardHelp.IsBold = true;
+ btnHardHelp.TextID = R.MyInternationalizationString.uGatewayHardDeviceHelp;
+ btnHardHelp.X = ControlCommonResourse.XXLeft;
+ btnHardHelp.Y = btnHelp3.Bottom + Application.GetRealHeight(60);
+ bodyFrameLayout.AddChidren(btnHardHelp);
+
+ //绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ var btnHardHelp1 = new NormalViewControl(942, 50, true);
+ btnHardHelp1.TextID = R.MyInternationalizationString.uAddWirelessGatewayHelp1;
+ btnHardHelp1.X = ControlCommonResourse.XXLeft;
+ btnHardHelp1.Y = btnHardHelp.Bottom + Application.GetRealHeight(46);
+ btnHardHelp1.TextSize = 12;
+ btnHardHelp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp1);
+
+ //1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ var btnHardHelp2 = new NormalViewControl(942, 100, true);
+ btnHardHelp2.TextID = R.MyInternationalizationString.uWirelessGatewayHardDeviceHelp1;
+ btnHardHelp2.X = ControlCommonResourse.XXLeft;
+ btnHardHelp2.Y = btnHardHelp1.Bottom + Application.GetRealHeight(35);
+ btnHardHelp2.TextSize = 12;
+ btnHardHelp2.IsMoreLines = true;
+ btnHardHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp2);
+
+ //2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ var btnHardHelp3 = new NormalViewControl(942, 100, true);
+ btnHardHelp3.TextID = R.MyInternationalizationString.uWirelessGatewayHardDeviceHelp2;
+ btnHardHelp3.X = ControlCommonResourse.XXLeft;
+ btnHardHelp3.Y = btnHardHelp2.Bottom + Application.GetRealHeight(35);
+ btnHardHelp3.TextSize = 12;
+ btnHardHelp3.IsMoreLines = true;
+ btnHardHelp3.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp3);
+
+ //3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ var btnHardHelp4 = new NormalViewControl(942, 100, true);
+ btnHardHelp4.TextID = R.MyInternationalizationString.uWirelessGatewayHardDeviceHelp3;
+ btnHardHelp4.X = ControlCommonResourse.XXLeft;
+ btnHardHelp4.Y = btnHardHelp3.Bottom + Application.GetRealHeight(35);
+ btnHardHelp4.TextSize = 12;
+ btnHardHelp4.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnHardHelp4.IsMoreLines = true;
+ bodyFrameLayout.AddChidren(btnHardHelp4);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨棤绾跨綉鍏矨p妯″紡甯姪鎺т欢
+ /// </summary>
+ private void InitWirelessApGatewayHelpControl()
+ {
+ //绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ var btnHelp1 = new NormalViewControl(942, 50, true);
+ btnHelp1.TextID = R.MyInternationalizationString.uAddWirelessGatewayHelp1;
+ btnHelp1.X = ControlCommonResourse.XXLeft;
+ btnHelp1.Y = Application.GetRealHeight(164);
+ btnHelp1.TextSize = 12;
+ btnHelp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp1);
+ //1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+ var btnHelp2 = new NormalViewControl(942, 100, true);
+ btnHelp2.TextID = R.MyInternationalizationString.uAddWirelessApGatewayHelp1;
+ btnHelp2.IsMoreLines = true;
+ btnHelp2.X = ControlCommonResourse.XXLeft;
+ btnHelp2.Y = btnHelp1.Bottom + Application.GetRealHeight(46);
+ btnHelp2.TextSize = 12;
+ btnHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp2);
+ //2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+ var btnHelp3 = new NormalViewControl(942, 50, true);
+ btnHelp3.TextID = R.MyInternationalizationString.uAddWirelessGatewayHelp2;
+ btnHelp3.X = ControlCommonResourse.XXLeft;
+ btnHelp3.Y = btnHelp2.Bottom + Application.GetRealHeight(35);
+ btnHelp3.TextSize = 12;
+ btnHelp3.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHelp3);
+
+ //缃戝叧纭欢闂甯姪
+ var btnHardHelp = new NormalViewControl(942, 60, true);
+ btnHardHelp.IsBold = true;
+ btnHardHelp.TextID = R.MyInternationalizationString.uGatewayHardDeviceHelp;
+ btnHardHelp.X = ControlCommonResourse.XXLeft;
+ btnHardHelp.Y = btnHelp3.Bottom + Application.GetRealHeight(60);
+ bodyFrameLayout.AddChidren(btnHardHelp);
+
+ //绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ var btnHardHelp1 = new NormalViewControl(942, 50, true);
+ btnHardHelp1.TextID = R.MyInternationalizationString.uAddWirelessGatewayHelp1;
+ btnHardHelp1.X = ControlCommonResourse.XXLeft;
+ btnHardHelp1.Y = btnHardHelp.Bottom + Application.GetRealHeight(46);
+ btnHardHelp1.TextSize = 12;
+ btnHardHelp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp1);
+
+ //1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ var btnHardHelp2 = new NormalViewControl(942, 100, true);
+ btnHardHelp2.TextID = R.MyInternationalizationString.uWirelessGatewayHardDeviceHelp1;
+ btnHardHelp2.X = ControlCommonResourse.XXLeft;
+ btnHardHelp2.Y = btnHardHelp1.Bottom + Application.GetRealHeight(35);
+ btnHardHelp2.TextSize = 12;
+ btnHardHelp2.IsMoreLines = true;
+ btnHardHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp2);
+
+ //2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ var btnHardHelp3 = new NormalViewControl(942, 100, true);
+ btnHardHelp3.TextID = R.MyInternationalizationString.uWirelessGatewayHardDeviceHelp2;
+ btnHardHelp3.X = ControlCommonResourse.XXLeft;
+ btnHardHelp3.Y = btnHardHelp2.Bottom + Application.GetRealHeight(35);
+ btnHardHelp3.TextSize = 12;
+ btnHardHelp3.IsMoreLines = true;
+ btnHardHelp3.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnHardHelp3);
+
+ //3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ var btnHardHelp4 = new NormalViewControl(942, 100, true);
+ btnHardHelp4.TextID = R.MyInternationalizationString.uWirelessGatewayHardDeviceHelp3;
+ btnHardHelp4.X = ControlCommonResourse.XXLeft;
+ btnHardHelp4.Y = btnHardHelp3.Bottom + Application.GetRealHeight(35);
+ btnHardHelp4.TextSize = 12;
+ btnHardHelp4.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnHardHelp4.IsMoreLines = true;
+ bodyFrameLayout.AddChidren(btnHardHelp4);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
index bd338ae..36dee6e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
@@ -42,6 +42,11 @@
row1.AddBottomLine();
row1.ButtonClickEvent += (sender, e) =>
{
+ //妫�娴嬩綇瀹呯粡绾害
+ if (this.CheckResidencePoint() == false)
+ {
+ return;
+ }
var form = new WiredGatewayDirectionForm();
form.AddForm();
};
@@ -56,6 +61,11 @@
row2.AddRightArrow();
row2.ButtonClickEvent += (sender, e) =>
{
+ //妫�娴嬩綇瀹呯粡绾害
+ if (this.CheckResidencePoint() == false)
+ {
+ return;
+ }
var menuContr = new BottomMenuSelectForm();
menuContr.AddForm(2);
//UDP妯″紡(鎺ㄨ崘)
@@ -72,5 +82,26 @@
});
};
}
+
+ /// <summary>
+ /// 妫�娴嬩綇瀹呯粡绾害
+ /// </summary>
+ /// <returns></returns>
+ private bool CheckResidencePoint()
+ {
+ if (Common.Config.Instance.Home.Latitude == 0 && Common.Config.Instance.Home.Longitude == 0)
+ {
+ //璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+ string msg = Language.StringByID(R.MyInternationalizationString.uGotoResidenceAndSetLocation).Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ var form = new Residence.ResidenceManagementForm();
+ form.AddForm(false);
+
+ }, Language.StringByID(R.MyInternationalizationString.uGotoSettion));
+ return false;
+ }
+ return true;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs
index 22ab884..30dc974 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs
@@ -33,7 +33,7 @@
btnimage.UnSelectedImagePath = "Gateway/WiredGatewayInstruct.png";
bodyFrameLayout.AddChidren(btnimage);
- //璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ //璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
string[] strMsg = Language.StringByID(R.MyInternationalizationString.ConfirmLineConnectMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -43,7 +43,7 @@
bodyFrameLayout.AddChidren(btnMsg1);
if (strMsg.Length > 1)
{
- var btnMsg2= new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor3;
btnMsg2.TextAlignment = TextAlignment.Center;
btnMsg2.Text = strMsg[1];
@@ -60,8 +60,8 @@
btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("Gateway");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Wired");
};
bodyFrameLayout.AddChidren(btnHelp);
//搴曠嚎
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 7834807..ce52da1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -115,7 +115,7 @@
btnMsg1.Y = picGwImage.Bottom + Application.GetRealHeight(112);
btnMsg1.TextID = R.MyInternationalizationString.uSearchGatewayFailMsg1;
bodyFrameLayout.AddChidren(btnMsg1);
- //1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ //1.鐭寜HID/WCFG鎸夐敭锛岀郴缁熸寚绀虹伅蹇棯3绉掞紝缃戝叧杩涘叆鎹㈢粦妯″紡锛屽己鍒剁綉鍏崇粦瀹氬埌褰撳墠APP
var btnMsg2 = new NormalViewControl(930, 100, true);
btnMsg2.X = Application.GetRealWidth(75);
btnMsg2.Y = btnMsg1.Bottom + Application.GetRealHeight(35);
@@ -124,7 +124,7 @@
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
btnMsg2.IsMoreLines = true;
bodyFrameLayout.AddChidren(btnMsg2);
- //2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ //2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓婏紝鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏紝鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
var btnMsg3 = new NormalViewControl(930, 100, true);
btnMsg3.X = Application.GetRealWidth(75);
btnMsg3.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection1Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection1Form.cs
index 0a2205d..467eb3d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection1Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection1Form.cs
@@ -40,8 +40,7 @@
framePic.BackgroundImagePath = "Gateway/WirelessApDirection.png";
bodyFrameLayout.AddChidren(framePic);
- //闀挎寜缃戝叧HID/WCFG鎸夐敭5绉�
- //绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ //璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg1).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = framePic.Bottom + Application.GetRealHeight(291);
foreach (var msg in ArryMsg)
@@ -59,8 +58,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
};
//涓嬩竴姝�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
index 74d326b..f61552e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
@@ -69,8 +69,7 @@
framePic.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";
bodyFrameLayout.AddChidren(framePic);
- //璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆
- //閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ //鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = framePic.Bottom + Application.GetRealHeight(213);
foreach (var msg in ArryMsg)
@@ -109,8 +108,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs
index b211421..1919e16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs
@@ -39,8 +39,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
};
//涓嬩竴姝�
@@ -70,8 +70,7 @@
framePic.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";
bodyFrameLayout.AddChidren(framePic);
- //璇峰墠寰�绉诲姩璁惧WLAN璁剧疆
- //閲嶆柊杩炴帴瀹跺涵wiFi
+ //鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg3).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = framePic.Bottom + Application.GetRealHeight(369);
foreach (var msg in ArryMsg)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index 54c02ef..b2414b7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -54,8 +54,7 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //绯荤粺鐏瘡绉掗棯鐑佷竴娆�
- //鍒欒繛鎺ユ垚鍔�
+ //缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = Application.GetRealHeight(1066);
foreach (var msg in ArryMsg)
@@ -109,7 +108,7 @@
btnMsg1.Y = picGwImage.Bottom + Application.GetRealHeight(112);
btnMsg1.TextID = R.MyInternationalizationString.uSearchGatewayFailMsg1;
bodyFrameLayout.AddChidren(btnMsg1);
- //1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ //1.鐭寜HID/WCFG鎸夐敭锛岀郴缁熸寚绀虹伅蹇棯3绉掞紝缃戝叧杩涘叆鎹㈢粦妯″紡锛屽己鍒剁綉鍏崇粦瀹氬埌褰撳墠APP
var btnMsg2 = new NormalViewControl(930, 100, true);
btnMsg2.X = Application.GetRealWidth(75);
btnMsg2.Y = btnMsg1.Bottom + Application.GetRealHeight(35);
@@ -118,7 +117,7 @@
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
btnMsg2.IsMoreLines = true;
bodyFrameLayout.AddChidren(btnMsg2);
- //2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ //2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓婏紝鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏紝鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
var btnMsg3 = new NormalViewControl(930, 100, true);
btnMsg3.X = Application.GetRealWidth(75);
btnMsg3.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
index 35953ee..01f59ef 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
@@ -82,8 +82,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
};
//涓嬩竴姝�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
index 9cbc6b4..f6735f4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
@@ -40,24 +40,23 @@
framePic.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";
bodyFrameLayout.AddChidren(framePic);
- //璺宠浆鍒扮Щ鍔ㄨ澶�
- var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
- btnMsg1.Y = framePic.Bottom + Application.GetRealHeight(248);
- btnMsg1.TextID = R.MyInternationalizationString.uJumpToMobileDevice;
- btnMsg1.TextAlignment = TextAlignment.Center;
- btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnMsg1);
- //WLAN璁剧疆杩炴帴瀹跺涵WiFi
- var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
- btnMsg2.Y = btnMsg1.Bottom;
- btnMsg2.TextID = R.MyInternationalizationString.uWlanConnectHomeWifi;
- btnMsg2.TextAlignment = TextAlignment.Center;
- btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnMsg2);
+ //璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ string[] strMsg = Language.StringByID(R.MyInternationalizationString.uAddUdpWirelessGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ int YY = framePic.Bottom + Application.GetRealHeight(128);
+ for (int i = 0; i < strMsg.Length; i++)
+ {
+ var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ btnMsg1.Y = YY;
+ btnMsg1.Text = strMsg[i];
+ btnMsg1.TextAlignment = TextAlignment.Center;
+ btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnMsg1);
+ YY = btnMsg1.Bottom;
+ }
//鍘昏缃�
var btnSettion = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnSettion.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
+ btnSettion.Y = YY + Application.GetRealHeight(12);
btnSettion.TextSize = 12;
btnSettion.TextAlignment = TextAlignment.Center;
btnSettion.TextColor = 0xff0075ff;
@@ -79,8 +78,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Udp");
};
//涓嬩竴姝�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
index cc5c2c2..5a3c676 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -54,11 +54,8 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //闀挎寜缃戝叧HID/WCFG鎸夐敭20绉�
- //绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵��
- //绯荤粺鐏瘡绉掗棯鐑佷竴娆�
- //鍒欒繛鎺ユ垚鍔�
- string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddUdpWirelessGatewayMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ //缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
+ string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddUdpWirelessGatewayMsg1).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = Application.GetRealHeight(1037);
foreach (var msg in ArryMsg)
{
@@ -111,7 +108,7 @@
btnMsg1.Y = picGwImage.Bottom + Application.GetRealHeight(112);
btnMsg1.TextID = R.MyInternationalizationString.uSearchGatewayFailMsg1;
bodyFrameLayout.AddChidren(btnMsg1);
- //1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ //1.鐭寜HID/WCFG鎸夐敭锛岀郴缁熸寚绀虹伅蹇棯3绉掞紝缃戝叧杩涘叆鎹㈢粦妯″紡锛屽己鍒剁綉鍏崇粦瀹氬埌褰撳墠APP
var btnMsg2 = new NormalViewControl(930, 100, true);
btnMsg2.X = Application.GetRealWidth(75);
btnMsg2.Y = btnMsg1.Bottom + Application.GetRealHeight(35);
@@ -120,7 +117,7 @@
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
btnMsg2.IsMoreLines = true;
bodyFrameLayout.AddChidren(btnMsg2);
- //2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ //2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓婏紝鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏紝鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
var btnMsg3 = new NormalViewControl(930, 100, true);
btnMsg3.X = Application.GetRealWidth(75);
btnMsg3.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index fc956cb..8639828 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -105,8 +105,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Udp");
};
//涓嬩竴姝�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 86deaa9..58c9eba 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -93,6 +93,15 @@
//杩涘害鏉�
this.ShowProgressBar();
+ //鑾峰彇鑷姩澶囦唤鐨勬暟鎹�
+ var pageAuto = await HdlBackupLogic.Current.GetBackupListNameFromDB(3, HdlGatewayLogic.Current.GetGatewayId(realGateway));
+ if (pageAuto == null)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return;
+ }
+
//浠庝簯绔幏鍙栨暟鎹�
var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, HdlGatewayLogic.Current.GetGatewayId(realGateway));
if (pageData == null)
@@ -108,14 +117,24 @@
{
listView.RemoveAll();
listView.RecoverHeight();
+
+ //鑷姩澶囦唤鐨処D
+ string autoID = string.Empty;
+ if (pageAuto.Count > 0)
+ {
+ autoID = pageAuto[0].Id;
+ //娣诲姞鑷姩澶囦唤琛�
+ this.AddRowlayout(pageAuto[0], pageData.Count > 0, true);
+ }
+
for (int i = 0; i < pageData.Count; i++)
{
//娣诲姞澶囦唤琛�
- this.AddRowlayout(pageData[i], i != pageData.Count - 1);
+ this.AddRowlayout(pageData[i], i != pageData.Count - 1, false);
}
this.btnDownload?.RemoveFromParent();
- if (pageData.Count > 0)
+ if (pageData.Count > 0 || pageAuto.Count > 0)
{
//涓嬭浇
this.btnDownload = new BottomClickButton();
@@ -134,7 +153,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//璇诲彇澶囦唤鏂囨。
- bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId);
+ bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
@@ -149,7 +168,6 @@
//璋冩暣鐪熷疄楂樺害
listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
}
-
});
}
@@ -162,7 +180,8 @@
/// </summary>
/// <param name="fileInfo"></param>
/// <param name="addLine"></param>
- private void AddRowlayout(BackupListNameInfo fileInfo, bool addLine)
+ /// <param name="isAuto"></param>
+ private void AddRowlayout(BackupListNameInfo fileInfo, bool addLine, bool isAuto)
{
var rowLayout = new RowLayoutControl(listView.rowSpace / 2);
listView.AddChidren(rowLayout);
@@ -172,6 +191,11 @@
txtText.TextSize = 15;
txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;
rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
+ if (isAuto == true)
+ {
+ txtText.TextID = R.MyInternationalizationString.uAutoBackup;
+ }
+
//鏃堕棿 2019-11-11T11:31:01
var btnTime = rowLayout.frameTable.AddLeftCaption("", 600, 50, true);
btnTime.Y = Application.GetRealHeight(72) + rowLayout.chidrenYaxis;
@@ -211,13 +235,17 @@
}
};
- //缂栬緫
- var btnEditor = rowLayout.AddEditorControl();
- btnEditor.ButtonClickEvent += (sender, e) =>
+ //鑷姩澶囦唤涓嶅厑璁哥紪杈�
+ if (isAuto == false)
{
- //鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
- this.ShowEditorBackupForm(fileInfo);
- };
+ //缂栬緫
+ var btnEditor = rowLayout.AddEditorControl();
+ btnEditor.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
+ this.ShowEditorBackupForm(fileInfo);
+ };
+ }
//鍒犻櫎
var btnDelete = rowLayout.AddDeleteControl();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index d26382c..29e6cb7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -52,6 +52,10 @@
this.AddRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
+ this.AddRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 700);
+
+ this.AddRowControl("璐﹀彿GUID", 400, Common.Config.Instance.Home.MainUserDistributedMark, 700);
+
this.AddRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
this.AddRowControl("璐﹀彿绫诲瀷", 400, Common.Config.Instance.Home.AccountType.ToString(), 400);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index 73fbfe7..65a204d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -245,9 +245,37 @@
//寮�鍏�
var btnSwitch = row.AddMostRightSwitchIcon();
+ if (this.memberInfo.IsAllowRemoteCtrl == true)
+ {
+ btnSwitch.IsSelected = true;
+ }
btnSwitch.ButtonClickEvent += (sender, e) =>
{
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ var pra = new
+ {
+ HouseDistributedMark = Common.Config.Instance.Home.Id,
+ DistributedMark = this.memberInfo.DistributedMark,
+ IsAllowRemoteCtrl = !btnSwitch.IsSelected,
+ IsOtherAccountCtrl = Common.Config.Instance.isAdministrator
+ };
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+ var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl", true, pra);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+
+ if (result == false)
+ {
+ return;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ });
+ });
+
};
//搴曠嚎
row.AddBottomLine();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
index 12e1f94..1e5dfa7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
@@ -82,7 +82,7 @@
{
//瑙ｉ櫎缁戝畾
bindTipText = Language.StringByID(R.MyInternationalizationString.uUnBinded);
- bindNameText = dicBindData["Wechat"].Nickname;
+ bindNameText = dicBindData["Wechat"].UserName;
}
var rowChat = new FrameRowControl(listView.rowSpace / 2);
rowChat.Y = Application.GetRealHeight(11);
@@ -93,7 +93,7 @@
btnChat.TextSize = 15;
rowChat.AddChidren(btnChat, ChidrenBindMode.BindEventOnly);
//鏈巿鏉� OR 鍚嶅瓧
- var btnTip1 = rowChat.AddLeftCaption(bindNameText, 400, 49);
+ var btnTip1 = rowChat.AddLeftCaption(bindNameText == null ? string.Empty : bindNameText, 400, 50);
btnTip1.Y = Application.GetRealHeight(72) + rowChat.chidrenYaxis;
btnTip1.TextSize = 12;
btnTip1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -188,23 +188,6 @@
this.dicBindData[info.Platform] = info;
}
- //鑾峰彇鐢ㄦ埛鏄电О
- if (this.dicBindData.ContainsKey("Wechat") == true)
- {
- var myData = this.dicBindData["Wechat"];
- //缁欎釜榛樿鍊�
- myData.Nickname = "Wechat";
- var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + myData.AccessToken;
- strUrl += "&openid=" + myData.OpenID;
- var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
- if (byteData != null)
- {
- var receipData = System.Text.Encoding.UTF8.GetString(byteData);
- var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<NicknameInfo>(receipData);
- myData.Nickname = nickData.nickname;
- }
- }
-
return true;
}
@@ -238,7 +221,19 @@
/// <param name="infoData"></param>
private async void BindWechat(string accessToken, string refreshToken, string openID)
{
- var pra = new { AccessToken = accessToken, RefreshToken = refreshToken, OpenID = openID };
+ //鑾峰彇寰俊鏄电О
+ var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken;
+ strUrl += "&openid=" + openID;
+ var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
+ if (byteData == null)
+ {
+ return;
+ }
+ var receipData = System.Text.Encoding.UTF8.GetString(byteData);
+ var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<NicknameInfo>(receipData);
+
+ //鍏堜笂浼犲井淇¤祫鏂�
+ var pra = new { AccessToken = accessToken, RefreshToken = refreshToken, OpenID = openID, UserName = nickData.nickname };
var listNotShow = new List<string>() { "UserNoBindAccount" };
var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/InsertOrUpdateAuthUser", false, pra, listNotShow);
if (result == false)
@@ -246,6 +241,7 @@
return;
}
+ //鍐嶆墽琛岀粦瀹�
var pra2 = new { AccountGuid = Common.Config.Instance.Guid, OpenID = openID };
result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAuthUserToAccount", false, pra2);
if (result == true)
@@ -308,20 +304,9 @@
/// </summary>
public string Platform = string.Empty;
/// <summary>
- /// 鏄电О(闇�瑕佽嚜宸卞幓鑾峰彇)
- /// </summary>
- public string Nickname = string.Empty;
- }
-
- /// <summary>
- /// 鏄电О淇℃伅
- /// </summary>
- private class NicknameInfo
- {
- /// <summary>
/// 鏄电О
/// </summary>
- public string nickname = string.Empty;
+ public string UserName = string.Empty;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 160f090..517fe26 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -692,6 +692,12 @@
var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
foreach (var gateway in listGateway)
{
+ ZigBee.Device.ZbGateway realWay = null;
+ if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)
+ {
+ //閿欒:缃戝叧瀵硅薄涓㈠け
+ continue;
+ }
var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude);
if (result == false)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs
index 83f737d..ab7fc66 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs
@@ -135,23 +135,17 @@
}
//杩涘害鏉�
- var seekBar = new HorizontalSeekBar();
- seekBar.Enable = false;
+ var seekBar = new SeekBarControl(919);
seekBar.Y = Application.GetRealHeight(268);
- seekBar.Gravity = Gravity.CenterHorizontal;
- seekBar.Width = Application.GetRealWidth(919);
- seekBar.Height = Application.GetRealHeight(89);
- seekBar.Max = 100;
- seekBar.BackgroundColor = 0xfff5f5f5;
- seekBar.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar.ProgressColor = 0xfffdb500;
+ seekBar.ProgressBarColor = 0xfffdb500;
+ seekBar.Enable = false;
if (dicTaskinfo.ContainsKey(5) == true)
{
//5:鐧惧垎姣旇皟鑺�
seekBar.Progress = dicTaskinfo[5].Data2;
}
detailBackFrame.AddChidren(seekBar);
- seekBar.ProgressChanged += (sender, value) =>
+ seekBar.ProgressChangedEvent += (div, value) =>
{
btnPersent.Text = value + "%";
};
@@ -196,7 +190,6 @@
btnOpenSelect.Visible = false;
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
dicTaskinfo.Remove(0);
}
@@ -209,7 +202,6 @@
//寮� 鍙敤
btnOpen.TextColor = UserCenterColor.Current.TextColor1;
seekBar.Enable = true;
- seekBar.ProgressColor = 0xfffdb500;
if (seekBar.Progress == 0)
{
seekBar.Progress = 100;
@@ -249,7 +241,6 @@
//寮� 涓嶅彲鐢�
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
//绉婚櫎鎵撳紑
dicTaskinfo.Remove(0);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
index 37e9e40..c5f6d17 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
@@ -135,23 +135,17 @@
}
//杩涘害鏉�
- var seekBar = new HorizontalSeekBar();
- seekBar.Enable = false;
+ var seekBar = new SeekBarControl(919);
seekBar.Y = Application.GetRealHeight(268);
- seekBar.Gravity = Gravity.CenterHorizontal;
- seekBar.Width = Application.GetRealWidth(919);
- seekBar.Height = Application.GetRealHeight(89);
- seekBar.Max = 100;
- seekBar.BackgroundColor = 0xfff5f5f5;
- seekBar.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar.ProgressColor = 0xfffdb500;
+ seekBar.ProgressBarColor = 0xfffdb500;
+ seekBar.Enable = false;
if (dicTaskinfo.ContainsKey(3) == true)
{
//3:浜害璋冭妭
seekBar.Progress = dicTaskinfo[3].Data1;
}
detailBackFrame.AddChidren(seekBar);
- seekBar.ProgressChanged += (sender, value) =>
+ seekBar.ProgressChangedEvent += (div, value) =>
{
btnPersent.Text = value + "%";
};
@@ -196,7 +190,6 @@
btnOpenSelect.Visible = false;
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
dicTaskinfo.Remove(1);
}
@@ -209,7 +202,6 @@
//寮� 鍙敤
btnOpen.TextColor = UserCenterColor.Current.TextColor1;
seekBar.Enable = true;
- seekBar.ProgressColor = 0xfffdb500;
if (seekBar.Progress == 0)
{
seekBar.Progress = 100;
@@ -247,7 +239,6 @@
//寮� 涓嶅彲鐢�
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
dicTaskinfo[1] = new Safeguard.TaskListInfo();
dicTaskinfo[1].TaskType = 1;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index df671d2..c203417 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -210,7 +210,8 @@
//娣诲姞鍚戝彸鍥炬爣
rowOther.AddRightArrow();
//寰俊銆丵Q
- var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);
+ //var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);
+ var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChat), 500);
btnQQ.IsBold = true;
rowOther.ButtonClickEvent += (sender, e) =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 6e90761..db20b28 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -426,6 +426,10 @@
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Floor.png"
};
+ if (Config.Instance.Home.FloorDics.Count > 0)
+ {
+ topFrameLayout.AddChidren(floor);
+ }
floorBtn = new Button
{
@@ -437,13 +441,10 @@
TextColor = ZigbeeColor.Current.GXCTextColor,
Text = Config.Instance.Home.GetCurrentFloorName
};
-
- if(Config.Instance.Home.FloorDics.Count>0)
+ if (Config.Instance.Home.FloorDics.Count > 0)
{
- topFrameLayout.AddChidren(floor);
topFrameLayout.AddChidren(floorBtn);
}
-
var messageBtn = new Button()
{
@@ -645,7 +646,7 @@
};
AddChidren(roomPageView);
//涓庡睆骞曡竟妗嗙殑杈硅窛
- roomPageView.TCBJ = Application.GetRealWidth(181);
+ roomPageView.TCBJ = Application.GetRealWidth(112);
//涓や釜page涔嬮棿鐨勯棿璺�
roomPageView.JMBJ = Application.GetRealWidth(69);
@@ -911,7 +912,7 @@
{
Y = noFunction.Bottom,
Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
+ Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
IsMoreLines = true
};
@@ -1631,7 +1632,7 @@
{
Y = noScene.Bottom,
Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
+ Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
IsMoreLines = true
};
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 6f8fb12..63af97b 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -39,7 +39,7 @@
/// <summary>
/// 搴曢儴鎸夐挳鏂囧瓧鐨刌鍊�
/// </summary>
- private static readonly int tabBarEnumName_Y = 104;
+ private static readonly int tabBarEnumName_Y = 98;
#endregion
#region 鈼� 鎺ュ彛____________________________
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index 31d21c8..fd5ef37 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -118,7 +118,7 @@
ZbGateway.IsRemote = true;
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
{
- ZbGateway.GateWayList[i].DisConnectLocalMqttClient("1");
+ ZbGateway.GateWayList[i].DisConnectLocalMqttClient("1");
}
}
@@ -279,13 +279,13 @@
try
{
//瀹氭椂妫�娴嬭繙绋嬭繛鎺ユ儏鍐�
- await ZbGateway.StartRemoteMqtt();
+ await ZbGateway.StartRemoteMqtt();
if (!ZbGateway.IsRemote)
{
System.Threading.Thread.Sleep(500);
continue;
}
- var gateWayList =ZbGateway.GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
+ var gateWayList = ZbGateway.GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
if (gateWayList.Count == 1)
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index 0def10a..431fa5b 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -15,11 +15,11 @@
{
return await System.Threading.Tasks.Task.Run(async () =>
{
- var result = new AddedDeviceBindResponseAllData();
+ AddedDeviceBindResponseAllData result = null;
var mainGateway = ZbGateway.MainGateWay;
if (mainGateway == null)
{
- result.errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�";
+ result = new AddedDeviceBindResponseAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
return result;
}
Action<string, string> action = (topic, message) =>
@@ -47,7 +47,7 @@
var tempBindList = Newtonsoft.Json.Linq.JArray.Parse(jobject["Data"]["BindList"].ToString());
if (tempBindList == null)
{
- result.errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�";
+ result = new AddedDeviceBindResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
@@ -59,22 +59,22 @@
}
if (dataBindRes != null)
{
- result.addedDeviceBindResponseData = dataBindRes;
+ result = new AddedDeviceBindResponseAllData { addedDeviceBindResponseData = dataBindRes };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
}
- else if (topic == gatewayID + "/" + "Bind/BindResult")
- {
- 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 = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddBindResultResponseData>(jobject["Data"].ToString());
+ //else if (topic == gatewayID + "/" + "Bind/BindResult")
+ //{
+ // 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 = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
+ // var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddBindResultResponseData>(jobject["Data"].ToString());
- if (tempData != null)
- {
- result.addBindResultResponseData = tempData;
- }
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- }
+ // if (tempData != null)
+ // {
+ // result = new AddedDeviceBindResponseAllData { addBindResultResponseData = tempData };
+ // }
+ // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
+ //}
};
mainGateway.Actions += action;
DebugPrintLog("Bind/SetBind_Actions 鍚姩" + "_" + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
@@ -111,7 +111,6 @@
{ "BindList", bindList }
};
jObject.Add("Data", data);
- //ZbGateway.MainGateWay.CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo?.gwID;
mainGateway.Send("Bind/SetBind", jObject.ToString());
}
}
@@ -120,42 +119,54 @@
}
var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 20 * 1000)
{
- await System.Threading.Tasks.Task.Delay(100);
- if (result == null || result.addedDeviceBindResponseData == null)
- {
- continue;
- }
- if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 1).Count)
- {
- if (result.addBindResultResponseData != null)
- {
- break;
- }
- }
- else if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 2).Count)
- {
- if (result.addBindResultResponseData != null)
- {
- break;
- }
- }
- else if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
- {
- if (result.addBindResultResponseData != null)
- {
- break;
- }
- }
- else
+ await System.Threading.Tasks.Task.Delay(10);
+ if (result != null)
{
break;
}
}
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- result.errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔";
+ result = new AddedDeviceBindResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ }
+ //while ((DateTime.Now - dateTime).TotalMilliseconds < 20*1000)
+ //{
+ //await System.Threading.Tasks.Task.Delay(100);
+ //if (result == null || result.addedDeviceBindResponseData == null)
+ //{
+ // continue;
+ //}
+ //if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 1).Count)
+ //{
+ // if (result.addBindResultResponseData != null)
+ // {
+ // break;
+ // }
+ //}
+ //else if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 2).Count)
+ //{
+ // if (result.addBindResultResponseData != null)
+ // {
+ // break;
+ // }
+ //}
+ //else if (0 < result.addedDeviceBindResponseData.BindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
+ //{
+ // if (result.addBindResultResponseData != null)
+ // {
+ // break;
+ // }
+ //}
+ //else
+ //{
+ // break;
+ //}
+ //}
+ if ((DateTime.Now - dateTime).TotalMilliseconds > 20 * 1000)
+ {
+ result = new AddedDeviceBindResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
System.Console.WriteLine($"Bind/SetBind_Actions 閫�鍑� { System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond}");
@@ -203,7 +214,12 @@
/// <summary>
///缁戝畾鍒楄〃 锛屽綋Status=0鏃跺瓨鍦�
/// </summary>
- public List<AddBindListResponseObj> BindList = new List<AddBindListResponseObj>();
+ public List<BindListResponseObj> BindList = new List<BindListResponseObj>();
+ /// <summary>
+ /// 0锛氱粦瀹氭墍鏈夌洰鏍囨垚鍔�
+ ///<para>1锛氱粦瀹氱洰鏍囧け璐ワ紝缁戝畾璁惧鐩爣鏈夋紡鎺�</para>
+ /// </summary>
+ public int Result;
}
/// <summary>
@@ -1115,7 +1131,7 @@
catch { }
var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 25 * 1000)
{
await System.Threading.Tasks.Task.Delay(10);
if (d != null)
@@ -1123,8 +1139,8 @@
break;
}
}
- //涓�閿竻闄ょ洰鏍囷紝浼氬洜涓虹洰鏍囨暟閲忓鑰屽姞闀挎椂闂达紝鐩墠鏆傚畾10绉�
- if ((DateTime.Now - dateTime).TotalMilliseconds > 10 * 1000)
+ //涓�閿竻闄ょ洰鏍囷紝浼氬洜涓虹洰鏍囨暟閲忓鑰屽姞闀挎椂闂达紝鐩墠鏆傚畾20绉�
+ if ((DateTime.Now - dateTime).TotalMilliseconds > 25 * 1000)
{
d = new ClearBindInfoResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index 0bc309a..9e5e423 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -16,7 +16,7 @@
/// <summary>
/// 鎸夐敭妯″紡锛堢鏈夊姛鑳斤級
/// </summary>
- public int panelMode = -1;
+ public int panelMode = 65535;
/// <summary>
///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�
/// </summary>
@@ -2527,7 +2527,7 @@
///閰嶇疆闈㈡澘鍔熻兘
///<para>value:缁欓潰鏉块厤缃殑妯″紡</para>
/// </summary>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> ConfigureHdlKeyValueAsync(KeyMode value)
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> ConfigureHdlKeyValueAsync(KeyMode value, int clusterID = 6)
{
if (Gateway == null)
{
@@ -2576,7 +2576,7 @@
System.Console.WriteLine("SetWritableValue_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
try
{
- var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", 6 }, { "Command", 120 } };
+ var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", clusterID }, { "Command", 120 } };
var data = new JObject { { "Undivided", 0 }, { "AttributeId", 6533 }, { "AttributeDataType", 33 }, { "AttributeData", (int)value } };
jObject.Add("Data", data);
Gateway.Send("SetWritableValue", jObject.ToString());
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index dffdf80..6c9d52c 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -60,6 +60,12 @@
/// <value><c>true</c> if is remote; otherwise, <c>false</c>.</value>
public static bool IsRemote;
+ /// <summary>
+ /// 鏄惁鎷ユ湁杩滅▼杩炴帴鐨勬潈闄�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public static bool AllowRemoteCtrl = true;
+
/// <summary>
/// 缃戝叧淇濆瓨璺緞
/// </summary>
@@ -3229,6 +3235,11 @@
/// <returns></returns>
static async System.Threading.Tasks.Task initGateWayBaseInfomation()
{
+ if (AllowRemoteCtrl == false)
+ {
+ //娌℃湁杩滅▼杩炴帴鐨勬潈闄�
+ return;
+ }
string loginToken = Config.Instance.Token;
if (Config.Instance.Home.IsOthreShare == true)
{
@@ -3271,11 +3282,13 @@
var statuCode = jobject["StateCode"].ToString();
if (statuCode != "Success")
{
- //Log鍑哄姏
- Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, "鎺ュ彛璁块棶澶辫触鈽咃細App/GetSingleHomeGatewayPagger " + statuCode);
//搴忓垪鍖栧璞�
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra2);
- Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, "鍙傛暟锛歕r\n" + requestJson);
+ //Log鍑哄姏
+ string errorMsg = "鎺ュ彛璁块棶澶辫触鈽咃細App/GetSingleHomeGatewayPagger " + statuCode + "\r\n";
+ errorMsg += "鍙傛暟锛歕r\n" + requestJson;
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, errorMsg);
+ return;
}
var responseData = jobject["ResponseData"];
@@ -3323,10 +3336,12 @@
/// <param name="brokerName">Broker name.</param>
public static async System.Threading.Tasks.Task StartRemoteMqtt()
{
- if (remoteMqttIsConnecting
- || !Shared.Common.Config.Instance.IsLogin
- || Shared.Common.Config.Instance.HomeId == ""
- || remoteIsConnected)
+ //杩藉姞锛氭病鏈夎繙绋嬭繛鎺ョ殑鏉冮檺
+ if (AllowRemoteCtrl == false
+ || remoteMqttIsConnecting
+ || !Shared.Common.Config.Instance.IsLogin
+ || Shared.Common.Config.Instance.HomeId == ""
+ || remoteIsConnected)
{
return;
}
@@ -3444,6 +3459,12 @@
if (result != null)
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(Encoding.UTF8.GetString(result));
+ if (jobject["StateCode"].ToString() == "NotAllowRemoteCtrl")
+ {
+ //娌℃湁杩滅▼杩炴帴鐨勬潈闄�
+ AllowRemoteCtrl = false;
+ return;
+ }
var responseData = jobject["ResponseData"];
if (responseData != null)
{
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 0187118..140ad23 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -307,6 +307,8 @@
public readonly static int DoorlockPasswordDispear = 220;
public readonly static int BindUnknownError = 221;
public readonly static int OffLineScene = 222;
+ public readonly static int SureClearKeyModeAndTargets = 223;
+ public readonly static int BindDeviceTargetIsEmpty = 224;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -573,7 +575,10 @@
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
public readonly static int selecfoolr = 5368;
-
+ public readonly static int delaytip = 5369;
+ public readonly static int usertip = 5370;
+ public readonly static int scenetip = 5371;
+ public readonly static int securitytip = 5372;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -1191,6 +1196,8 @@
/// </summary>
public const int TheSceneIsDelaying = 13149;
+
+
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
@@ -1223,6 +1230,16 @@
/// 璇锋竻娲佹护缃�
/// </summary>
public const int NeedCleanAC = 13511;
+
+ /// <summary>
+ /// 娌″姛鑳� 璇峰厛娣诲姞
+ /// </summary>
+ public const int NoFunction_Tip = 13600;
+ /// <summary>
+ /// 娌″満鏅� 璇峰厛娣诲姞
+ /// </summary>
+ public const int NoScene_Tip = 13601;
+
@@ -1439,7 +1456,7 @@
/// </summary>
public const int uPleaseWait = 15052;
/// <summary>
- /// 璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ /// 璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
/// </summary>
public const int ConfirmLineConnectMsg = 15053;
/// <summary>
@@ -4035,11 +4052,11 @@
/// </summary>
public const int uSearchGatewayFailMsg1 = 15779;
/// <summary>
- /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ /// 1.鐭寜HID/WCFG鎸夐敭,绯荤粺鎸囩ず鐏揩闂�3绉�,缃戝叧杩涘叆鎹㈢粦妯″紡,寮哄埗缃戝叧缁戝畾鍒板綋鍓岮PP
/// </summary>
public const int uSearchGatewayFailMsg2 = 15780;
/// <summary>
- /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ /// 2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓�,鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏�,鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
/// </summary>
public const int uSearchGatewayFailMsg3 = 15781;
/// <summary>
@@ -4543,15 +4560,15 @@
/// </summary>
public const int uWlanConnectHomeWifi = 15906;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
- public const int uAddUdpWirelessGatewayMsg = 15907;
+ public const int uAddUdpWirelessGatewayMsg1 = 15907;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// 璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
/// </summary>
public const int uAddApWirelessGatewayMsg1 = 15908;
/// <summary>
- /// 璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
/// </summary>
public const int uAddApWirelessGatewayMsg2 = 15909;
/// <summary>
@@ -4559,11 +4576,11 @@
/// </summary>
public const int uPleaseInputHomeWifiAccount = 15910;
/// <summary>
- /// 璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+ /// 鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
/// </summary>
public const int uAddApWirelessGatewayMsg3 = 15911;
/// <summary>
- /// 绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
public const int uAddApWirelessGatewayMsg4 = 15912;
/// <summary>
@@ -4842,6 +4859,71 @@
/// 姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
/// </summary>
public const int uShardContentGetting = 15983;
+ /// <summary>
+ /// 璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddUdpWirelessGatewayMsg2 = 15984;
+ /// <summary>
+ /// 缃戝叧娣诲姞鎸囧紩
+ /// </summary>
+ public const int uAddGatewayGuide = 15985;
+ /// <summary>
+ /// 1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+ /// </summary>
+ public const int uAddWiredGatewayHelp1 = 15986;
+ /// <summary>
+ /// 2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+ /// </summary>
+ public const int uAddWiredGatewayHelp2 = 15987;
+ /// <summary>
+ /// 缃戝叧纭欢闂甯姪
+ /// </summary>
+ public const int uGatewayHardDeviceHelp = 15988;
+ /// <summary>
+ /// 1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp1 = 15989;
+ /// <summary>
+ /// 2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp2 = 15990;
+ /// <summary>
+ /// 绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ /// </summary>
+ public const int uAddWirelessGatewayHelp1 = 15991;
+ /// <summary>
+ /// 2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp2 = 15992;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessUdpGatewayHelp1 = 15993;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessApGatewayHelp1 = 15994;
+ /// <summary>
+ /// 1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp1 = 15995;
+ /// <summary>
+ /// 2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp2 = 15996;
+ /// <summary>
+ /// 3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp3 = 15997;
+ /// <summary>
+ /// 璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+ /// </summary>
+ public const int uGotoResidenceAndSetLocation = 15998;
+ /// <summary>
+ /// 鏈煡妤煎眰
+ /// </summary>
+ public const int uUnKnownFloor = 15999;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5071,7 +5153,7 @@
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee寰柇浜戞帶鍒跺櫒
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛氭櫤鑳界┖寮�
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index c36a795..bea5467 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -129,6 +129,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\InformationEditorControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\RoomDeviceGroupMenuControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SceneFunctionSwitchControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SeekBarControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\VerificationCodeControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalFrameRefreshControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalListRefreshControl.cs" />
@@ -187,6 +188,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UnLockMethod.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserDoorLockPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserManagement.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\AddGatewayHelpForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection1Form.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection2Form.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection3Form.cs" />
--
Gitblit v1.8.0