From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 10:56:13 +0800
Subject: [PATCH] 合并了全部的代码，IOS 图片需要从新引入工程
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 35
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 7526 ++++++++++++++--------------
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 31
ZigbeeApp/Shared/Common/DeviceUI.cs | 125
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 45
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 80
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs | 15
ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs | 545 ++
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 250
ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 49
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs | 81
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 2
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 30
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFFSelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorDoorWindowDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 84
ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs | 25
ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png | 0
ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/Plug.png | 0
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OnOff.png | 0
ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySearching.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 61
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFF.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs | 83
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs | 35
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs | 12
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ON.png | 0
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ONSelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 71
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorWaterDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 95
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 51
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs | 151
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 2
ZigbeeApp/Shared/Shared.projitems | 12
ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/AddGatewaySuccess.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 59
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 1125 ---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainSiphonateDirectionForm.cs | 35
ZigbeeApp/GateWay.Ios/Resources/Language.ini | 35
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFFSelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs | 55
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 44
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs | 31
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RepeaterZigbeeDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorFireDirectionForm.cs | 36
ZigbeeApp/Shared/Common/CommonPage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs | 15
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 159
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/AddGatewaySuccess.png | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 226
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs | 99
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySearching.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 16
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs | 52
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs | 35
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs | 61
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs | 165
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/PlugSelected.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/PlugSelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 115
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFF.png | 0
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 626 ++
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs | 279 +
ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs | 6
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/Plug.png | 0
ZigbeeApp/Shared/R.cs | 96
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayCoordinatorInfoForm.cs | 151
ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayVirtualDriveInfoForm.cs | 138
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs | 17
ZigbeeApp/Shared/Common/Device.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 275
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayAddSuccessForm.cs | 109
ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs | 628 ++
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 295
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 1
/dev/null | 83
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OnOff.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs | 39
ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ONSelected.png | 0
ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ON.png | 0
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs | 2
ZigbeeApp/Shared/Common/Room.cs | 30
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs | 12
112 files changed, 8,916 insertions(+), 6,366 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index f03d643..c8a6407 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -206,7 +206,19 @@
200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
202=涓�妤�
-203=缃戝叧鍥炲瓒呮椂
+203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
+204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
+206=鍐荤粨澶辫触
+207=瑙ｅ喕澶辫触
+208=鍏变韩
+209=寮�閿佹柟寮忎笉鍖归厤锛岃褰曞叆褰撳墠鐣岄潰鐨勫紑閿佹柟寮忋��
+210=纭畾鎺堟潈璇ユ垚鍛樻嫢鏈夎繙绋嬪紑閿佹潈闄�
+211=鎺堟潈鎴愬姛
+212=鎺堟潈澶辫触
+213=璇ユ垚鍛樿鍐荤粨锛屼笉鑳芥坊鍔犲紑閿佹柟寮�
+214=鏈巿鏉�
+
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -589,6 +601,7 @@
10000=HDL Home
+10001=甯哥敤
10100=鎵嬫満鍙�
10101=閭
@@ -798,7 +811,7 @@
15080=鎸夐敭闈㈡澘
15081=浼犳劅鍣�
15083=鐕冩皵浼犳劅鍣�
-15084=瀹夐槻鍔熻兘
+15084=鏈垎閰�
15085=璁惧绫诲瀷
15086=璁惧淇℃伅
15087=璁惧鍚嶇О
@@ -1186,14 +1199,14 @@
15518=鐢垫睜鐢甸噺浣�
15519=璁惧琚媶闄�
15520=缃戝叧绫诲瀷
-15521=璁惧纭欢鐗堟湰
+15521=纭欢鐗堟湰
15522=缃戝叧鍥轰欢鐗堟湰
15523=缃戝叧纭欢鐗堟湰
15524=鍗忚皟鍣ㄥ浐浠剁増鏈�
15525=鍗忚皟鍣ㄧ‖浠剁増鏈�
15526=璁惧鍥轰欢鐗堟湰
15527=璁惧闀滃儚ID
-15528=缃戝叧闀滃儚ID
+15528=闀滃儚ID
15529=铏氭嫙椹卞姩闀滃儚ID
15530=铏氭嫙椹卞姩鍥轰欢鐗堟湰
15531=铏氭嫙椹卞姩纭欢鐗堟湰
@@ -1268,9 +1281,7 @@
15611=鍘昏缃�
15612=璇风‘淇濇墜鏈哄凡缁忛摼鎺IFI
15614=璇烽�夋嫨缃戠粶
-15615=鍚� 绉�
-15616=瀵� 鐮�
-15617=璇疯緭鍏ョ綉缁滃瘑鐮�
+15617=璇疯緭鍏ifi瀵嗙爜
15618=瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
15619=璇风偣鎸夋棤绾跨綉鍏充笂鐨勬寜閿�
15620=浣跨綉鍏宠繘鍏ラ厤缃戠姸鎬�
@@ -1551,6 +1562,16 @@
15895=璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
15896=璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
15897=鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+15898=鑾峰彇绌鸿皟妯″紡澶辫触
+15899=璁剧疆绌鸿皟妯″紡澶辫触
+15900=缁х画娣诲姞缃戝叧
+15901=杩斿洖涓婚〉
+15902=娣诲姞鏅鸿兘缃戝叧鎴愬姛
+15903=UDP妯″紡(鎺ㄨ崘)
+15904=AP妯″紡
+15905=璺宠浆鍒扮Щ鍔ㄨ澶�
+15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
+
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/AddGatewaySuccess.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/AddGatewaySuccess.png
new file mode 100755
index 0000000..1aa7a5c
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/AddGatewaySuccess.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png
index a35b196..f11d3c7 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1Selected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1Selected.png
deleted file mode 100755
index 06ff779..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1Selected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png
index a312288..8100032 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6Selected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6Selected.png
deleted file mode 100755
index e5ba8ce..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6Selected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/SearchGateway.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/SearchGateway.png
deleted file mode 100755
index 6dedbe5..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/SearchGateway.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewaySelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewaySelected.png
deleted file mode 100755
index 06ff779..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewaySelected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySearching.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySearching.png
new file mode 100755
index 0000000..ac95145
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySearching.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySelected.png
deleted file mode 100755
index f8b3f62..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySelected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFF.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFF.png
new file mode 100755
index 0000000..7ee2648
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFF.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFFSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFFSelected.png
new file mode 100755
index 0000000..8614965
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OFFSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ON.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ON.png
new file mode 100755
index 0000000..12f5830
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ON.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ONSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ONSelected.png
new file mode 100755
index 0000000..a724963
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/ONSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OnOff.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OnOff.png
new file mode 100755
index 0000000..378f162
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/OnOff.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/Plug.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/Plug.png
new file mode 100755
index 0000000..4a8ec82
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/Plug.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/PlugSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/PlugSelected.png
new file mode 100755
index 0000000..9b7f865
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/PlugSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index a76c5db..334a2af 100755
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -230,12 +230,6 @@
<AndroidResource Include="Resources\xml\file_paths.xml" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\DroidLib\DroidLib.csproj">
- <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>
- <Name>DroidLib</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Language.ini" />
<AndroidAsset Include="Assets\Phone\Account\Account.png" />
<AndroidAsset Include="Assets\Phone\Account\Cancle.png" />
@@ -421,19 +415,14 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1Selected.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6Selected.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\SearchGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGatewayInstruct.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewaySelected.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WirelessGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayImage.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayInstruct.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySelected.png" />
<AndroidAsset Include="Assets\Phone\Instruct\DeviceSearch.png" />
<AndroidAsset Include="Assets\Phone\Instruct\DimmableLightOneLoad.png" />
<AndroidAsset Include="Assets\Phone\Instruct\IntelligentLocksH06C.png" />
@@ -1032,6 +1021,39 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\RollerShade\UpSelected.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\AddGatewaySuccess.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySearching.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\DroidLib\DroidLib.csproj">
+ <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>
+ <Name>DroidLib</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\OFF.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\OFFSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\ON.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\OnOff.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\ONSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\Plug.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\PlugSelected.png" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 353ac42..03c961d 100755
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019103101" android:installLocation="auto" android:versionName="1.0.19103101">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019110701" android:installLocation="auto" android:versionName="1.0.19110701">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 6d6037a..cdf3536 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -31,221 +31,221 @@
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 fingerprint_draw_off_animation_interpolator_0 = 2131034122;
- // aapt resource value: 0x7F01000B
- public const int fingerprint_draw_off_animation_interpolator_1 = 2130771979;
+ // aapt resource value: 0x7f05000b
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2131034123;
- // aapt resource value: 0x7F01000C
- public const int fingerprint_draw_off_ridge_1_path_animation = 2130771980;
+ // aapt resource value: 0x7f05000c
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2131034124;
- // aapt resource value: 0x7F01000D
- public const int fingerprint_draw_off_ridge_2_path_animation = 2130771981;
+ // aapt resource value: 0x7f05000d
+ public const int fingerprint_draw_off_ridge_2_path_animation = 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_ridge_5_path_animation = 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_ridge_6_path_animation = 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_7_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_on_animation_interpolator_0 = 2131034129;
- // aapt resource value: 0x7F010012
- public const int fingerprint_draw_on_animation_interpolator_1 = 2130771986;
+ // aapt resource value: 0x7f050012
+ public const int fingerprint_draw_on_animation_interpolator_1 = 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_on_ridge_1_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_on_ridge_2_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_ridge_5_path_animation = 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_ridge_6_path_animation = 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_7_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_error_state_to_fp_animation_interpolator_0 = 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_error_state_to_fp_animation_interpolator_1 = 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_error_state_to_fp_animation_interpolator_2 = 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_error_state_to_fp_animation_interpolator_3 = 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_4 = 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_5 = 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_group_1_animation = 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_group_2_animation = 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_path_1_animation = 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_path_2_animation = 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_path_3_animation = 2131034146;
- // aapt resource value: 0x7F010023
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772003;
+ // aapt resource value: 0x7f050023
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034147;
- // aapt resource value: 0x7F010024
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772004;
+ // aapt resource value: 0x7f050024
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034148;
- // aapt resource value: 0x7F010025
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772005;
+ // aapt resource value: 0x7f050025
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034149;
- // aapt resource value: 0x7F010026
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772006;
+ // aapt resource value: 0x7f050026
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034150;
- // aapt resource value: 0x7F010027
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772007;
+ // aapt resource value: 0x7f050027
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034151;
- // aapt resource value: 0x7F010028
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772008;
+ // aapt resource value: 0x7f050028
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034152;
- // aapt resource value: 0x7F010029
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772009;
+ // aapt resource value: 0x7f050029
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034153;
- // aapt resource value: 0x7F01002A
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772010;
+ // aapt resource value: 0x7f05002a
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034154;
- // aapt resource value: 0x7F01002B
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772011;
+ // aapt resource value: 0x7f05002b
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034155;
- // aapt resource value: 0x7F01002C
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772012;
+ // aapt resource value: 0x7f05002c
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034156;
- // aapt resource value: 0x7F01002D
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772013;
+ // aapt resource value: 0x7f05002d
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034157;
- // aapt resource value: 0x7F01002E
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772014;
+ // aapt resource value: 0x7f05002e
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034158;
- // aapt resource value: 0x7F01002F
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772015;
+ // aapt resource value: 0x7f05002f
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034159;
- // aapt resource value: 0x7F010030
- public const int fingerprint_fp_to_error_state_group_1_animation = 2130772016;
+ // aapt resource value: 0x7f050030
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2131034160;
- // aapt resource value: 0x7F010031
- public const int fingerprint_fp_to_error_state_group_2_animation = 2130772017;
+ // aapt resource value: 0x7f050031
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2131034161;
- // aapt resource value: 0x7F010032
- public const int fingerprint_fp_to_error_state_path_1_animation = 2130772018;
+ // aapt resource value: 0x7f050032
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2131034162;
- // aapt resource value: 0x7F010033
- public const int fingerprint_fp_to_error_state_path_2_animation = 2130772019;
+ // aapt resource value: 0x7f050033
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2131034163;
- // aapt resource value: 0x7F010034
- public const int fingerprint_fp_to_error_state_path_3_animation = 2130772020;
+ // aapt resource value: 0x7f050034
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2131034164;
- // aapt resource value: 0x7F010035
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772021;
+ // aapt resource value: 0x7f050035
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034165;
- // aapt resource value: 0x7F010036
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772022;
+ // aapt resource value: 0x7f050036
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034166;
- // aapt resource value: 0x7F010037
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772023;
+ // aapt resource value: 0x7f050037
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034167;
- // aapt resource value: 0x7F010038
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772024;
+ // aapt resource value: 0x7f050038
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034168;
- // aapt resource value: 0x7F010039
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772025;
+ // aapt resource value: 0x7f050039
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034169;
- // aapt resource value: 0x7F01003A
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772026;
+ // aapt resource value: 0x7f05003a
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034170;
- // aapt resource value: 0x7F01003B
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772027;
+ // aapt resource value: 0x7f05003b
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034171;
- // aapt resource value: 0x7F01003C
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772028;
+ // aapt resource value: 0x7f05003c
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034172;
- // aapt resource value: 0x7F01003D
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772029;
+ // aapt resource value: 0x7f05003d
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034173;
- // aapt resource value: 0x7F01003E
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772030;
+ // aapt resource value: 0x7f05003e
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034174;
- // aapt resource value: 0x7F01003F
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772031;
+ // aapt resource value: 0x7f05003f
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034175;
- // aapt resource value: 0x7F010040
- public const int move_in = 2130772032;
+ // aapt resource value: 0x7f050040
+ public const int move_in = 2131034176;
- // aapt resource value: 0x7F010041
- public const int move_out = 2130772033;
+ // aapt resource value: 0x7f050041
+ public const int move_out = 2131034177;
- // aapt resource value: 0x7F010042
- public const int pickerview_dialog_scale_in = 2130772034;
+ // aapt resource value: 0x7f050042
+ public const int pickerview_dialog_scale_in = 2131034178;
- // aapt resource value: 0x7F010043
- public const int pickerview_dialog_scale_out = 2130772035;
+ // aapt resource value: 0x7f050043
+ public const int pickerview_dialog_scale_out = 2131034179;
- // aapt resource value: 0x7F010044
- public const int pickerview_slide_in_bottom = 2130772036;
+ // aapt resource value: 0x7f050044
+ public const int pickerview_slide_in_bottom = 2131034180;
- // aapt resource value: 0x7F010045
- public const int pickerview_slide_out_bottom = 2130772037;
+ // aapt resource value: 0x7f050045
+ public const int pickerview_slide_out_bottom = 2131034181;
- // aapt resource value: 0x7F010046
- public const int tooltip_enter = 2130772038;
+ // aapt resource value: 0x7f050046
+ public const int tooltip_enter = 2131034182;
- // aapt resource value: 0x7F010047
- public const int tooltip_exit = 2130772039;
+ // aapt resource value: 0x7f050047
+ public const int tooltip_exit = 2131034183;
static Animation()
{
@@ -260,8 +260,8 @@
public partial class Array
{
- // aapt resource value: 0x7F020000
- public const int arc_colors_default = 2130837504;
+ // aapt resource value: 0x7f0e0000
+ public const int arc_colors_default = 2131623936;
static Array()
{
@@ -276,881 +276,881 @@
public partial class Attribute
{
- // aapt resource value: 0x7F030000
- public const int actionBarDivider = 2130903040;
+ // aapt resource value: 0x7f010049
+ public const int actionBarDivider = 2130772041;
- // aapt resource value: 0x7F030001
- public const int actionBarItemBackground = 2130903041;
+ // aapt resource value: 0x7f01004a
+ public const int actionBarItemBackground = 2130772042;
- // aapt resource value: 0x7F030002
- public const int actionBarPopupTheme = 2130903042;
+ // aapt resource value: 0x7f010043
+ public const int actionBarPopupTheme = 2130772035;
- // aapt resource value: 0x7F030003
- public const int actionBarSize = 2130903043;
+ // aapt resource value: 0x7f010048
+ public const int actionBarSize = 2130772040;
- // aapt resource value: 0x7F030004
- public const int actionBarSplitStyle = 2130903044;
+ // aapt resource value: 0x7f010045
+ public const int actionBarSplitStyle = 2130772037;
- // aapt resource value: 0x7F030005
- public const int actionBarStyle = 2130903045;
+ // aapt resource value: 0x7f010044
+ public const int actionBarStyle = 2130772036;
- // aapt resource value: 0x7F030006
- public const int actionBarTabBarStyle = 2130903046;
+ // aapt resource value: 0x7f01003f
+ public const int actionBarTabBarStyle = 2130772031;
- // aapt resource value: 0x7F030007
- public const int actionBarTabStyle = 2130903047;
+ // aapt resource value: 0x7f01003e
+ public const int actionBarTabStyle = 2130772030;
- // aapt resource value: 0x7F030008
- public const int actionBarTabTextStyle = 2130903048;
+ // aapt resource value: 0x7f010040
+ public const int actionBarTabTextStyle = 2130772032;
- // aapt resource value: 0x7F030009
- public const int actionBarTheme = 2130903049;
+ // aapt resource value: 0x7f010046
+ public const int actionBarTheme = 2130772038;
- // aapt resource value: 0x7F03000A
- public const int actionBarWidgetTheme = 2130903050;
+ // aapt resource value: 0x7f010047
+ public const int actionBarWidgetTheme = 2130772039;
- // aapt resource value: 0x7F03000B
- public const int actionButtonStyle = 2130903051;
+ // aapt resource value: 0x7f010064
+ public const int actionButtonStyle = 2130772068;
- // aapt resource value: 0x7F03000C
- public const int actionDropDownStyle = 2130903052;
+ // aapt resource value: 0x7f010060
+ public const int actionDropDownStyle = 2130772064;
- // aapt resource value: 0x7F03000D
- public const int actionLayout = 2130903053;
+ // aapt resource value: 0x7f0100bb
+ public const int actionLayout = 2130772155;
- // aapt resource value: 0x7F03000E
- public const int actionMenuTextAppearance = 2130903054;
+ // aapt resource value: 0x7f01004b
+ public const int actionMenuTextAppearance = 2130772043;
- // aapt resource value: 0x7F03000F
- public const int actionMenuTextColor = 2130903055;
+ // aapt resource value: 0x7f01004c
+ public const int actionMenuTextColor = 2130772044;
- // aapt resource value: 0x7F030010
- public const int actionModeBackground = 2130903056;
+ // aapt resource value: 0x7f01004f
+ public const int actionModeBackground = 2130772047;
- // aapt resource value: 0x7F030011
- public const int actionModeCloseButtonStyle = 2130903057;
+ // aapt resource value: 0x7f01004e
+ public const int actionModeCloseButtonStyle = 2130772046;
- // aapt resource value: 0x7F030012
- public const int actionModeCloseDrawable = 2130903058;
+ // aapt resource value: 0x7f010051
+ public const int actionModeCloseDrawable = 2130772049;
- // aapt resource value: 0x7F030013
- public const int actionModeCopyDrawable = 2130903059;
+ // aapt resource value: 0x7f010053
+ public const int actionModeCopyDrawable = 2130772051;
- // aapt resource value: 0x7F030014
- public const int actionModeCutDrawable = 2130903060;
+ // aapt resource value: 0x7f010052
+ public const int actionModeCutDrawable = 2130772050;
- // aapt resource value: 0x7F030015
- public const int actionModeFindDrawable = 2130903061;
+ // aapt resource value: 0x7f010057
+ public const int actionModeFindDrawable = 2130772055;
- // aapt resource value: 0x7F030016
- public const int actionModePasteDrawable = 2130903062;
+ // aapt resource value: 0x7f010054
+ public const int actionModePasteDrawable = 2130772052;
- // aapt resource value: 0x7F030017
- public const int actionModePopupWindowStyle = 2130903063;
+ // aapt resource value: 0x7f010059
+ public const int actionModePopupWindowStyle = 2130772057;
- // aapt resource value: 0x7F030018
- public const int actionModeSelectAllDrawable = 2130903064;
+ // aapt resource value: 0x7f010055
+ public const int actionModeSelectAllDrawable = 2130772053;
- // aapt resource value: 0x7F030019
- public const int actionModeShareDrawable = 2130903065;
+ // aapt resource value: 0x7f010056
+ public const int actionModeShareDrawable = 2130772054;
- // aapt resource value: 0x7F03001A
- public const int actionModeSplitBackground = 2130903066;
+ // aapt resource value: 0x7f010050
+ public const int actionModeSplitBackground = 2130772048;
- // aapt resource value: 0x7F03001B
- public const int actionModeStyle = 2130903067;
+ // aapt resource value: 0x7f01004d
+ public const int actionModeStyle = 2130772045;
- // aapt resource value: 0x7F03001C
- public const int actionModeWebSearchDrawable = 2130903068;
+ // aapt resource value: 0x7f010058
+ public const int actionModeWebSearchDrawable = 2130772056;
- // aapt resource value: 0x7F03001D
- public const int actionOverflowButtonStyle = 2130903069;
+ // aapt resource value: 0x7f010041
+ public const int actionOverflowButtonStyle = 2130772033;
- // aapt resource value: 0x7F03001E
- public const int actionOverflowMenuStyle = 2130903070;
+ // aapt resource value: 0x7f010042
+ public const int actionOverflowMenuStyle = 2130772034;
- // aapt resource value: 0x7F03001F
- public const int actionProviderClass = 2130903071;
+ // aapt resource value: 0x7f0100bd
+ public const int actionProviderClass = 2130772157;
- // aapt resource value: 0x7F030020
- public const int actionViewClass = 2130903072;
+ // aapt resource value: 0x7f0100bc
+ public const int actionViewClass = 2130772156;
- // aapt resource value: 0x7F030021
- public const int activityChooserViewStyle = 2130903073;
+ // aapt resource value: 0x7f01006c
+ public const int activityChooserViewStyle = 2130772076;
- // aapt resource value: 0x7F030022
- public const int alertDialogButtonGroupStyle = 2130903074;
+ // aapt resource value: 0x7f010091
+ public const int alertDialogButtonGroupStyle = 2130772113;
- // aapt resource value: 0x7F030023
- public const int alertDialogCenterButtons = 2130903075;
+ // aapt resource value: 0x7f010092
+ public const int alertDialogCenterButtons = 2130772114;
- // aapt resource value: 0x7F030024
- public const int alertDialogStyle = 2130903076;
+ // aapt resource value: 0x7f010090
+ public const int alertDialogStyle = 2130772112;
- // aapt resource value: 0x7F030025
- public const int alertDialogTheme = 2130903077;
+ // aapt resource value: 0x7f010093
+ public const int alertDialogTheme = 2130772115;
- // aapt resource value: 0x7F030026
- public const int allowStacking = 2130903078;
+ // aapt resource value: 0x7f0100a9
+ public const int allowStacking = 2130772137;
- // aapt resource value: 0x7F030027
- public const int alpha = 2130903079;
+ // aapt resource value: 0x7f0100aa
+ public const int alpha = 2130772138;
- // aapt resource value: 0x7F030028
- public const int alphabeticModifiers = 2130903080;
+ // aapt resource value: 0x7f0100b8
+ public const int alphabeticModifiers = 2130772152;
- // aapt resource value: 0x7F030029
- public const int arc_border_color = 2130903081;
+ // aapt resource value: 0x7f010105
+ public const int arc_border_color = 2130772229;
- // aapt resource value: 0x7F03002A
- public const int arc_border_width = 2130903082;
+ // aapt resource value: 0x7f010104
+ public const int arc_border_width = 2130772228;
- // aapt resource value: 0x7F03002B
- public const int arc_colors = 2130903083;
+ // aapt resource value: 0x7f010103
+ public const int arc_colors = 2130772227;
- // aapt resource value: 0x7F03002C
- public const int arc_max = 2130903084;
+ // aapt resource value: 0x7f010106
+ public const int arc_max = 2130772230;
- // aapt resource value: 0x7F03002D
- public const int arc_min = 2130903085;
+ // aapt resource value: 0x7f010107
+ public const int arc_min = 2130772231;
- // aapt resource value: 0x7F03002E
- public const int arc_open_angle = 2130903086;
+ // aapt resource value: 0x7f010101
+ public const int arc_open_angle = 2130772225;
- // aapt resource value: 0x7F03002F
- public const int arc_progress = 2130903087;
+ // aapt resource value: 0x7f010108
+ public const int arc_progress = 2130772232;
- // aapt resource value: 0x7F030030
- public const int arc_progress_bar_color = 2130903088;
+ // aapt resource value: 0x7f010110
+ public const int arc_progress_bar_color = 2130772240;
- // aapt resource value: 0x7F030031
- public const int arc_progress_bar_text_unit = 2130903089;
+ // aapt resource value: 0x7f010111
+ public const int arc_progress_bar_text_unit = 2130772241;
- // aapt resource value: 0x7F030032
- public const int arc_rotate_angle = 2130903090;
+ // aapt resource value: 0x7f010102
+ public const int arc_rotate_angle = 2130772226;
- // aapt resource value: 0x7F030033
- public const int arc_shadow_radius = 2130903091;
+ // aapt resource value: 0x7f01010f
+ public const int arc_shadow_radius = 2130772239;
- // aapt resource value: 0x7F030034
- public const int arc_thumb_color = 2130903092;
+ // aapt resource value: 0x7f01010a
+ public const int arc_thumb_color = 2130772234;
- // aapt resource value: 0x7F030035
- public const int arc_thumb_radius = 2130903093;
+ // aapt resource value: 0x7f01010b
+ public const int arc_thumb_radius = 2130772235;
- // aapt resource value: 0x7F030036
- public const int arc_thumb_shadow_color = 2130903094;
+ // aapt resource value: 0x7f01010d
+ public const int arc_thumb_shadow_color = 2130772237;
- // aapt resource value: 0x7F030037
- public const int arc_thumb_shadow_radius = 2130903095;
+ // aapt resource value: 0x7f01010c
+ public const int arc_thumb_shadow_radius = 2130772236;
- // aapt resource value: 0x7F030038
- public const int arc_thumb_width = 2130903096;
+ // aapt resource value: 0x7f010109
+ public const int arc_thumb_width = 2130772233;
- // aapt resource value: 0x7F030039
- public const int arc_width = 2130903097;
+ // aapt resource value: 0x7f010100
+ public const int arc_width = 2130772224;
- // aapt resource value: 0x7F03003A
- public const int arrowHeadLength = 2130903098;
+ // aapt resource value: 0x7f0100b1
+ public const int arrowHeadLength = 2130772145;
- // aapt resource value: 0x7F03003B
- public const int arrowShaftLength = 2130903099;
+ // aapt resource value: 0x7f0100b2
+ public const int arrowShaftLength = 2130772146;
- // aapt resource value: 0x7F03003C
- public const int autoCompleteTextViewStyle = 2130903100;
+ // aapt resource value: 0x7f010098
+ public const int autoCompleteTextViewStyle = 2130772120;
- // aapt resource value: 0x7F03003D
- public const int autoSizeMaxTextSize = 2130903101;
+ // aapt resource value: 0x7f010032
+ public const int autoSizeMaxTextSize = 2130772018;
- // aapt resource value: 0x7F03003E
- public const int autoSizeMinTextSize = 2130903102;
+ // aapt resource value: 0x7f010031
+ public const int autoSizeMinTextSize = 2130772017;
- // aapt resource value: 0x7F03003F
- public const int autoSizePresetSizes = 2130903103;
+ // aapt resource value: 0x7f010030
+ public const int autoSizePresetSizes = 2130772016;
- // aapt resource value: 0x7F030040
- public const int autoSizeStepGranularity = 2130903104;
+ // aapt resource value: 0x7f01002f
+ public const int autoSizeStepGranularity = 2130772015;
- // aapt resource value: 0x7F030041
- public const int autoSizeTextType = 2130903105;
+ // aapt resource value: 0x7f01002e
+ public const int autoSizeTextType = 2130772014;
- // aapt resource value: 0x7F030042
- public const int background = 2130903106;
+ // aapt resource value: 0x7f01000c
+ public const int background = 2130771980;
- // aapt resource value: 0x7F030043
- public const int backgroundSplit = 2130903107;
+ // aapt resource value: 0x7f01000e
+ public const int backgroundSplit = 2130771982;
- // aapt resource value: 0x7F030044
- public const int backgroundStacked = 2130903108;
+ // aapt resource value: 0x7f01000d
+ public const int backgroundStacked = 2130771981;
- // aapt resource value: 0x7F030045
- public const int backgroundTint = 2130903109;
+ // aapt resource value: 0x7f0100f4
+ public const int backgroundTint = 2130772212;
- // aapt resource value: 0x7F030046
- public const int backgroundTintMode = 2130903110;
+ // aapt resource value: 0x7f0100f5
+ public const int backgroundTintMode = 2130772213;
- // aapt resource value: 0x7F030047
- public const int barLength = 2130903111;
+ // aapt resource value: 0x7f0100b3
+ public const int barLength = 2130772147;
- // aapt resource value: 0x7F030048
- public const int biometricPromptDialogTheme = 2130903112;
+ // aapt resource value: 0x7f0100ff
+ public const int biometricPromptDialogTheme = 2130772223;
- // aapt resource value: 0x7F030049
- public const int borderlessButtonStyle = 2130903113;
+ // aapt resource value: 0x7f010069
+ public const int borderlessButtonStyle = 2130772073;
- // aapt resource value: 0x7F03004A
- public const int buttonBarButtonStyle = 2130903114;
+ // aapt resource value: 0x7f010066
+ public const int buttonBarButtonStyle = 2130772070;
- // aapt resource value: 0x7F03004B
- public const int buttonBarNegativeButtonStyle = 2130903115;
+ // aapt resource value: 0x7f010096
+ public const int buttonBarNegativeButtonStyle = 2130772118;
- // aapt resource value: 0x7F03004C
- public const int buttonBarNeutralButtonStyle = 2130903116;
+ // aapt resource value: 0x7f010097
+ public const int buttonBarNeutralButtonStyle = 2130772119;
- // aapt resource value: 0x7F03004D
- public const int buttonBarPositiveButtonStyle = 2130903117;
+ // aapt resource value: 0x7f010095
+ public const int buttonBarPositiveButtonStyle = 2130772117;
- // aapt resource value: 0x7F03004E
- public const int buttonBarStyle = 2130903118;
+ // aapt resource value: 0x7f010065
+ public const int buttonBarStyle = 2130772069;
- // aapt resource value: 0x7F03004F
- public const int buttonGravity = 2130903119;
+ // aapt resource value: 0x7f0100e9
+ public const int buttonGravity = 2130772201;
- // aapt resource value: 0x7F030050
- public const int buttonPanelSideLayout = 2130903120;
+ // aapt resource value: 0x7f010021
+ public const int buttonPanelSideLayout = 2130772001;
- // aapt resource value: 0x7F030051
- public const int buttonStyle = 2130903121;
+ // aapt resource value: 0x7f010099
+ public const int buttonStyle = 2130772121;
- // aapt resource value: 0x7F030052
- public const int buttonStyleSmall = 2130903122;
+ // aapt resource value: 0x7f01009a
+ public const int buttonStyleSmall = 2130772122;
- // aapt resource value: 0x7F030053
- public const int buttonTint = 2130903123;
+ // aapt resource value: 0x7f0100ab
+ public const int buttonTint = 2130772139;
- // aapt resource value: 0x7F030054
- public const int buttonTintMode = 2130903124;
+ // aapt resource value: 0x7f0100ac
+ public const int buttonTintMode = 2130772140;
- // aapt resource value: 0x7F030055
- public const int checkboxStyle = 2130903125;
+ // aapt resource value: 0x7f01009b
+ public const int checkboxStyle = 2130772123;
- // aapt resource value: 0x7F030056
- public const int checkedTextViewStyle = 2130903126;
+ // aapt resource value: 0x7f01009c
+ public const int checkedTextViewStyle = 2130772124;
- // aapt resource value: 0x7F030057
- public const int closeIcon = 2130903127;
+ // aapt resource value: 0x7f0100cc
+ public const int closeIcon = 2130772172;
- // aapt resource value: 0x7F030058
- public const int closeItemLayout = 2130903128;
+ // aapt resource value: 0x7f01001e
+ public const int closeItemLayout = 2130771998;
- // aapt resource value: 0x7F030059
- public const int collapseContentDescription = 2130903129;
+ // aapt resource value: 0x7f0100eb
+ public const int collapseContentDescription = 2130772203;
- // aapt resource value: 0x7F03005A
- public const int collapseIcon = 2130903130;
+ // aapt resource value: 0x7f0100ea
+ public const int collapseIcon = 2130772202;
- // aapt resource value: 0x7F03005B
- public const int color = 2130903131;
+ // aapt resource value: 0x7f0100ad
+ public const int color = 2130772141;
- // aapt resource value: 0x7F03005C
- public const int colorAccent = 2130903132;
+ // aapt resource value: 0x7f010088
+ public const int colorAccent = 2130772104;
- // aapt resource value: 0x7F03005D
- public const int colorBackgroundFloating = 2130903133;
+ // aapt resource value: 0x7f01008f
+ public const int colorBackgroundFloating = 2130772111;
- // aapt resource value: 0x7F03005E
- public const int colorButtonNormal = 2130903134;
+ // aapt resource value: 0x7f01008c
+ public const int colorButtonNormal = 2130772108;
- // aapt resource value: 0x7F03005F
- public const int colorControlActivated = 2130903135;
+ // aapt resource value: 0x7f01008a
+ public const int colorControlActivated = 2130772106;
- // aapt resource value: 0x7F030060
- public const int colorControlHighlight = 2130903136;
+ // aapt resource value: 0x7f01008b
+ public const int colorControlHighlight = 2130772107;
- // aapt resource value: 0x7F030061
- public const int colorControlNormal = 2130903137;
+ // aapt resource value: 0x7f010089
+ public const int colorControlNormal = 2130772105;
- // aapt resource value: 0x7F030062
- public const int colorError = 2130903138;
+ // aapt resource value: 0x7f0100a8
+ public const int colorError = 2130772136;
- // aapt resource value: 0x7F030063
- public const int colorPrimary = 2130903139;
+ // aapt resource value: 0x7f010086
+ public const int colorPrimary = 2130772102;
- // aapt resource value: 0x7F030064
- public const int colorPrimaryDark = 2130903140;
+ // aapt resource value: 0x7f010087
+ public const int colorPrimaryDark = 2130772103;
- // aapt resource value: 0x7F030065
- public const int colorSwitchThumbNormal = 2130903141;
+ // aapt resource value: 0x7f01008d
+ public const int colorSwitchThumbNormal = 2130772109;
- // aapt resource value: 0x7F030066
- public const int commitIcon = 2130903142;
+ // aapt resource value: 0x7f0100d1
+ public const int commitIcon = 2130772177;
- // aapt resource value: 0x7F030067
- public const int contentDescription = 2130903143;
+ // aapt resource value: 0x7f0100be
+ public const int contentDescription = 2130772158;
- // aapt resource value: 0x7F030068
- public const int contentInsetEnd = 2130903144;
+ // aapt resource value: 0x7f010017
+ public const int contentInsetEnd = 2130771991;
- // aapt resource value: 0x7F030069
- public const int contentInsetEndWithActions = 2130903145;
+ // aapt resource value: 0x7f01001b
+ public const int contentInsetEndWithActions = 2130771995;
- // aapt resource value: 0x7F03006A
- public const int contentInsetLeft = 2130903146;
+ // aapt resource value: 0x7f010018
+ public const int contentInsetLeft = 2130771992;
- // aapt resource value: 0x7F03006B
- public const int contentInsetRight = 2130903147;
+ // aapt resource value: 0x7f010019
+ public const int contentInsetRight = 2130771993;
- // aapt resource value: 0x7F03006C
- public const int contentInsetStart = 2130903148;
+ // aapt resource value: 0x7f010016
+ public const int contentInsetStart = 2130771990;
- // aapt resource value: 0x7F03006D
- public const int contentInsetStartWithNavigation = 2130903149;
+ // aapt resource value: 0x7f01001a
+ public const int contentInsetStartWithNavigation = 2130771994;
- // aapt resource value: 0x7F03006E
- public const int controlBackground = 2130903150;
+ // aapt resource value: 0x7f01008e
+ public const int controlBackground = 2130772110;
- // aapt resource value: 0x7F03006F
- public const int curtain_bar_bg_color = 2130903151;
+ // aapt resource value: 0x7f010114
+ public const int curtain_bar_bg_color = 2130772244;
- // aapt resource value: 0x7F030070
- public const int curtain_bar_border_color = 2130903152;
+ // aapt resource value: 0x7f010115
+ public const int curtain_bar_border_color = 2130772245;
- // aapt resource value: 0x7F030071
- public const int curtain_bar_color = 2130903153;
+ // aapt resource value: 0x7f010112
+ public const int curtain_bar_color = 2130772242;
- // aapt resource value: 0x7F030072
- public const int curtain_bar_height = 2130903154;
+ // aapt resource value: 0x7f010117
+ public const int curtain_bar_height = 2130772247;
- // aapt resource value: 0x7F030073
- public const int curtain_bar_width = 2130903155;
+ // aapt resource value: 0x7f010116
+ public const int curtain_bar_width = 2130772246;
- // aapt resource value: 0x7F030074
- public const int customNavigationLayout = 2130903156;
+ // aapt resource value: 0x7f01000f
+ public const int customNavigationLayout = 2130771983;
- // aapt resource value: 0x7F030075
- public const int defaultQueryHint = 2130903157;
+ // aapt resource value: 0x7f0100cb
+ public const int defaultQueryHint = 2130772171;
- // aapt resource value: 0x7F030076
- public const int dialogPreferredPadding = 2130903158;
+ // aapt resource value: 0x7f01005e
+ public const int dialogPreferredPadding = 2130772062;
- // aapt resource value: 0x7F030077
- public const int dialogTheme = 2130903159;
+ // aapt resource value: 0x7f01005d
+ public const int dialogTheme = 2130772061;
- // aapt resource value: 0x7F030078
- public const int displayOptions = 2130903160;
+ // aapt resource value: 0x7f010005
+ public const int displayOptions = 2130771973;
- // aapt resource value: 0x7F030079
- public const int divider = 2130903161;
+ // aapt resource value: 0x7f01000b
+ public const int divider = 2130771979;
- // aapt resource value: 0x7F03007A
- public const int dividerHorizontal = 2130903162;
+ // aapt resource value: 0x7f01006b
+ public const int dividerHorizontal = 2130772075;
- // aapt resource value: 0x7F03007B
- public const int dividerPadding = 2130903163;
+ // aapt resource value: 0x7f0100b7
+ public const int dividerPadding = 2130772151;
- // aapt resource value: 0x7F03007C
- public const int dividerVertical = 2130903164;
+ // aapt resource value: 0x7f01006a
+ public const int dividerVertical = 2130772074;
- // aapt resource value: 0x7F03007D
- public const int drawableSize = 2130903165;
+ // aapt resource value: 0x7f0100af
+ public const int drawableSize = 2130772143;
- // aapt resource value: 0x7F03007E
- public const int drawerArrowStyle = 2130903166;
+ // aapt resource value: 0x7f010000
+ public const int drawerArrowStyle = 2130771968;
- // aapt resource value: 0x7F030080
- public const int dropdownListPreferredItemHeight = 2130903168;
+ // aapt resource value: 0x7f01007d
+ public const int dropDownListViewStyle = 2130772093;
- // aapt resource value: 0x7F03007F
- public const int dropDownListViewStyle = 2130903167;
+ // aapt resource value: 0x7f010061
+ public const int dropdownListPreferredItemHeight = 2130772065;
- // aapt resource value: 0x7F030081
- public const int editTextBackground = 2130903169;
+ // aapt resource value: 0x7f010072
+ public const int editTextBackground = 2130772082;
- // aapt resource value: 0x7F030082
- public const int editTextColor = 2130903170;
+ // aapt resource value: 0x7f010071
+ public const int editTextColor = 2130772081;
- // aapt resource value: 0x7F030083
- public const int editTextStyle = 2130903171;
+ // aapt resource value: 0x7f01009d
+ public const int editTextStyle = 2130772125;
- // aapt resource value: 0x7F030084
- public const int elevation = 2130903172;
+ // aapt resource value: 0x7f01001c
+ public const int elevation = 2130771996;
- // aapt resource value: 0x7F030085
- public const int expandActivityOverflowButtonDrawable = 2130903173;
+ // aapt resource value: 0x7f010020
+ public const int expandActivityOverflowButtonDrawable = 2130772000;
- // aapt resource value: 0x7F030086
- public const int font = 2130903174;
+ // aapt resource value: 0x7f0100fd
+ public const int font = 2130772221;
- // aapt resource value: 0x7F030087
- public const int fontFamily = 2130903175;
+ // aapt resource value: 0x7f010033
+ public const int fontFamily = 2130772019;
- // aapt resource value: 0x7F030088
- public const int fontProviderAuthority = 2130903176;
+ // aapt resource value: 0x7f0100f6
+ public const int fontProviderAuthority = 2130772214;
- // aapt resource value: 0x7F030089
- public const int fontProviderCerts = 2130903177;
+ // aapt resource value: 0x7f0100f9
+ public const int fontProviderCerts = 2130772217;
- // aapt resource value: 0x7F03008A
- public const int fontProviderFetchStrategy = 2130903178;
+ // aapt resource value: 0x7f0100fa
+ public const int fontProviderFetchStrategy = 2130772218;
- // aapt resource value: 0x7F03008B
- public const int fontProviderFetchTimeout = 2130903179;
+ // aapt resource value: 0x7f0100fb
+ public const int fontProviderFetchTimeout = 2130772219;
- // aapt resource value: 0x7F03008C
- public const int fontProviderPackage = 2130903180;
+ // aapt resource value: 0x7f0100f7
+ public const int fontProviderPackage = 2130772215;
- // aapt resource value: 0x7F03008D
- public const int fontProviderQuery = 2130903181;
+ // aapt resource value: 0x7f0100f8
+ public const int fontProviderQuery = 2130772216;
- // aapt resource value: 0x7F03008E
- public const int fontStyle = 2130903182;
+ // aapt resource value: 0x7f0100fc
+ public const int fontStyle = 2130772220;
- // aapt resource value: 0x7F03008F
- public const int fontWeight = 2130903183;
+ // aapt resource value: 0x7f0100fe
+ public const int fontWeight = 2130772222;
- // aapt resource value: 0x7F030090
- public const int gapBetweenBars = 2130903184;
+ // aapt resource value: 0x7f0100b0
+ public const int gapBetweenBars = 2130772144;
- // aapt resource value: 0x7F030091
- public const int goIcon = 2130903185;
+ // aapt resource value: 0x7f0100cd
+ public const int goIcon = 2130772173;
- // aapt resource value: 0x7F030092
- public const int hdl_arc_thumb_mode = 2130903186;
+ // aapt resource value: 0x7f01010e
+ public const int hdl_arc_thumb_mode = 2130772238;
- // aapt resource value: 0x7F030093
- public const int height = 2130903187;
+ // aapt resource value: 0x7f010001
+ public const int height = 2130771969;
- // aapt resource value: 0x7F030094
- public const int hideOnContentScroll = 2130903188;
+ // aapt resource value: 0x7f010015
+ public const int hideOnContentScroll = 2130771989;
- // aapt resource value: 0x7F030095
- public const int homeAsUpIndicator = 2130903189;
+ // aapt resource value: 0x7f010063
+ public const int homeAsUpIndicator = 2130772067;
- // aapt resource value: 0x7F030096
- public const int homeLayout = 2130903190;
+ // aapt resource value: 0x7f010010
+ public const int homeLayout = 2130771984;
- // aapt resource value: 0x7F030097
- public const int icon = 2130903191;
+ // aapt resource value: 0x7f010009
+ public const int icon = 2130771977;
- // aapt resource value: 0x7F03009A
- public const int iconifiedByDefault = 2130903194;
+ // aapt resource value: 0x7f0100c0
+ public const int iconTint = 2130772160;
- // aapt resource value: 0x7F030098
- public const int iconTint = 2130903192;
+ // aapt resource value: 0x7f0100c1
+ public const int iconTintMode = 2130772161;
- // aapt resource value: 0x7F030099
- public const int iconTintMode = 2130903193;
+ // aapt resource value: 0x7f0100c9
+ public const int iconifiedByDefault = 2130772169;
- // aapt resource value: 0x7F03009B
- public const int imageButtonStyle = 2130903195;
+ // aapt resource value: 0x7f010073
+ public const int imageButtonStyle = 2130772083;
- // aapt resource value: 0x7F03009C
- public const int indeterminateProgressStyle = 2130903196;
+ // aapt resource value: 0x7f010012
+ public const int indeterminateProgressStyle = 2130771986;
- // aapt resource value: 0x7F03009D
- public const int initialActivityCount = 2130903197;
+ // aapt resource value: 0x7f01001f
+ public const int initialActivityCount = 2130771999;
- // aapt resource value: 0x7F03009E
- public const int isLightTheme = 2130903198;
+ // aapt resource value: 0x7f010002
+ public const int isLightTheme = 2130771970;
- // aapt resource value: 0x7F03009F
- public const int itemPadding = 2130903199;
+ // aapt resource value: 0x7f010014
+ public const int itemPadding = 2130771988;
- // aapt resource value: 0x7F0300A0
- public const int layout = 2130903200;
+ // aapt resource value: 0x7f0100c8
+ public const int layout = 2130772168;
- // aapt resource value: 0x7F0300A1
- public const int listChoiceBackgroundIndicator = 2130903201;
+ // aapt resource value: 0x7f010085
+ public const int listChoiceBackgroundIndicator = 2130772101;
- // aapt resource value: 0x7F0300A2
- public const int listDividerAlertDialog = 2130903202;
+ // aapt resource value: 0x7f01005f
+ public const int listDividerAlertDialog = 2130772063;
- // aapt resource value: 0x7F0300A3
- public const int listItemLayout = 2130903203;
+ // aapt resource value: 0x7f010025
+ public const int listItemLayout = 2130772005;
- // aapt resource value: 0x7F0300A4
- public const int listLayout = 2130903204;
+ // aapt resource value: 0x7f010022
+ public const int listLayout = 2130772002;
- // aapt resource value: 0x7F0300A5
- public const int listMenuViewStyle = 2130903205;
+ // aapt resource value: 0x7f0100a5
+ public const int listMenuViewStyle = 2130772133;
- // aapt resource value: 0x7F0300A6
- public const int listPopupWindowStyle = 2130903206;
+ // aapt resource value: 0x7f01007e
+ public const int listPopupWindowStyle = 2130772094;
- // aapt resource value: 0x7F0300A7
- public const int listPreferredItemHeight = 2130903207;
+ // aapt resource value: 0x7f010078
+ public const int listPreferredItemHeight = 2130772088;
- // aapt resource value: 0x7F0300A8
- public const int listPreferredItemHeightLarge = 2130903208;
+ // aapt resource value: 0x7f01007a
+ public const int listPreferredItemHeightLarge = 2130772090;
- // aapt resource value: 0x7F0300A9
- public const int listPreferredItemHeightSmall = 2130903209;
+ // aapt resource value: 0x7f010079
+ public const int listPreferredItemHeightSmall = 2130772089;
- // aapt resource value: 0x7F0300AA
- public const int listPreferredItemPaddingLeft = 2130903210;
+ // aapt resource value: 0x7f01007b
+ public const int listPreferredItemPaddingLeft = 2130772091;
- // aapt resource value: 0x7F0300AB
- public const int listPreferredItemPaddingRight = 2130903211;
+ // aapt resource value: 0x7f01007c
+ public const int listPreferredItemPaddingRight = 2130772092;
- // aapt resource value: 0x7F0300AC
- public const int logo = 2130903212;
+ // aapt resource value: 0x7f01000a
+ public const int logo = 2130771978;
- // aapt resource value: 0x7F0300AD
- public const int logoDescription = 2130903213;
+ // aapt resource value: 0x7f0100ee
+ public const int logoDescription = 2130772206;
- // aapt resource value: 0x7F0300AE
- public const int maxButtonHeight = 2130903214;
+ // aapt resource value: 0x7f0100e8
+ public const int maxButtonHeight = 2130772200;
- // aapt resource value: 0x7F0300AF
- public const int measureWithLargestChild = 2130903215;
+ // aapt resource value: 0x7f0100b5
+ public const int measureWithLargestChild = 2130772149;
- // aapt resource value: 0x7F0300B0
- public const int multiChoiceItemLayout = 2130903216;
+ // aapt resource value: 0x7f010023
+ public const int multiChoiceItemLayout = 2130772003;
- // aapt resource value: 0x7F0300B1
- public const int navigationContentDescription = 2130903217;
+ // aapt resource value: 0x7f0100ed
+ public const int navigationContentDescription = 2130772205;
- // aapt resource value: 0x7F0300B2
- public const int navigationIcon = 2130903218;
+ // aapt resource value: 0x7f0100ec
+ public const int navigationIcon = 2130772204;
- // aapt resource value: 0x7F0300B3
- public const int navigationMode = 2130903219;
+ // aapt resource value: 0x7f010004
+ public const int navigationMode = 2130771972;
- // aapt resource value: 0x7F0300B4
- public const int numericModifiers = 2130903220;
+ // aapt resource value: 0x7f0100b9
+ public const int numericModifiers = 2130772153;
- // aapt resource value: 0x7F0300B5
- public const int overlapAnchor = 2130903221;
+ // aapt resource value: 0x7f0100c4
+ public const int overlapAnchor = 2130772164;
- // aapt resource value: 0x7F0300B6
- public const int paddingBottomNoButtons = 2130903222;
+ // aapt resource value: 0x7f0100c6
+ public const int paddingBottomNoButtons = 2130772166;
- // aapt resource value: 0x7F0300B7
- public const int paddingEnd = 2130903223;
+ // aapt resource value: 0x7f0100f2
+ public const int paddingEnd = 2130772210;
- // aapt resource value: 0x7F0300B8
- public const int paddingStart = 2130903224;
+ // aapt resource value: 0x7f0100f1
+ public const int paddingStart = 2130772209;
- // aapt resource value: 0x7F0300B9
- public const int paddingTopNoTitle = 2130903225;
+ // aapt resource value: 0x7f0100c7
+ public const int paddingTopNoTitle = 2130772167;
- // aapt resource value: 0x7F0300BA
- public const int panelBackground = 2130903226;
+ // aapt resource value: 0x7f010082
+ public const int panelBackground = 2130772098;
- // aapt resource value: 0x7F0300BB
- public const int panelMenuListTheme = 2130903227;
+ // aapt resource value: 0x7f010084
+ public const int panelMenuListTheme = 2130772100;
- // aapt resource value: 0x7F0300BC
- public const int panelMenuListWidth = 2130903228;
+ // aapt resource value: 0x7f010083
+ public const int panelMenuListWidth = 2130772099;
- // aapt resource value: 0x7F0300BD
- public const int popupMenuStyle = 2130903229;
+ // aapt resource value: 0x7f01006f
+ public const int popupMenuStyle = 2130772079;
- // aapt resource value: 0x7F0300BE
- public const int popupTheme = 2130903230;
+ // aapt resource value: 0x7f01001d
+ public const int popupTheme = 2130771997;
- // aapt resource value: 0x7F0300BF
- public const int popupWindowStyle = 2130903231;
+ // aapt resource value: 0x7f010070
+ public const int popupWindowStyle = 2130772080;
- // aapt resource value: 0x7F0300C0
- public const int preserveIconSpacing = 2130903232;
+ // aapt resource value: 0x7f0100c2
+ public const int preserveIconSpacing = 2130772162;
- // aapt resource value: 0x7F0300C1
- public const int progressBarPadding = 2130903233;
+ // aapt resource value: 0x7f010013
+ public const int progressBarPadding = 2130771987;
- // aapt resource value: 0x7F0300C2
- public const int progressBarStyle = 2130903234;
+ // aapt resource value: 0x7f010011
+ public const int progressBarStyle = 2130771985;
- // aapt resource value: 0x7F0300C3
- public const int queryBackground = 2130903235;
+ // aapt resource value: 0x7f0100d3
+ public const int queryBackground = 2130772179;
- // aapt resource value: 0x7F0300C4
- public const int queryHint = 2130903236;
+ // aapt resource value: 0x7f0100ca
+ public const int queryHint = 2130772170;
- // aapt resource value: 0x7F0300C5
- public const int radioButtonStyle = 2130903237;
+ // aapt resource value: 0x7f01009e
+ public const int radioButtonStyle = 2130772126;
- // aapt resource value: 0x7F0300C6
- public const int ratingBarStyle = 2130903238;
+ // aapt resource value: 0x7f01009f
+ public const int ratingBarStyle = 2130772127;
- // aapt resource value: 0x7F0300C7
- public const int ratingBarStyleIndicator = 2130903239;
+ // aapt resource value: 0x7f0100a0
+ public const int ratingBarStyleIndicator = 2130772128;
- // aapt resource value: 0x7F0300C8
- public const int ratingBarStyleSmall = 2130903240;
+ // aapt resource value: 0x7f0100a1
+ public const int ratingBarStyleSmall = 2130772129;
- // aapt resource value: 0x7F0300C9
- public const int searchHintIcon = 2130903241;
+ // aapt resource value: 0x7f0100cf
+ public const int searchHintIcon = 2130772175;
- // aapt resource value: 0x7F0300CA
- public const int searchIcon = 2130903242;
+ // aapt resource value: 0x7f0100ce
+ public const int searchIcon = 2130772174;
- // aapt resource value: 0x7F0300CB
- public const int searchViewStyle = 2130903243;
+ // aapt resource value: 0x7f010077
+ public const int searchViewStyle = 2130772087;
- // aapt resource value: 0x7F0300CC
- public const int second_curtain_bar_color = 2130903244;
+ // aapt resource value: 0x7f010113
+ public const int second_curtain_bar_color = 2130772243;
- // aapt resource value: 0x7F0300CD
- public const int second_wave_color = 2130903245;
+ // aapt resource value: 0x7f010119
+ public const int second_wave_color = 2130772249;
- // aapt resource value: 0x7F0300CE
- public const int seekBarStyle = 2130903246;
+ // aapt resource value: 0x7f0100a2
+ public const int seekBarStyle = 2130772130;
- // aapt resource value: 0x7F0300CF
- public const int selectableItemBackground = 2130903247;
+ // aapt resource value: 0x7f010067
+ public const int selectableItemBackground = 2130772071;
- // aapt resource value: 0x7F0300D0
- public const int selectableItemBackgroundBorderless = 2130903248;
+ // aapt resource value: 0x7f010068
+ public const int selectableItemBackgroundBorderless = 2130772072;
- // aapt resource value: 0x7F0300D1
- public const int showAsAction = 2130903249;
+ // aapt resource value: 0x7f0100ba
+ public const int showAsAction = 2130772154;
- // aapt resource value: 0x7F0300D2
- public const int showDividers = 2130903250;
+ // aapt resource value: 0x7f0100b6
+ public const int showDividers = 2130772150;
- // aapt resource value: 0x7F0300D3
- public const int showText = 2130903251;
+ // aapt resource value: 0x7f0100df
+ public const int showText = 2130772191;
- // aapt resource value: 0x7F0300D4
- public const int showTitle = 2130903252;
+ // aapt resource value: 0x7f010026
+ public const int showTitle = 2130772006;
- // aapt resource value: 0x7F0300D5
- public const int singleChoiceItemLayout = 2130903253;
+ // aapt resource value: 0x7f010024
+ public const int singleChoiceItemLayout = 2130772004;
- // aapt resource value: 0x7F0300D6
- public const int spinBars = 2130903254;
+ // aapt resource value: 0x7f0100ae
+ public const int spinBars = 2130772142;
- // aapt resource value: 0x7F0300D7
- public const int spinnerDropDownItemStyle = 2130903255;
+ // aapt resource value: 0x7f010062
+ public const int spinnerDropDownItemStyle = 2130772066;
- // aapt resource value: 0x7F0300D8
- public const int spinnerStyle = 2130903256;
+ // aapt resource value: 0x7f0100a3
+ public const int spinnerStyle = 2130772131;
- // aapt resource value: 0x7F0300D9
- public const int splitTrack = 2130903257;
+ // aapt resource value: 0x7f0100de
+ public const int splitTrack = 2130772190;
- // aapt resource value: 0x7F0300DA
- public const int srcCompat = 2130903258;
+ // aapt resource value: 0x7f010027
+ public const int srcCompat = 2130772007;
- // aapt resource value: 0x7F0300DB
- public const int state_above_anchor = 2130903259;
+ // aapt resource value: 0x7f0100c5
+ public const int state_above_anchor = 2130772165;
- // aapt resource value: 0x7F0300DC
- public const int subMenuArrow = 2130903260;
+ // aapt resource value: 0x7f0100c3
+ public const int subMenuArrow = 2130772163;
- // aapt resource value: 0x7F0300DD
- public const int submitBackground = 2130903261;
+ // aapt resource value: 0x7f0100d4
+ public const int submitBackground = 2130772180;
- // aapt resource value: 0x7F0300DE
- public const int subtitle = 2130903262;
+ // aapt resource value: 0x7f010006
+ public const int subtitle = 2130771974;
- // aapt resource value: 0x7F0300DF
- public const int subtitleTextAppearance = 2130903263;
+ // aapt resource value: 0x7f0100e1
+ public const int subtitleTextAppearance = 2130772193;
- // aapt resource value: 0x7F0300E0
- public const int subtitleTextColor = 2130903264;
+ // aapt resource value: 0x7f0100f0
+ public const int subtitleTextColor = 2130772208;
- // aapt resource value: 0x7F0300E1
- public const int subtitleTextStyle = 2130903265;
+ // aapt resource value: 0x7f010008
+ public const int subtitleTextStyle = 2130771976;
- // aapt resource value: 0x7F0300E2
- public const int suggestionRowLayout = 2130903266;
+ // aapt resource value: 0x7f0100d2
+ public const int suggestionRowLayout = 2130772178;
- // aapt resource value: 0x7F0300E3
- public const int switchMinWidth = 2130903267;
+ // aapt resource value: 0x7f0100dc
+ public const int switchMinWidth = 2130772188;
- // aapt resource value: 0x7F0300E4
- public const int switchPadding = 2130903268;
+ // aapt resource value: 0x7f0100dd
+ public const int switchPadding = 2130772189;
- // aapt resource value: 0x7F0300E5
- public const int switchStyle = 2130903269;
+ // aapt resource value: 0x7f0100a4
+ public const int switchStyle = 2130772132;
- // aapt resource value: 0x7F0300E6
- public const int switchTextAppearance = 2130903270;
+ // aapt resource value: 0x7f0100db
+ public const int switchTextAppearance = 2130772187;
- // aapt resource value: 0x7F0300E7
- public const int textAllCaps = 2130903271;
+ // aapt resource value: 0x7f01002d
+ public const int textAllCaps = 2130772013;
- // aapt resource value: 0x7F0300E8
- public const int textAppearanceLargePopupMenu = 2130903272;
+ // aapt resource value: 0x7f01005a
+ public const int textAppearanceLargePopupMenu = 2130772058;
- // aapt resource value: 0x7F0300E9
- public const int textAppearanceListItem = 2130903273;
+ // aapt resource value: 0x7f01007f
+ public const int textAppearanceListItem = 2130772095;
- // aapt resource value: 0x7F0300EA
- public const int textAppearanceListItemSecondary = 2130903274;
+ // aapt resource value: 0x7f010080
+ public const int textAppearanceListItemSecondary = 2130772096;
- // aapt resource value: 0x7F0300EB
- public const int textAppearanceListItemSmall = 2130903275;
+ // aapt resource value: 0x7f010081
+ public const int textAppearanceListItemSmall = 2130772097;
- // aapt resource value: 0x7F0300EC
- public const int textAppearancePopupMenuHeader = 2130903276;
+ // aapt resource value: 0x7f01005c
+ public const int textAppearancePopupMenuHeader = 2130772060;
- // aapt resource value: 0x7F0300ED
- public const int textAppearanceSearchResultSubtitle = 2130903277;
+ // aapt resource value: 0x7f010075
+ public const int textAppearanceSearchResultSubtitle = 2130772085;
- // aapt resource value: 0x7F0300EE
- public const int textAppearanceSearchResultTitle = 2130903278;
+ // aapt resource value: 0x7f010074
+ public const int textAppearanceSearchResultTitle = 2130772084;
- // aapt resource value: 0x7F0300EF
- public const int textAppearanceSmallPopupMenu = 2130903279;
+ // aapt resource value: 0x7f01005b
+ public const int textAppearanceSmallPopupMenu = 2130772059;
- // aapt resource value: 0x7F0300F0
- public const int textColorAlertDialogListItem = 2130903280;
+ // aapt resource value: 0x7f010094
+ public const int textColorAlertDialogListItem = 2130772116;
- // aapt resource value: 0x7F0300F1
- public const int textColorSearchUrl = 2130903281;
+ // aapt resource value: 0x7f010076
+ public const int textColorSearchUrl = 2130772086;
- // aapt resource value: 0x7F0300F2
- public const int theme = 2130903282;
+ // aapt resource value: 0x7f0100f3
+ public const int theme = 2130772211;
- // aapt resource value: 0x7F0300F3
- public const int thickness = 2130903283;
+ // aapt resource value: 0x7f0100b4
+ public const int thickness = 2130772148;
- // aapt resource value: 0x7F0300F4
- public const int thumbTextPadding = 2130903284;
+ // aapt resource value: 0x7f0100da
+ public const int thumbTextPadding = 2130772186;
- // aapt resource value: 0x7F0300F5
- public const int thumbTint = 2130903285;
+ // aapt resource value: 0x7f0100d5
+ public const int thumbTint = 2130772181;
- // aapt resource value: 0x7F0300F6
- public const int thumbTintMode = 2130903286;
+ // aapt resource value: 0x7f0100d6
+ public const int thumbTintMode = 2130772182;
- // aapt resource value: 0x7F0300F7
- public const int tickMark = 2130903287;
+ // aapt resource value: 0x7f01002a
+ public const int tickMark = 2130772010;
- // aapt resource value: 0x7F0300F8
- public const int tickMarkTint = 2130903288;
+ // aapt resource value: 0x7f01002b
+ public const int tickMarkTint = 2130772011;
- // aapt resource value: 0x7F0300F9
- public const int tickMarkTintMode = 2130903289;
+ // aapt resource value: 0x7f01002c
+ public const int tickMarkTintMode = 2130772012;
- // aapt resource value: 0x7F0300FA
- public const int tint = 2130903290;
+ // aapt resource value: 0x7f010028
+ public const int tint = 2130772008;
- // aapt resource value: 0x7F0300FB
- public const int tintMode = 2130903291;
+ // aapt resource value: 0x7f010029
+ public const int tintMode = 2130772009;
- // aapt resource value: 0x7F0300FC
- public const int title = 2130903292;
+ // aapt resource value: 0x7f010003
+ public const int title = 2130771971;
- // aapt resource value: 0x7F0300FD
- public const int titleMargin = 2130903293;
+ // aapt resource value: 0x7f0100e2
+ public const int titleMargin = 2130772194;
- // aapt resource value: 0x7F0300FE
- public const int titleMarginBottom = 2130903294;
+ // aapt resource value: 0x7f0100e6
+ public const int titleMarginBottom = 2130772198;
- // aapt resource value: 0x7F0300FF
- public const int titleMarginEnd = 2130903295;
+ // aapt resource value: 0x7f0100e4
+ public const int titleMarginEnd = 2130772196;
- // aapt resource value: 0x7F030102
- public const int titleMargins = 2130903298;
+ // aapt resource value: 0x7f0100e3
+ public const int titleMarginStart = 2130772195;
- // aapt resource value: 0x7F030100
- public const int titleMarginStart = 2130903296;
+ // aapt resource value: 0x7f0100e5
+ public const int titleMarginTop = 2130772197;
- // aapt resource value: 0x7F030101
- public const int titleMarginTop = 2130903297;
+ // aapt resource value: 0x7f0100e7
+ public const int titleMargins = 2130772199;
- // aapt resource value: 0x7F030103
- public const int titleTextAppearance = 2130903299;
+ // aapt resource value: 0x7f0100e0
+ public const int titleTextAppearance = 2130772192;
- // aapt resource value: 0x7F030104
- public const int titleTextColor = 2130903300;
+ // aapt resource value: 0x7f0100ef
+ public const int titleTextColor = 2130772207;
- // aapt resource value: 0x7F030105
- public const int titleTextStyle = 2130903301;
+ // aapt resource value: 0x7f010007
+ public const int titleTextStyle = 2130771975;
- // aapt resource value: 0x7F030106
- public const int toolbarNavigationButtonStyle = 2130903302;
+ // aapt resource value: 0x7f01006e
+ public const int toolbarNavigationButtonStyle = 2130772078;
- // aapt resource value: 0x7F030107
- public const int toolbarStyle = 2130903303;
+ // aapt resource value: 0x7f01006d
+ public const int toolbarStyle = 2130772077;
- // aapt resource value: 0x7F030108
- public const int tooltipForegroundColor = 2130903304;
+ // aapt resource value: 0x7f0100a7
+ public const int tooltipForegroundColor = 2130772135;
- // aapt resource value: 0x7F030109
- public const int tooltipFrameBackground = 2130903305;
+ // aapt resource value: 0x7f0100a6
+ public const int tooltipFrameBackground = 2130772134;
- // aapt resource value: 0x7F03010A
- public const int tooltipText = 2130903306;
+ // aapt resource value: 0x7f0100bf
+ public const int tooltipText = 2130772159;
- // aapt resource value: 0x7F03010B
- public const int track = 2130903307;
+ // aapt resource value: 0x7f0100d7
+ public const int track = 2130772183;
- // aapt resource value: 0x7F03010C
- public const int trackTint = 2130903308;
+ // aapt resource value: 0x7f0100d8
+ public const int trackTint = 2130772184;
- // aapt resource value: 0x7F03010D
- public const int trackTintMode = 2130903309;
+ // aapt resource value: 0x7f0100d9
+ public const int trackTintMode = 2130772185;
- // aapt resource value: 0x7F03010E
- public const int voiceIcon = 2130903310;
+ // aapt resource value: 0x7f0100d0
+ public const int voiceIcon = 2130772176;
- // aapt resource value: 0x7F03010F
- public const int wave_bg_color = 2130903311;
+ // aapt resource value: 0x7f01011a
+ public const int wave_bg_color = 2130772250;
- // aapt resource value: 0x7F030110
- public const int wave_border_color = 2130903312;
+ // aapt resource value: 0x7f01011b
+ public const int wave_border_color = 2130772251;
- // aapt resource value: 0x7F030111
- public const int wave_color = 2130903313;
+ // aapt resource value: 0x7f010118
+ public const int wave_color = 2130772248;
- // aapt resource value: 0x7F030112
- public const int wave_height = 2130903314;
+ // aapt resource value: 0x7f01011d
+ public const int wave_height = 2130772253;
- // aapt resource value: 0x7F030113
- public const int wave_width = 2130903315;
+ // aapt resource value: 0x7f01011c
+ public const int wave_width = 2130772252;
- // aapt resource value: 0x7F030114
- public const int wheelview_dividerColor = 2130903316;
+ // aapt resource value: 0x7f010122
+ public const int wheelview_dividerColor = 2130772258;
- // aapt resource value: 0x7F030115
- public const int wheelview_gravity = 2130903317;
+ // aapt resource value: 0x7f01011e
+ public const int wheelview_gravity = 2130772254;
- // aapt resource value: 0x7F030116
- public const int wheelview_lineSpacingMultiplier = 2130903318;
+ // aapt resource value: 0x7f010123
+ public const int wheelview_lineSpacingMultiplier = 2130772259;
- // aapt resource value: 0x7F030117
- public const int wheelview_textColorCenter = 2130903319;
+ // aapt resource value: 0x7f010121
+ public const int wheelview_textColorCenter = 2130772257;
- // aapt resource value: 0x7F030118
- public const int wheelview_textColorOut = 2130903320;
+ // aapt resource value: 0x7f010120
+ public const int wheelview_textColorOut = 2130772256;
- // aapt resource value: 0x7F030119
- public const int wheelview_textSize = 2130903321;
+ // aapt resource value: 0x7f01011f
+ public const int wheelview_textSize = 2130772255;
- // aapt resource value: 0x7F03011A
- public const int windowActionBar = 2130903322;
+ // aapt resource value: 0x7f010034
+ public const int windowActionBar = 2130772020;
- // aapt resource value: 0x7F03011B
- public const int windowActionBarOverlay = 2130903323;
+ // aapt resource value: 0x7f010036
+ public const int windowActionBarOverlay = 2130772022;
- // aapt resource value: 0x7F03011C
- public const int windowActionModeOverlay = 2130903324;
+ // aapt resource value: 0x7f010037
+ public const int windowActionModeOverlay = 2130772023;
- // aapt resource value: 0x7F03011D
- public const int windowFixedHeightMajor = 2130903325;
+ // aapt resource value: 0x7f01003b
+ public const int windowFixedHeightMajor = 2130772027;
- // aapt resource value: 0x7F03011E
- public const int windowFixedHeightMinor = 2130903326;
+ // aapt resource value: 0x7f010039
+ public const int windowFixedHeightMinor = 2130772025;
- // aapt resource value: 0x7F03011F
- public const int windowFixedWidthMajor = 2130903327;
+ // aapt resource value: 0x7f010038
+ public const int windowFixedWidthMajor = 2130772024;
- // aapt resource value: 0x7F030120
- public const int windowFixedWidthMinor = 2130903328;
+ // aapt resource value: 0x7f01003a
+ public const int windowFixedWidthMinor = 2130772026;
- // aapt resource value: 0x7F030121
- public const int windowMinWidthMajor = 2130903329;
+ // aapt resource value: 0x7f01003c
+ public const int windowMinWidthMajor = 2130772028;
- // aapt resource value: 0x7F030122
- public const int windowMinWidthMinor = 2130903330;
+ // aapt resource value: 0x7f01003d
+ public const int windowMinWidthMinor = 2130772029;
- // aapt resource value: 0x7F030123
- public const int windowNoTitle = 2130903331;
+ // aapt resource value: 0x7f010035
+ public const int windowNoTitle = 2130772021;
static Attribute()
{
@@ -1165,20 +1165,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7F040000
- public const int abc_action_bar_embed_tabs = 2130968576;
+ // aapt resource value: 0x7f0a0000
+ public const int abc_action_bar_embed_tabs = 2131361792;
- // aapt resource value: 0x7F040001
- public const int abc_allow_stacked_button_bar = 2130968577;
+ // aapt resource value: 0x7f0a0001
+ public const int abc_allow_stacked_button_bar = 2131361793;
- // aapt resource value: 0x7F040002
- public const int abc_config_actionMenuItemAllCaps = 2130968578;
+ // aapt resource value: 0x7f0a0002
+ public const int abc_config_actionMenuItemAllCaps = 2131361794;
- // aapt resource value: 0x7F040003
- public const int abc_config_closeDialogWhenTouchOutside = 2130968579;
+ // aapt resource value: 0x7f0a0003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131361795;
- // aapt resource value: 0x7F040004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2130968580;
+ // aapt resource value: 0x7f0a0004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131361796;
static Boolean()
{
@@ -1193,287 +1193,287 @@
public partial class Color
{
- // aapt resource value: 0x7F050000
- public const int abc_background_cache_hint_selector_material_dark = 2131034112;
+ // aapt resource value: 0x7f0b0048
+ public const int abc_background_cache_hint_selector_material_dark = 2131427400;
- // aapt resource value: 0x7F050001
- public const int abc_background_cache_hint_selector_material_light = 2131034113;
+ // aapt resource value: 0x7f0b0049
+ public const int abc_background_cache_hint_selector_material_light = 2131427401;
- // aapt resource value: 0x7F050002
- public const int abc_btn_colored_borderless_text_material = 2131034114;
+ // aapt resource value: 0x7f0b004a
+ public const int abc_btn_colored_borderless_text_material = 2131427402;
- // aapt resource value: 0x7F050003
- public const int abc_btn_colored_text_material = 2131034115;
+ // aapt resource value: 0x7f0b004b
+ public const int abc_btn_colored_text_material = 2131427403;
- // aapt resource value: 0x7F050004
- public const int abc_color_highlight_material = 2131034116;
+ // aapt resource value: 0x7f0b004c
+ public const int abc_color_highlight_material = 2131427404;
- // aapt resource value: 0x7F050005
- public const int abc_hint_foreground_material_dark = 2131034117;
+ // aapt resource value: 0x7f0b004d
+ public const int abc_hint_foreground_material_dark = 2131427405;
- // aapt resource value: 0x7F050006
- public const int abc_hint_foreground_material_light = 2131034118;
+ // aapt resource value: 0x7f0b004e
+ public const int abc_hint_foreground_material_light = 2131427406;
- // aapt resource value: 0x7F050007
- public const int abc_input_method_navigation_guard = 2131034119;
+ // aapt resource value: 0x7f0b0000
+ public const int abc_input_method_navigation_guard = 2131427328;
- // aapt resource value: 0x7F050008
- public const int abc_primary_text_disable_only_material_dark = 2131034120;
+ // aapt resource value: 0x7f0b004f
+ public const int abc_primary_text_disable_only_material_dark = 2131427407;
- // aapt resource value: 0x7F050009
- public const int abc_primary_text_disable_only_material_light = 2131034121;
+ // aapt resource value: 0x7f0b0050
+ public const int abc_primary_text_disable_only_material_light = 2131427408;
- // aapt resource value: 0x7F05000A
- public const int abc_primary_text_material_dark = 2131034122;
+ // aapt resource value: 0x7f0b0051
+ public const int abc_primary_text_material_dark = 2131427409;
- // aapt resource value: 0x7F05000B
- public const int abc_primary_text_material_light = 2131034123;
+ // aapt resource value: 0x7f0b0052
+ public const int abc_primary_text_material_light = 2131427410;
- // aapt resource value: 0x7F05000C
- public const int abc_search_url_text = 2131034124;
+ // aapt resource value: 0x7f0b0053
+ public const int abc_search_url_text = 2131427411;
- // aapt resource value: 0x7F05000D
- public const int abc_search_url_text_normal = 2131034125;
+ // aapt resource value: 0x7f0b0001
+ public const int abc_search_url_text_normal = 2131427329;
- // aapt resource value: 0x7F05000E
- public const int abc_search_url_text_pressed = 2131034126;
+ // aapt resource value: 0x7f0b0002
+ public const int abc_search_url_text_pressed = 2131427330;
- // aapt resource value: 0x7F05000F
- public const int abc_search_url_text_selected = 2131034127;
+ // aapt resource value: 0x7f0b0003
+ public const int abc_search_url_text_selected = 2131427331;
- // aapt resource value: 0x7F050010
- public const int abc_secondary_text_material_dark = 2131034128;
+ // aapt resource value: 0x7f0b0054
+ public const int abc_secondary_text_material_dark = 2131427412;
- // aapt resource value: 0x7F050011
- public const int abc_secondary_text_material_light = 2131034129;
+ // aapt resource value: 0x7f0b0055
+ public const int abc_secondary_text_material_light = 2131427413;
- // aapt resource value: 0x7F050012
- public const int abc_tint_btn_checkable = 2131034130;
+ // aapt resource value: 0x7f0b0056
+ public const int abc_tint_btn_checkable = 2131427414;
- // aapt resource value: 0x7F050013
- public const int abc_tint_default = 2131034131;
+ // aapt resource value: 0x7f0b0057
+ public const int abc_tint_default = 2131427415;
- // aapt resource value: 0x7F050014
- public const int abc_tint_edittext = 2131034132;
+ // aapt resource value: 0x7f0b0058
+ public const int abc_tint_edittext = 2131427416;
- // aapt resource value: 0x7F050015
- public const int abc_tint_seek_thumb = 2131034133;
+ // aapt resource value: 0x7f0b0059
+ public const int abc_tint_seek_thumb = 2131427417;
- // aapt resource value: 0x7F050016
- public const int abc_tint_spinner = 2131034134;
+ // aapt resource value: 0x7f0b005a
+ public const int abc_tint_spinner = 2131427418;
- // aapt resource value: 0x7F050017
- public const int abc_tint_switch_track = 2131034135;
+ // aapt resource value: 0x7f0b005b
+ public const int abc_tint_switch_track = 2131427419;
- // aapt resource value: 0x7F050018
- public const int accent_material_dark = 2131034136;
+ // aapt resource value: 0x7f0b0004
+ public const int accent_material_dark = 2131427332;
- // aapt resource value: 0x7F050019
- public const int accent_material_light = 2131034137;
+ // aapt resource value: 0x7f0b0005
+ public const int accent_material_light = 2131427333;
- // aapt resource value: 0x7F05001A
- public const int background_floating_material_dark = 2131034138;
+ // aapt resource value: 0x7f0b0006
+ public const int background_floating_material_dark = 2131427334;
- // aapt resource value: 0x7F05001B
- public const int background_floating_material_light = 2131034139;
+ // aapt resource value: 0x7f0b0007
+ public const int background_floating_material_light = 2131427335;
- // aapt resource value: 0x7F05001C
- public const int background_material_dark = 2131034140;
+ // aapt resource value: 0x7f0b0008
+ public const int background_material_dark = 2131427336;
- // aapt resource value: 0x7F05001D
- public const int background_material_light = 2131034141;
+ // aapt resource value: 0x7f0b0009
+ public const int background_material_light = 2131427337;
- // aapt resource value: 0x7F05001E
- public const int bright_foreground_disabled_material_dark = 2131034142;
+ // aapt resource value: 0x7f0b000a
+ public const int bright_foreground_disabled_material_dark = 2131427338;
- // aapt resource value: 0x7F05001F
- public const int bright_foreground_disabled_material_light = 2131034143;
+ // aapt resource value: 0x7f0b000b
+ public const int bright_foreground_disabled_material_light = 2131427339;
- // aapt resource value: 0x7F050020
- public const int bright_foreground_inverse_material_dark = 2131034144;
+ // aapt resource value: 0x7f0b000c
+ public const int bright_foreground_inverse_material_dark = 2131427340;
- // aapt resource value: 0x7F050021
- public const int bright_foreground_inverse_material_light = 2131034145;
+ // aapt resource value: 0x7f0b000d
+ public const int bright_foreground_inverse_material_light = 2131427341;
- // aapt resource value: 0x7F050022
- public const int bright_foreground_material_dark = 2131034146;
+ // aapt resource value: 0x7f0b000e
+ public const int bright_foreground_material_dark = 2131427342;
- // aapt resource value: 0x7F050023
- public const int bright_foreground_material_light = 2131034147;
+ // aapt resource value: 0x7f0b000f
+ public const int bright_foreground_material_light = 2131427343;
- // aapt resource value: 0x7F050024
- public const int button_material_dark = 2131034148;
+ // aapt resource value: 0x7f0b0010
+ public const int button_material_dark = 2131427344;
- // aapt resource value: 0x7F050025
- public const int button_material_light = 2131034149;
+ // aapt resource value: 0x7f0b0011
+ public const int button_material_light = 2131427345;
- // aapt resource value: 0x7F050026
- public const int dim_foreground_disabled_material_dark = 2131034150;
+ // aapt resource value: 0x7f0b0012
+ public const int dim_foreground_disabled_material_dark = 2131427346;
- // aapt resource value: 0x7F050027
- public const int dim_foreground_disabled_material_light = 2131034151;
+ // aapt resource value: 0x7f0b0013
+ public const int dim_foreground_disabled_material_light = 2131427347;
- // aapt resource value: 0x7F050028
- public const int dim_foreground_material_dark = 2131034152;
+ // aapt resource value: 0x7f0b0014
+ public const int dim_foreground_material_dark = 2131427348;
- // aapt resource value: 0x7F050029
- public const int dim_foreground_material_light = 2131034153;
+ // aapt resource value: 0x7f0b0015
+ public const int dim_foreground_material_light = 2131427349;
- // aapt resource value: 0x7F05002A
- public const int error_color_material = 2131034154;
+ // aapt resource value: 0x7f0b0016
+ public const int error_color_material = 2131427350;
- // aapt resource value: 0x7F05002B
- public const int foreground_material_dark = 2131034155;
+ // aapt resource value: 0x7f0b0017
+ public const int foreground_material_dark = 2131427351;
- // aapt resource value: 0x7F05002C
- public const int foreground_material_light = 2131034156;
+ // aapt resource value: 0x7f0b0018
+ public const int foreground_material_light = 2131427352;
- // aapt resource value: 0x7F05002D
- public const int highlighted_text_material_dark = 2131034157;
+ // aapt resource value: 0x7f0b0019
+ public const int highlighted_text_material_dark = 2131427353;
- // aapt resource value: 0x7F05002E
- public const int highlighted_text_material_light = 2131034158;
+ // aapt resource value: 0x7f0b001a
+ public const int highlighted_text_material_light = 2131427354;
- // aapt resource value: 0x7F05002F
- public const int material_blue_grey_800 = 2131034159;
+ // aapt resource value: 0x7f0b001b
+ public const int material_blue_grey_800 = 2131427355;
- // aapt resource value: 0x7F050030
- public const int material_blue_grey_900 = 2131034160;
+ // aapt resource value: 0x7f0b001c
+ public const int material_blue_grey_900 = 2131427356;
- // aapt resource value: 0x7F050031
- public const int material_blue_grey_950 = 2131034161;
+ // aapt resource value: 0x7f0b001d
+ public const int material_blue_grey_950 = 2131427357;
- // aapt resource value: 0x7F050032
- public const int material_deep_teal_200 = 2131034162;
+ // aapt resource value: 0x7f0b001e
+ public const int material_deep_teal_200 = 2131427358;
- // aapt resource value: 0x7F050033
- public const int material_deep_teal_500 = 2131034163;
+ // aapt resource value: 0x7f0b001f
+ public const int material_deep_teal_500 = 2131427359;
- // aapt resource value: 0x7F050034
- public const int material_grey_100 = 2131034164;
+ // aapt resource value: 0x7f0b0020
+ public const int material_grey_100 = 2131427360;
- // aapt resource value: 0x7F050035
- public const int material_grey_300 = 2131034165;
+ // aapt resource value: 0x7f0b0021
+ public const int material_grey_300 = 2131427361;
- // aapt resource value: 0x7F050036
- public const int material_grey_50 = 2131034166;
+ // aapt resource value: 0x7f0b0022
+ public const int material_grey_50 = 2131427362;
- // aapt resource value: 0x7F050037
- public const int material_grey_600 = 2131034167;
+ // aapt resource value: 0x7f0b0023
+ public const int material_grey_600 = 2131427363;
- // aapt resource value: 0x7F050038
- public const int material_grey_800 = 2131034168;
+ // aapt resource value: 0x7f0b0024
+ public const int material_grey_800 = 2131427364;
- // aapt resource value: 0x7F050039
- public const int material_grey_850 = 2131034169;
+ // aapt resource value: 0x7f0b0025
+ public const int material_grey_850 = 2131427365;
- // aapt resource value: 0x7F05003A
- public const int material_grey_900 = 2131034170;
+ // aapt resource value: 0x7f0b0026
+ public const int material_grey_900 = 2131427366;
- // aapt resource value: 0x7F05003B
- public const int material_red_500 = 2131034171;
+ // aapt resource value: 0x7f0b003e
+ public const int material_red_500 = 2131427390;
- // aapt resource value: 0x7F05003C
- public const int notification_action_color_filter = 2131034172;
+ // aapt resource value: 0x7f0b003c
+ public const int notification_action_color_filter = 2131427388;
- // aapt resource value: 0x7F05003D
- public const int notification_icon_bg_color = 2131034173;
+ // aapt resource value: 0x7f0b003d
+ public const int notification_icon_bg_color = 2131427389;
- // aapt resource value: 0x7F05003E
- public const int notification_material_background_media_default_color = 2131034174;
+ // aapt resource value: 0x7f0b003b
+ public const int notification_material_background_media_default_color = 2131427387;
- // aapt resource value: 0x7F05003F
- public const int pickerview_bgColor_default = 2131034175;
+ // aapt resource value: 0x7f0b003f
+ public const int pickerview_bgColor_default = 2131427391;
- // aapt resource value: 0x7F050040
- public const int pickerview_bgColor_overlay = 2131034176;
+ // aapt resource value: 0x7f0b0040
+ public const int pickerview_bgColor_overlay = 2131427392;
- // aapt resource value: 0x7F050041
- public const int pickerview_bg_topbar = 2131034177;
+ // aapt resource value: 0x7f0b0041
+ public const int pickerview_bg_topbar = 2131427393;
- // aapt resource value: 0x7F050042
- public const int pickerview_timebtn_nor = 2131034178;
+ // aapt resource value: 0x7f0b0042
+ public const int pickerview_timebtn_nor = 2131427394;
- // aapt resource value: 0x7F050043
- public const int pickerview_timebtn_pre = 2131034179;
+ // aapt resource value: 0x7f0b0043
+ public const int pickerview_timebtn_pre = 2131427395;
- // aapt resource value: 0x7F050044
- public const int pickerview_topbar_title = 2131034180;
+ // aapt resource value: 0x7f0b0044
+ public const int pickerview_topbar_title = 2131427396;
- // aapt resource value: 0x7F050045
- public const int pickerview_wheelview_textcolor_center = 2131034181;
+ // aapt resource value: 0x7f0b0045
+ public const int pickerview_wheelview_textcolor_center = 2131427397;
- // aapt resource value: 0x7F050046
- public const int pickerview_wheelview_textcolor_divider = 2131034182;
+ // aapt resource value: 0x7f0b0046
+ public const int pickerview_wheelview_textcolor_divider = 2131427398;
- // aapt resource value: 0x7F050047
- public const int pickerview_wheelview_textcolor_out = 2131034183;
+ // aapt resource value: 0x7f0b0047
+ public const int pickerview_wheelview_textcolor_out = 2131427399;
- // aapt resource value: 0x7F050048
- public const int primary_dark_material_dark = 2131034184;
+ // aapt resource value: 0x7f0b0027
+ public const int primary_dark_material_dark = 2131427367;
- // aapt resource value: 0x7F050049
- public const int primary_dark_material_light = 2131034185;
+ // aapt resource value: 0x7f0b0028
+ public const int primary_dark_material_light = 2131427368;
- // aapt resource value: 0x7F05004A
- public const int primary_material_dark = 2131034186;
+ // aapt resource value: 0x7f0b0029
+ public const int primary_material_dark = 2131427369;
- // aapt resource value: 0x7F05004B
- public const int primary_material_light = 2131034187;
+ // aapt resource value: 0x7f0b002a
+ public const int primary_material_light = 2131427370;
- // aapt resource value: 0x7F05004C
- public const int primary_text_default_material_dark = 2131034188;
+ // aapt resource value: 0x7f0b002b
+ public const int primary_text_default_material_dark = 2131427371;
- // aapt resource value: 0x7F05004D
- public const int primary_text_default_material_light = 2131034189;
+ // aapt resource value: 0x7f0b002c
+ public const int primary_text_default_material_light = 2131427372;
- // aapt resource value: 0x7F05004E
- public const int primary_text_disabled_material_dark = 2131034190;
+ // aapt resource value: 0x7f0b002d
+ public const int primary_text_disabled_material_dark = 2131427373;
- // aapt resource value: 0x7F05004F
- public const int primary_text_disabled_material_light = 2131034191;
+ // aapt resource value: 0x7f0b002e
+ public const int primary_text_disabled_material_light = 2131427374;
- // aapt resource value: 0x7F050050
- public const int ripple_material_dark = 2131034192;
+ // aapt resource value: 0x7f0b002f
+ public const int ripple_material_dark = 2131427375;
- // aapt resource value: 0x7F050051
- public const int ripple_material_light = 2131034193;
+ // aapt resource value: 0x7f0b0030
+ public const int ripple_material_light = 2131427376;
- // aapt resource value: 0x7F050052
- public const int secondary_text_default_material_dark = 2131034194;
+ // aapt resource value: 0x7f0b0031
+ public const int secondary_text_default_material_dark = 2131427377;
- // aapt resource value: 0x7F050053
- public const int secondary_text_default_material_light = 2131034195;
+ // aapt resource value: 0x7f0b0032
+ public const int secondary_text_default_material_light = 2131427378;
- // aapt resource value: 0x7F050054
- public const int secondary_text_disabled_material_dark = 2131034196;
+ // aapt resource value: 0x7f0b0033
+ public const int secondary_text_disabled_material_dark = 2131427379;
- // aapt resource value: 0x7F050055
- public const int secondary_text_disabled_material_light = 2131034197;
+ // aapt resource value: 0x7f0b0034
+ public const int secondary_text_disabled_material_light = 2131427380;
- // aapt resource value: 0x7F050056
- public const int switch_thumb_disabled_material_dark = 2131034198;
+ // aapt resource value: 0x7f0b0035
+ public const int switch_thumb_disabled_material_dark = 2131427381;
- // aapt resource value: 0x7F050057
- public const int switch_thumb_disabled_material_light = 2131034199;
+ // aapt resource value: 0x7f0b0036
+ public const int switch_thumb_disabled_material_light = 2131427382;
- // aapt resource value: 0x7F050058
- public const int switch_thumb_material_dark = 2131034200;
+ // aapt resource value: 0x7f0b005c
+ public const int switch_thumb_material_dark = 2131427420;
- // aapt resource value: 0x7F050059
- public const int switch_thumb_material_light = 2131034201;
+ // aapt resource value: 0x7f0b005d
+ public const int switch_thumb_material_light = 2131427421;
- // aapt resource value: 0x7F05005A
- public const int switch_thumb_normal_material_dark = 2131034202;
+ // aapt resource value: 0x7f0b0037
+ public const int switch_thumb_normal_material_dark = 2131427383;
- // aapt resource value: 0x7F05005B
- public const int switch_thumb_normal_material_light = 2131034203;
+ // aapt resource value: 0x7f0b0038
+ public const int switch_thumb_normal_material_light = 2131427384;
- // aapt resource value: 0x7F05005C
- public const int tooltip_background_dark = 2131034204;
+ // aapt resource value: 0x7f0b0039
+ public const int tooltip_background_dark = 2131427385;
- // aapt resource value: 0x7F05005D
- public const int tooltip_background_light = 2131034205;
+ // aapt resource value: 0x7f0b003a
+ public const int tooltip_background_light = 2131427386;
static Color()
{
@@ -1488,359 +1488,359 @@
public partial class Dimension
{
- // aapt resource value: 0x7F060000
- public const int abc_action_bar_content_inset_material = 2131099648;
+ // aapt resource value: 0x7f08000c
+ public const int abc_action_bar_content_inset_material = 2131230732;
- // aapt resource value: 0x7F060001
- public const int abc_action_bar_content_inset_with_nav = 2131099649;
+ // aapt resource value: 0x7f08000d
+ public const int abc_action_bar_content_inset_with_nav = 2131230733;
- // aapt resource value: 0x7F060002
- public const int abc_action_bar_default_height_material = 2131099650;
+ // aapt resource value: 0x7f080001
+ public const int abc_action_bar_default_height_material = 2131230721;
- // aapt resource value: 0x7F060003
- public const int abc_action_bar_default_padding_end_material = 2131099651;
+ // aapt resource value: 0x7f08000e
+ public const int abc_action_bar_default_padding_end_material = 2131230734;
- // aapt resource value: 0x7F060004
- public const int abc_action_bar_default_padding_start_material = 2131099652;
+ // aapt resource value: 0x7f08000f
+ public const int abc_action_bar_default_padding_start_material = 2131230735;
- // aapt resource value: 0x7F060005
- public const int abc_action_bar_elevation_material = 2131099653;
+ // aapt resource value: 0x7f080011
+ public const int abc_action_bar_elevation_material = 2131230737;
- // aapt resource value: 0x7F060006
- public const int abc_action_bar_icon_vertical_padding_material = 2131099654;
+ // aapt resource value: 0x7f080012
+ public const int abc_action_bar_icon_vertical_padding_material = 2131230738;
- // aapt resource value: 0x7F060007
- public const int abc_action_bar_overflow_padding_end_material = 2131099655;
+ // aapt resource value: 0x7f080013
+ public const int abc_action_bar_overflow_padding_end_material = 2131230739;
- // aapt resource value: 0x7F060008
- public const int abc_action_bar_overflow_padding_start_material = 2131099656;
+ // aapt resource value: 0x7f080014
+ public const int abc_action_bar_overflow_padding_start_material = 2131230740;
- // aapt resource value: 0x7F060009
- public const int abc_action_bar_progress_bar_size = 2131099657;
+ // aapt resource value: 0x7f080002
+ public const int abc_action_bar_progress_bar_size = 2131230722;
- // aapt resource value: 0x7F06000A
- public const int abc_action_bar_stacked_max_height = 2131099658;
+ // aapt resource value: 0x7f080015
+ public const int abc_action_bar_stacked_max_height = 2131230741;
- // aapt resource value: 0x7F06000B
- public const int abc_action_bar_stacked_tab_max_width = 2131099659;
+ // aapt resource value: 0x7f080016
+ public const int abc_action_bar_stacked_tab_max_width = 2131230742;
- // aapt resource value: 0x7F06000C
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131099660;
+ // aapt resource value: 0x7f080017
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131230743;
- // aapt resource value: 0x7F06000D
- public const int abc_action_bar_subtitle_top_margin_material = 2131099661;
+ // aapt resource value: 0x7f080018
+ public const int abc_action_bar_subtitle_top_margin_material = 2131230744;
- // aapt resource value: 0x7F06000E
- public const int abc_action_button_min_height_material = 2131099662;
+ // aapt resource value: 0x7f080019
+ public const int abc_action_button_min_height_material = 2131230745;
- // aapt resource value: 0x7F06000F
- public const int abc_action_button_min_width_material = 2131099663;
+ // aapt resource value: 0x7f08001a
+ public const int abc_action_button_min_width_material = 2131230746;
- // aapt resource value: 0x7F060010
- public const int abc_action_button_min_width_overflow_material = 2131099664;
+ // aapt resource value: 0x7f08001b
+ public const int abc_action_button_min_width_overflow_material = 2131230747;
- // aapt resource value: 0x7F060011
- public const int abc_alert_dialog_button_bar_height = 2131099665;
+ // aapt resource value: 0x7f080000
+ public const int abc_alert_dialog_button_bar_height = 2131230720;
- // aapt resource value: 0x7F060012
- public const int abc_button_inset_horizontal_material = 2131099666;
+ // aapt resource value: 0x7f08001c
+ public const int abc_button_inset_horizontal_material = 2131230748;
- // aapt resource value: 0x7F060013
- public const int abc_button_inset_vertical_material = 2131099667;
+ // aapt resource value: 0x7f08001d
+ public const int abc_button_inset_vertical_material = 2131230749;
- // aapt resource value: 0x7F060014
- public const int abc_button_padding_horizontal_material = 2131099668;
+ // aapt resource value: 0x7f08001e
+ public const int abc_button_padding_horizontal_material = 2131230750;
- // aapt resource value: 0x7F060015
- public const int abc_button_padding_vertical_material = 2131099669;
+ // aapt resource value: 0x7f08001f
+ public const int abc_button_padding_vertical_material = 2131230751;
- // aapt resource value: 0x7F060016
- public const int abc_cascading_menus_min_smallest_width = 2131099670;
+ // aapt resource value: 0x7f080020
+ public const int abc_cascading_menus_min_smallest_width = 2131230752;
- // aapt resource value: 0x7F060017
- public const int abc_config_prefDialogWidth = 2131099671;
+ // aapt resource value: 0x7f080005
+ public const int abc_config_prefDialogWidth = 2131230725;
- // aapt resource value: 0x7F060018
- public const int abc_control_corner_material = 2131099672;
+ // aapt resource value: 0x7f080021
+ public const int abc_control_corner_material = 2131230753;
- // aapt resource value: 0x7F060019
- public const int abc_control_inset_material = 2131099673;
+ // aapt resource value: 0x7f080022
+ public const int abc_control_inset_material = 2131230754;
- // aapt resource value: 0x7F06001A
- public const int abc_control_padding_material = 2131099674;
+ // aapt resource value: 0x7f080023
+ public const int abc_control_padding_material = 2131230755;
- // aapt resource value: 0x7F06001B
- public const int abc_dialog_fixed_height_major = 2131099675;
+ // aapt resource value: 0x7f080006
+ public const int abc_dialog_fixed_height_major = 2131230726;
- // aapt resource value: 0x7F06001C
- public const int abc_dialog_fixed_height_minor = 2131099676;
+ // aapt resource value: 0x7f080007
+ public const int abc_dialog_fixed_height_minor = 2131230727;
- // aapt resource value: 0x7F06001D
- public const int abc_dialog_fixed_width_major = 2131099677;
+ // aapt resource value: 0x7f080008
+ public const int abc_dialog_fixed_width_major = 2131230728;
- // aapt resource value: 0x7F06001E
- public const int abc_dialog_fixed_width_minor = 2131099678;
+ // aapt resource value: 0x7f080009
+ public const int abc_dialog_fixed_width_minor = 2131230729;
- // aapt resource value: 0x7F06001F
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131099679;
+ // aapt resource value: 0x7f080024
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131230756;
- // aapt resource value: 0x7F060020
- public const int abc_dialog_list_padding_top_no_title = 2131099680;
+ // aapt resource value: 0x7f080025
+ public const int abc_dialog_list_padding_top_no_title = 2131230757;
- // aapt resource value: 0x7F060021
- public const int abc_dialog_min_width_major = 2131099681;
+ // aapt resource value: 0x7f08000a
+ public const int abc_dialog_min_width_major = 2131230730;
- // aapt resource value: 0x7F060022
- public const int abc_dialog_min_width_minor = 2131099682;
+ // aapt resource value: 0x7f08000b
+ public const int abc_dialog_min_width_minor = 2131230731;
- // aapt resource value: 0x7F060023
- public const int abc_dialog_padding_material = 2131099683;
+ // aapt resource value: 0x7f080026
+ public const int abc_dialog_padding_material = 2131230758;
- // aapt resource value: 0x7F060024
- public const int abc_dialog_padding_top_material = 2131099684;
+ // aapt resource value: 0x7f080027
+ public const int abc_dialog_padding_top_material = 2131230759;
- // aapt resource value: 0x7F060025
- public const int abc_dialog_title_divider_material = 2131099685;
+ // aapt resource value: 0x7f080028
+ public const int abc_dialog_title_divider_material = 2131230760;
- // aapt resource value: 0x7F060026
- public const int abc_disabled_alpha_material_dark = 2131099686;
+ // aapt resource value: 0x7f080029
+ public const int abc_disabled_alpha_material_dark = 2131230761;
- // aapt resource value: 0x7F060027
- public const int abc_disabled_alpha_material_light = 2131099687;
+ // aapt resource value: 0x7f08002a
+ public const int abc_disabled_alpha_material_light = 2131230762;
- // aapt resource value: 0x7F060028
- public const int abc_dropdownitem_icon_width = 2131099688;
+ // aapt resource value: 0x7f08002b
+ public const int abc_dropdownitem_icon_width = 2131230763;
- // aapt resource value: 0x7F060029
- public const int abc_dropdownitem_text_padding_left = 2131099689;
+ // aapt resource value: 0x7f08002c
+ public const int abc_dropdownitem_text_padding_left = 2131230764;
- // aapt resource value: 0x7F06002A
- public const int abc_dropdownitem_text_padding_right = 2131099690;
+ // aapt resource value: 0x7f08002d
+ public const int abc_dropdownitem_text_padding_right = 2131230765;
- // aapt resource value: 0x7F06002B
- public const int abc_edit_text_inset_bottom_material = 2131099691;
+ // aapt resource value: 0x7f08002e
+ public const int abc_edit_text_inset_bottom_material = 2131230766;
- // aapt resource value: 0x7F06002C
- public const int abc_edit_text_inset_horizontal_material = 2131099692;
+ // aapt resource value: 0x7f08002f
+ public const int abc_edit_text_inset_horizontal_material = 2131230767;
- // aapt resource value: 0x7F06002D
- public const int abc_edit_text_inset_top_material = 2131099693;
+ // aapt resource value: 0x7f080030
+ public const int abc_edit_text_inset_top_material = 2131230768;
- // aapt resource value: 0x7F06002E
- public const int abc_floating_window_z = 2131099694;
+ // aapt resource value: 0x7f080031
+ public const int abc_floating_window_z = 2131230769;
- // aapt resource value: 0x7F06002F
- public const int abc_list_item_padding_horizontal_material = 2131099695;
+ // aapt resource value: 0x7f080032
+ public const int abc_list_item_padding_horizontal_material = 2131230770;
- // aapt resource value: 0x7F060030
- public const int abc_panel_menu_list_width = 2131099696;
+ // aapt resource value: 0x7f080033
+ public const int abc_panel_menu_list_width = 2131230771;
- // aapt resource value: 0x7F060031
- public const int abc_progress_bar_height_material = 2131099697;
+ // aapt resource value: 0x7f080034
+ public const int abc_progress_bar_height_material = 2131230772;
- // aapt resource value: 0x7F060032
- public const int abc_search_view_preferred_height = 2131099698;
+ // aapt resource value: 0x7f080035
+ public const int abc_search_view_preferred_height = 2131230773;
- // aapt resource value: 0x7F060033
- public const int abc_search_view_preferred_width = 2131099699;
+ // aapt resource value: 0x7f080036
+ public const int abc_search_view_preferred_width = 2131230774;
- // aapt resource value: 0x7F060034
- public const int abc_seekbar_track_background_height_material = 2131099700;
+ // aapt resource value: 0x7f080037
+ public const int abc_seekbar_track_background_height_material = 2131230775;
- // aapt resource value: 0x7F060035
- public const int abc_seekbar_track_progress_height_material = 2131099701;
+ // aapt resource value: 0x7f080038
+ public const int abc_seekbar_track_progress_height_material = 2131230776;
- // aapt resource value: 0x7F060036
- public const int abc_select_dialog_padding_start_material = 2131099702;
+ // aapt resource value: 0x7f080039
+ public const int abc_select_dialog_padding_start_material = 2131230777;
- // aapt resource value: 0x7F060037
- public const int abc_switch_padding = 2131099703;
+ // aapt resource value: 0x7f080010
+ public const int abc_switch_padding = 2131230736;
- // aapt resource value: 0x7F060038
- public const int abc_text_size_body_1_material = 2131099704;
+ // aapt resource value: 0x7f08003a
+ public const int abc_text_size_body_1_material = 2131230778;
- // aapt resource value: 0x7F060039
- public const int abc_text_size_body_2_material = 2131099705;
+ // aapt resource value: 0x7f08003b
+ public const int abc_text_size_body_2_material = 2131230779;
- // aapt resource value: 0x7F06003A
- public const int abc_text_size_button_material = 2131099706;
+ // aapt resource value: 0x7f08003c
+ public const int abc_text_size_button_material = 2131230780;
- // aapt resource value: 0x7F06003B
- public const int abc_text_size_caption_material = 2131099707;
+ // aapt resource value: 0x7f08003d
+ public const int abc_text_size_caption_material = 2131230781;
- // aapt resource value: 0x7F06003C
- public const int abc_text_size_display_1_material = 2131099708;
+ // aapt resource value: 0x7f08003e
+ public const int abc_text_size_display_1_material = 2131230782;
- // aapt resource value: 0x7F06003D
- public const int abc_text_size_display_2_material = 2131099709;
+ // aapt resource value: 0x7f08003f
+ public const int abc_text_size_display_2_material = 2131230783;
- // aapt resource value: 0x7F06003E
- public const int abc_text_size_display_3_material = 2131099710;
+ // aapt resource value: 0x7f080040
+ public const int abc_text_size_display_3_material = 2131230784;
- // aapt resource value: 0x7F06003F
- public const int abc_text_size_display_4_material = 2131099711;
+ // aapt resource value: 0x7f080041
+ public const int abc_text_size_display_4_material = 2131230785;
- // aapt resource value: 0x7F060040
- public const int abc_text_size_headline_material = 2131099712;
+ // aapt resource value: 0x7f080042
+ public const int abc_text_size_headline_material = 2131230786;
- // aapt resource value: 0x7F060041
- public const int abc_text_size_large_material = 2131099713;
+ // aapt resource value: 0x7f080043
+ public const int abc_text_size_large_material = 2131230787;
- // aapt resource value: 0x7F060042
- public const int abc_text_size_medium_material = 2131099714;
+ // aapt resource value: 0x7f080044
+ public const int abc_text_size_medium_material = 2131230788;
- // aapt resource value: 0x7F060043
- public const int abc_text_size_menu_header_material = 2131099715;
+ // aapt resource value: 0x7f080045
+ public const int abc_text_size_menu_header_material = 2131230789;
- // aapt resource value: 0x7F060044
- public const int abc_text_size_menu_material = 2131099716;
+ // aapt resource value: 0x7f080046
+ public const int abc_text_size_menu_material = 2131230790;
- // aapt resource value: 0x7F060045
- public const int abc_text_size_small_material = 2131099717;
+ // aapt resource value: 0x7f080047
+ public const int abc_text_size_small_material = 2131230791;
- // aapt resource value: 0x7F060046
- public const int abc_text_size_subhead_material = 2131099718;
+ // aapt resource value: 0x7f080048
+ public const int abc_text_size_subhead_material = 2131230792;
- // aapt resource value: 0x7F060047
- public const int abc_text_size_subtitle_material_toolbar = 2131099719;
+ // aapt resource value: 0x7f080003
+ public const int abc_text_size_subtitle_material_toolbar = 2131230723;
- // aapt resource value: 0x7F060048
- public const int abc_text_size_title_material = 2131099720;
+ // aapt resource value: 0x7f080049
+ public const int abc_text_size_title_material = 2131230793;
- // aapt resource value: 0x7F060049
- public const int abc_text_size_title_material_toolbar = 2131099721;
+ // aapt resource value: 0x7f080004
+ public const int abc_text_size_title_material_toolbar = 2131230724;
- // aapt resource value: 0x7F06004A
- public const int compat_button_inset_horizontal_material = 2131099722;
+ // aapt resource value: 0x7f08005f
+ public const int compat_button_inset_horizontal_material = 2131230815;
- // aapt resource value: 0x7F06004B
- public const int compat_button_inset_vertical_material = 2131099723;
+ // aapt resource value: 0x7f080060
+ public const int compat_button_inset_vertical_material = 2131230816;
- // aapt resource value: 0x7F06004C
- public const int compat_button_padding_horizontal_material = 2131099724;
+ // aapt resource value: 0x7f080061
+ public const int compat_button_padding_horizontal_material = 2131230817;
- // aapt resource value: 0x7F06004D
- public const int compat_button_padding_vertical_material = 2131099725;
+ // aapt resource value: 0x7f080062
+ public const int compat_button_padding_vertical_material = 2131230818;
- // aapt resource value: 0x7F06004E
- public const int compat_control_corner_material = 2131099726;
+ // aapt resource value: 0x7f080063
+ public const int compat_control_corner_material = 2131230819;
- // aapt resource value: 0x7F06004F
- public const int disabled_alpha_material_dark = 2131099727;
+ // aapt resource value: 0x7f08004a
+ public const int disabled_alpha_material_dark = 2131230794;
- // aapt resource value: 0x7F060050
- public const int disabled_alpha_material_light = 2131099728;
+ // aapt resource value: 0x7f08004b
+ public const int disabled_alpha_material_light = 2131230795;
- // aapt resource value: 0x7F060051
- public const int fingerprint_icon_size = 2131099729;
+ // aapt resource value: 0x7f080070
+ public const int fingerprint_icon_size = 2131230832;
- // aapt resource value: 0x7F060052
- public const int fingerprint_status_layout_margin_vertical = 2131099730;
+ // aapt resource value: 0x7f08006f
+ public const int fingerprint_status_layout_margin_vertical = 2131230831;
- // aapt resource value: 0x7F060053
- public const int highlight_alpha_material_colored = 2131099731;
+ // aapt resource value: 0x7f08004c
+ public const int highlight_alpha_material_colored = 2131230796;
- // aapt resource value: 0x7F060054
- public const int highlight_alpha_material_dark = 2131099732;
+ // aapt resource value: 0x7f08004d
+ public const int highlight_alpha_material_dark = 2131230797;
- // aapt resource value: 0x7F060055
- public const int highlight_alpha_material_light = 2131099733;
+ // aapt resource value: 0x7f08004e
+ public const int highlight_alpha_material_light = 2131230798;
- // aapt resource value: 0x7F060056
- public const int hint_alpha_material_dark = 2131099734;
+ // aapt resource value: 0x7f08004f
+ public const int hint_alpha_material_dark = 2131230799;
- // aapt resource value: 0x7F060057
- public const int hint_alpha_material_light = 2131099735;
+ // aapt resource value: 0x7f080050
+ public const int hint_alpha_material_light = 2131230800;
- // aapt resource value: 0x7F060058
- public const int hint_pressed_alpha_material_dark = 2131099736;
+ // aapt resource value: 0x7f080051
+ public const int hint_pressed_alpha_material_dark = 2131230801;
- // aapt resource value: 0x7F060059
- public const int hint_pressed_alpha_material_light = 2131099737;
+ // aapt resource value: 0x7f080052
+ public const int hint_pressed_alpha_material_light = 2131230802;
- // aapt resource value: 0x7F06005A
- public const int notification_action_icon_size = 2131099738;
+ // aapt resource value: 0x7f080064
+ public const int notification_action_icon_size = 2131230820;
- // aapt resource value: 0x7F06005B
- public const int notification_action_text_size = 2131099739;
+ // aapt resource value: 0x7f080065
+ public const int notification_action_text_size = 2131230821;
- // aapt resource value: 0x7F06005C
- public const int notification_big_circle_margin = 2131099740;
+ // aapt resource value: 0x7f080066
+ public const int notification_big_circle_margin = 2131230822;
- // aapt resource value: 0x7F06005D
- public const int notification_content_margin_start = 2131099741;
+ // aapt resource value: 0x7f08005c
+ public const int notification_content_margin_start = 2131230812;
- // aapt resource value: 0x7F06005E
- public const int notification_large_icon_height = 2131099742;
+ // aapt resource value: 0x7f080067
+ public const int notification_large_icon_height = 2131230823;
- // aapt resource value: 0x7F06005F
- public const int notification_large_icon_width = 2131099743;
+ // aapt resource value: 0x7f080068
+ public const int notification_large_icon_width = 2131230824;
- // aapt resource value: 0x7F060060
- public const int notification_main_column_padding_top = 2131099744;
+ // aapt resource value: 0x7f08005d
+ public const int notification_main_column_padding_top = 2131230813;
- // aapt resource value: 0x7F060061
- public const int notification_media_narrow_margin = 2131099745;
+ // aapt resource value: 0x7f08005e
+ public const int notification_media_narrow_margin = 2131230814;
- // aapt resource value: 0x7F060062
- public const int notification_right_icon_size = 2131099746;
+ // aapt resource value: 0x7f080069
+ public const int notification_right_icon_size = 2131230825;
- // aapt resource value: 0x7F060063
- public const int notification_right_side_padding_top = 2131099747;
+ // aapt resource value: 0x7f08005b
+ public const int notification_right_side_padding_top = 2131230811;
- // aapt resource value: 0x7F060064
- public const int notification_small_icon_background_padding = 2131099748;
+ // aapt resource value: 0x7f08006a
+ public const int notification_small_icon_background_padding = 2131230826;
- // aapt resource value: 0x7F060065
- public const int notification_small_icon_size_as_large = 2131099749;
+ // aapt resource value: 0x7f08006b
+ public const int notification_small_icon_size_as_large = 2131230827;
- // aapt resource value: 0x7F060066
- public const int notification_subtext_size = 2131099750;
+ // aapt resource value: 0x7f08006c
+ public const int notification_subtext_size = 2131230828;
- // aapt resource value: 0x7F060067
- public const int notification_top_pad = 2131099751;
+ // aapt resource value: 0x7f08006d
+ public const int notification_top_pad = 2131230829;
- // aapt resource value: 0x7F060068
- public const int notification_top_pad_large_text = 2131099752;
+ // aapt resource value: 0x7f08006e
+ public const int notification_top_pad_large_text = 2131230830;
- // aapt resource value: 0x7F060069
- public const int pickerview_textsize = 2131099753;
+ // aapt resource value: 0x7f080071
+ public const int pickerview_textsize = 2131230833;
- // aapt resource value: 0x7F06006A
- public const int pickerview_topbar_btn_textsize = 2131099754;
+ // aapt resource value: 0x7f080072
+ public const int pickerview_topbar_btn_textsize = 2131230834;
- // aapt resource value: 0x7F06006B
- public const int pickerview_topbar_height = 2131099755;
+ // aapt resource value: 0x7f080073
+ public const int pickerview_topbar_height = 2131230835;
- // aapt resource value: 0x7F06006C
- public const int pickerview_topbar_padding = 2131099756;
+ // aapt resource value: 0x7f080074
+ public const int pickerview_topbar_padding = 2131230836;
- // aapt resource value: 0x7F06006D
- public const int pickerview_topbar_title_textsize = 2131099757;
+ // aapt resource value: 0x7f080075
+ public const int pickerview_topbar_title_textsize = 2131230837;
- // aapt resource value: 0x7F06006E
- public const int tooltip_corner_radius = 2131099758;
+ // aapt resource value: 0x7f080053
+ public const int tooltip_corner_radius = 2131230803;
- // aapt resource value: 0x7F06006F
- public const int tooltip_horizontal_padding = 2131099759;
+ // aapt resource value: 0x7f080054
+ public const int tooltip_horizontal_padding = 2131230804;
- // aapt resource value: 0x7F060070
- public const int tooltip_margin = 2131099760;
+ // aapt resource value: 0x7f080055
+ public const int tooltip_margin = 2131230805;
- // aapt resource value: 0x7F060071
- public const int tooltip_precise_anchor_extra_offset = 2131099761;
+ // aapt resource value: 0x7f080056
+ public const int tooltip_precise_anchor_extra_offset = 2131230806;
- // aapt resource value: 0x7F060072
- public const int tooltip_precise_anchor_threshold = 2131099762;
+ // aapt resource value: 0x7f080057
+ public const int tooltip_precise_anchor_threshold = 2131230807;
- // aapt resource value: 0x7F060073
- public const int tooltip_vertical_padding = 2131099763;
+ // aapt resource value: 0x7f080058
+ public const int tooltip_vertical_padding = 2131230808;
- // aapt resource value: 0x7F060074
- public const int tooltip_y_offset_non_touch = 2131099764;
+ // aapt resource value: 0x7f080059
+ public const int tooltip_y_offset_non_touch = 2131230809;
- // aapt resource value: 0x7F060075
- public const int tooltip_y_offset_touch = 2131099765;
+ // aapt resource value: 0x7f08005a
+ public const int tooltip_y_offset_touch = 2131230810;
static Dimension()
{
@@ -1855,398 +1855,398 @@
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: 0x7F070040
- public const int abc_spinner_mtrl_am_alpha = 2131165248;
+ // aapt resource value: 0x7f020040
+ public const int abc_spinner_mtrl_am_alpha = 2130837568;
- // aapt resource value: 0x7F070041
- public const int abc_spinner_textfield_background_material = 2131165249;
+ // aapt resource value: 0x7f020041
+ public const int abc_spinner_textfield_background_material = 2130837569;
- // aapt resource value: 0x7F070042
- public const int abc_switch_thumb_material = 2131165250;
+ // aapt resource value: 0x7f020042
+ public const int abc_switch_thumb_material = 2130837570;
- // aapt resource value: 0x7F070043
- public const int abc_switch_track_mtrl_alpha = 2131165251;
+ // aapt resource value: 0x7f020043
+ public const int abc_switch_track_mtrl_alpha = 2130837571;
- // aapt resource value: 0x7F070044
- public const int abc_tab_indicator_material = 2131165252;
+ // aapt resource value: 0x7f020044
+ public const int abc_tab_indicator_material = 2130837572;
- // aapt resource value: 0x7F070045
- public const int abc_tab_indicator_mtrl_alpha = 2131165253;
+ // aapt resource value: 0x7f020045
+ public const int abc_tab_indicator_mtrl_alpha = 2130837573;
- // aapt resource value: 0x7F07004D
- public const int abc_textfield_activated_mtrl_alpha = 2131165261;
+ // aapt resource value: 0x7f020046
+ public const int abc_text_cursor_material = 2130837574;
- // aapt resource value: 0x7F07004E
- public const int abc_textfield_default_mtrl_alpha = 2131165262;
+ // aapt resource value: 0x7f020047
+ public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
- // aapt resource value: 0x7F07004F
- public const int abc_textfield_search_activated_mtrl_alpha = 2131165263;
+ // aapt resource value: 0x7f020048
+ public const int abc_text_select_handle_left_mtrl_light = 2130837576;
- // aapt resource value: 0x7F070050
- public const int abc_textfield_search_default_mtrl_alpha = 2131165264;
+ // aapt resource value: 0x7f020049
+ public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
- // aapt resource value: 0x7F070051
- public const int abc_textfield_search_material = 2131165265;
+ // aapt resource value: 0x7f02004a
+ public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
- // aapt resource value: 0x7F070046
- public const int abc_text_cursor_material = 2131165254;
+ // aapt resource value: 0x7f02004b
+ public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
- // aapt resource value: 0x7F070047
- public const int abc_text_select_handle_left_mtrl_dark = 2131165255;
+ // aapt resource value: 0x7f02004c
+ public const int abc_text_select_handle_right_mtrl_light = 2130837580;
- // aapt resource value: 0x7F070048
- public const int abc_text_select_handle_left_mtrl_light = 2131165256;
+ // aapt resource value: 0x7f02004d
+ public const int abc_textfield_activated_mtrl_alpha = 2130837581;
- // aapt resource value: 0x7F070049
- public const int abc_text_select_handle_middle_mtrl_dark = 2131165257;
+ // aapt resource value: 0x7f02004e
+ public const int abc_textfield_default_mtrl_alpha = 2130837582;
- // aapt resource value: 0x7F07004A
- public const int abc_text_select_handle_middle_mtrl_light = 2131165258;
+ // aapt resource value: 0x7f02004f
+ public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
- // aapt resource value: 0x7F07004B
- public const int abc_text_select_handle_right_mtrl_dark = 2131165259;
+ // aapt resource value: 0x7f020050
+ public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
- // aapt resource value: 0x7F07004C
- public const int abc_text_select_handle_right_mtrl_light = 2131165260;
+ // aapt resource value: 0x7f020051
+ public const int abc_textfield_search_material = 2130837585;
- // aapt resource value: 0x7F070052
- public const int abc_vector_test = 2131165266;
+ // aapt resource value: 0x7f020052
+ public const int abc_vector_test = 2130837586;
- // aapt resource value: 0x7F070053
- public const int fingerprint_draw_off = 2131165267;
+ // aapt resource value: 0x7f020053
+ public const int fingerprint_draw_off = 2130837587;
- // aapt resource value: 0x7F070054
- public const int fingerprint_draw_off_animation = 2131165268;
+ // aapt resource value: 0x7f020054
+ public const int fingerprint_draw_off_animation = 2130837588;
- // aapt resource value: 0x7F070055
- public const int fingerprint_draw_on = 2131165269;
+ // aapt resource value: 0x7f020055
+ public const int fingerprint_draw_on = 2130837589;
- // aapt resource value: 0x7F070056
- public const int fingerprint_draw_on_animation = 2131165270;
+ // aapt resource value: 0x7f020056
+ public const int fingerprint_draw_on_animation = 2130837590;
- // aapt resource value: 0x7F070057
- public const int fingerprint_error = 2131165271;
+ // aapt resource value: 0x7f020057
+ public const int fingerprint_error = 2130837591;
- // aapt resource value: 0x7F070058
- public const int fingerprint_error_off = 2131165272;
+ // aapt resource value: 0x7f020058
+ public const int fingerprint_error_off = 2130837592;
- // aapt resource value: 0x7F070059
- public const int fingerprint_error_off_animation = 2131165273;
+ // aapt resource value: 0x7f020059
+ public const int fingerprint_error_off_animation = 2130837593;
- // aapt resource value: 0x7F07005A
- public const int fingerprint_error_on = 2131165274;
+ // aapt resource value: 0x7f02005a
+ public const int fingerprint_error_on = 2130837594;
- // aapt resource value: 0x7F07005B
- public const int fingerprint_error_on_animation = 2131165275;
+ // aapt resource value: 0x7f02005b
+ public const int fingerprint_error_on_animation = 2130837595;
- // aapt resource value: 0x7F07005C
- public const int fingerprint_error_state_to_fp = 2131165276;
+ // aapt resource value: 0x7f02005c
+ public const int fingerprint_error_state_to_fp = 2130837596;
- // aapt resource value: 0x7F07005D
- public const int fingerprint_error_state_to_fp_animation = 2131165277;
+ // aapt resource value: 0x7f02005d
+ public const int fingerprint_error_state_to_fp_animation = 2130837597;
- // aapt resource value: 0x7F07005E
- public const int fingerprint_fingerprint = 2131165278;
+ // aapt resource value: 0x7f02005e
+ public const int fingerprint_fingerprint = 2130837598;
- // aapt resource value: 0x7F07005F
- public const int fingerprint_fp_to_error_state = 2131165279;
+ // aapt resource value: 0x7f02005f
+ public const int fingerprint_fp_to_error_state = 2130837599;
- // aapt resource value: 0x7F070060
- public const int fingerprint_fp_to_error_state_animation = 2131165280;
+ // aapt resource value: 0x7f020060
+ public const int fingerprint_fp_to_error_state_animation = 2130837600;
- // aapt resource value: 0x7F070061
- public const int gd_btn_shape_app_b = 2131165281;
+ // aapt resource value: 0x7f020061
+ public const int gd_btn_shape_app_b = 2130837601;
- // aapt resource value: 0x7F070062
- public const int gd_btn_shape_app_g = 2131165282;
+ // aapt resource value: 0x7f020062
+ public const int gd_btn_shape_app_g = 2130837602;
- // aapt resource value: 0x7F070063
- public const int gd_btn_shape_app_w = 2131165283;
+ // aapt resource value: 0x7f020063
+ public const int gd_btn_shape_app_w = 2130837603;
- // aapt resource value: 0x7F070064
- public const int gd_btn_shape_shadow_w = 2131165284;
+ // aapt resource value: 0x7f020064
+ public const int gd_btn_shape_shadow_w = 2130837604;
- // aapt resource value: 0x7F070065
- public const int gd_click_effect_select = 2131165285;
+ // aapt resource value: 0x7f020065
+ public const int gd_click_effect_select = 2130837605;
- // aapt resource value: 0x7F070072
- public const int Icon = 2131165298;
+ // aapt resource value: 0x7f020066
+ public const int ic_gdmap_add = 2130837606;
- // aapt resource value: 0x7F070066
- public const int ic_gdmap_add = 2131165286;
+ // aapt resource value: 0x7f020067
+ public const int ic_gdmap_back = 2130837607;
- // aapt resource value: 0x7F070067
- public const int ic_gdmap_back = 2131165287;
+ // aapt resource value: 0x7f020068
+ public const int ic_gdmap_delete = 2130837608;
- // aapt resource value: 0x7F070068
- public const int ic_gdmap_delete = 2131165288;
+ // aapt resource value: 0x7f020069
+ public const int ic_gdmap_home = 2130837609;
- // aapt resource value: 0x7F070069
- public const int ic_gdmap_home = 2131165289;
+ // aapt resource value: 0x7f02006a
+ public const int ic_gdmap_mylocation = 2130837610;
- // aapt resource value: 0x7F07006A
- public const int ic_gdmap_mylocation = 2131165290;
+ // aapt resource value: 0x7f02006b
+ public const int ic_gdmap_now = 2130837611;
- // aapt resource value: 0x7F07006B
- public const int ic_gdmap_now = 2131165291;
+ // aapt resource value: 0x7f02006c
+ public const int ic_gdmap_search = 2130837612;
- // aapt resource value: 0x7F07006C
- public const int ic_gdmap_search = 2131165292;
+ // aapt resource value: 0x7f02006d
+ public const int ic_gdmap_zoom_out = 2130837613;
- // aapt resource value: 0x7F07006D
- public const int ic_gdmap_zoom_out = 2131165293;
+ // aapt resource value: 0x7f02006e
+ public const int ic_gps_point = 2130837614;
- // aapt resource value: 0x7F07006E
- public const int ic_gps_point = 2131165294;
+ // aapt resource value: 0x7f02006f
+ public const int ic_seekbar_open = 2130837615;
- // aapt resource value: 0x7F07006F
- public const int ic_seekbar_open = 2131165295;
+ // aapt resource value: 0x7f020070
+ public const int ic_wd_curtain_bg = 2130837616;
- // aapt resource value: 0x7F070070
- public const int ic_wd_curtain_bg = 2131165296;
+ // aapt resource value: 0x7f020071
+ public const int ic_wd_seekbar_open = 2130837617;
- // aapt resource value: 0x7F070071
- public const int ic_wd_seekbar_open = 2131165297;
+ // aapt resource value: 0x7f020072
+ public const int Icon = 2130837618;
- // aapt resource value: 0x7F070073
- public const int Loading = 2131165299;
+ // aapt resource value: 0x7f020073
+ public const int Loading = 2130837619;
- // aapt resource value: 0x7F070074
- public const int notification_action_background = 2131165300;
+ // aapt resource value: 0x7f020074
+ public const int notification_action_background = 2130837620;
- // aapt resource value: 0x7F070075
- public const int notification_bg = 2131165301;
+ // aapt resource value: 0x7f020075
+ public const int notification_bg = 2130837621;
- // aapt resource value: 0x7F070076
- public const int notification_bg_low = 2131165302;
+ // aapt resource value: 0x7f020076
+ public const int notification_bg_low = 2130837622;
- // aapt resource value: 0x7F070077
- public const int notification_bg_low_normal = 2131165303;
+ // aapt resource value: 0x7f020077
+ public const int notification_bg_low_normal = 2130837623;
- // aapt resource value: 0x7F070078
- public const int notification_bg_low_pressed = 2131165304;
+ // aapt resource value: 0x7f020078
+ public const int notification_bg_low_pressed = 2130837624;
- // aapt resource value: 0x7F070079
- public const int notification_bg_normal = 2131165305;
+ // aapt resource value: 0x7f020079
+ public const int notification_bg_normal = 2130837625;
- // aapt resource value: 0x7F07007A
- public const int notification_bg_normal_pressed = 2131165306;
+ // aapt resource value: 0x7f02007a
+ public const int notification_bg_normal_pressed = 2130837626;
- // aapt resource value: 0x7F07007B
- public const int notification_icon_background = 2131165307;
+ // aapt resource value: 0x7f02007b
+ public const int notification_icon_background = 2130837627;
- // aapt resource value: 0x7F07007C
- public const int notification_template_icon_bg = 2131165308;
+ // aapt resource value: 0x7f020081
+ public const int notification_template_icon_bg = 2130837633;
- // aapt resource value: 0x7F07007D
- public const int notification_template_icon_low_bg = 2131165309;
+ // aapt resource value: 0x7f020082
+ public const int notification_template_icon_low_bg = 2130837634;
- // aapt resource value: 0x7F07007E
- public const int notification_tile_bg = 2131165310;
+ // aapt resource value: 0x7f02007c
+ public const int notification_tile_bg = 2130837628;
- // aapt resource value: 0x7F07007F
- public const int notify_panel_notification_icon_bg = 2131165311;
+ // aapt resource value: 0x7f02007d
+ public const int notify_panel_notification_icon_bg = 2130837629;
- // aapt resource value: 0x7F070080
- public const int selector_pickerview_btn = 2131165312;
+ // aapt resource value: 0x7f02007e
+ public const int selector_pickerview_btn = 2130837630;
- // aapt resource value: 0x7F070081
- public const int tooltip_frame_dark = 2131165313;
+ // aapt resource value: 0x7f02007f
+ public const int tooltip_frame_dark = 2130837631;
- // aapt resource value: 0x7F070082
- public const int tooltip_frame_light = 2131165314;
+ // aapt resource value: 0x7f020080
+ public const int tooltip_frame_light = 2130837632;
static Drawable()
{
@@ -2261,503 +2261,503 @@
public partial class Id
{
- // aapt resource value: 0x7F080009
- public const int action0 = 2131230729;
+ // aapt resource value: 0x7f0c0023
+ public const int ALT = 2131492899;
- // aapt resource value: 0x7F08001B
- public const int actions = 2131230747;
+ // aapt resource value: 0x7f0c0024
+ public const int CTRL = 2131492900;
- // aapt resource value: 0x7F08000A
- public const int action_bar = 2131230730;
+ // aapt resource value: 0x7f0c0034
+ public const int FILL = 2131492916;
- // aapt resource value: 0x7F08000B
- public const int action_bar_activity_content = 2131230731;
+ // aapt resource value: 0x7f0c0035
+ public const int FILL_STROKE = 2131492917;
- // aapt resource value: 0x7F08000C
- public const int action_bar_container = 2131230732;
+ // aapt resource value: 0x7f0c0025
+ public const int FUNCTION = 2131492901;
- // aapt resource value: 0x7F08000D
- public const int action_bar_root = 2131230733;
+ // aapt resource value: 0x7f0c0026
+ public const int META = 2131492902;
- // aapt resource value: 0x7F08000E
- public const int action_bar_spinner = 2131230734;
+ // aapt resource value: 0x7f0c0027
+ public const int SHIFT = 2131492903;
- // aapt resource value: 0x7F08000F
- public const int action_bar_subtitle = 2131230735;
+ // aapt resource value: 0x7f0c0036
+ public const int STROKE = 2131492918;
- // aapt resource value: 0x7F080010
- public const int action_bar_title = 2131230736;
+ // aapt resource value: 0x7f0c0028
+ public const int SYM = 2131492904;
- // aapt resource value: 0x7F080011
- public const int action_container = 2131230737;
+ // aapt resource value: 0x7f0c0095
+ public const int action0 = 2131493013;
- // aapt resource value: 0x7F080012
- public const int action_context_bar = 2131230738;
+ // aapt resource value: 0x7f0c005c
+ public const int action_bar = 2131492956;
- // aapt resource value: 0x7F080013
- public const int action_divider = 2131230739;
+ // aapt resource value: 0x7f0c0000
+ public const int action_bar_activity_content = 2131492864;
- // aapt resource value: 0x7F080014
- public const int action_image = 2131230740;
+ // aapt resource value: 0x7f0c005b
+ public const int action_bar_container = 2131492955;
- // aapt resource value: 0x7F080015
- public const int action_menu_divider = 2131230741;
+ // aapt resource value: 0x7f0c0057
+ public const int action_bar_root = 2131492951;
- // aapt resource value: 0x7F080016
- public const int action_menu_presenter = 2131230742;
+ // aapt resource value: 0x7f0c0001
+ public const int action_bar_spinner = 2131492865;
- // aapt resource value: 0x7F080017
- public const int action_mode_bar = 2131230743;
+ // aapt resource value: 0x7f0c003b
+ public const int action_bar_subtitle = 2131492923;
- // aapt resource value: 0x7F080018
- public const int action_mode_bar_stub = 2131230744;
+ // aapt resource value: 0x7f0c003a
+ public const int action_bar_title = 2131492922;
- // aapt resource value: 0x7F080019
- public const int action_mode_close_button = 2131230745;
+ // aapt resource value: 0x7f0c0092
+ public const int action_container = 2131493010;
- // aapt resource value: 0x7F08001A
- public const int action_text = 2131230746;
+ // aapt resource value: 0x7f0c005d
+ public const int action_context_bar = 2131492957;
- // aapt resource value: 0x7F08001C
- public const int activity_chooser_view_content = 2131230748;
+ // aapt resource value: 0x7f0c0099
+ public const int action_divider = 2131493017;
- // aapt resource value: 0x7F08001D
- public const int add = 2131230749;
+ // aapt resource value: 0x7f0c0093
+ public const int action_image = 2131493011;
- // aapt resource value: 0x7F08001E
- public const int alertTitle = 2131230750;
+ // aapt resource value: 0x7f0c0002
+ public const int action_menu_divider = 2131492866;
- // aapt resource value: 0x7F080000
- public const int ALT = 2131230720;
+ // aapt resource value: 0x7f0c0003
+ public const int action_menu_presenter = 2131492867;
- // aapt resource value: 0x7F08001F
- public const int always = 2131230751;
+ // aapt resource value: 0x7f0c0059
+ public const int action_mode_bar = 2131492953;
- // aapt resource value: 0x7F080020
- public const int async = 2131230752;
+ // aapt resource value: 0x7f0c0058
+ public const int action_mode_bar_stub = 2131492952;
- // aapt resource value: 0x7F080021
- public const int beginning = 2131230753;
+ // aapt resource value: 0x7f0c003c
+ public const int action_mode_close_button = 2131492924;
- // aapt resource value: 0x7F080022
- public const int blocking = 2131230754;
+ // aapt resource value: 0x7f0c0094
+ public const int action_text = 2131493012;
- // aapt resource value: 0x7F080023
- public const int bottom = 2131230755;
+ // aapt resource value: 0x7f0c00a2
+ public const int actions = 2131493026;
- // aapt resource value: 0x7F080024
- public const int btnCancel = 2131230756;
+ // aapt resource value: 0x7f0c003d
+ public const int activity_chooser_view_content = 2131492925;
- // aapt resource value: 0x7F080025
- public const int btnSubmit = 2131230757;
+ // aapt resource value: 0x7f0c001d
+ public const int add = 2131492893;
- // aapt resource value: 0x7F080026
- public const int buttonPanel = 2131230758;
+ // aapt resource value: 0x7f0c0050
+ public const int alertTitle = 2131492944;
- // aapt resource value: 0x7F080027
- public const int cancel_action = 2131230759;
+ // aapt resource value: 0x7f0c0029
+ public const int always = 2131492905;
- // aapt resource value: 0x7F080028
- public const int center = 2131230760;
+ // aapt resource value: 0x7f0c0030
+ public const int async = 2131492912;
- // aapt resource value: 0x7F080029
- public const int checkbox = 2131230761;
+ // aapt resource value: 0x7f0c0020
+ public const int beginning = 2131492896;
- // aapt resource value: 0x7F08002A
- public const int chronometer = 2131230762;
+ // aapt resource value: 0x7f0c0031
+ public const int blocking = 2131492913;
- // aapt resource value: 0x7F08002B
- public const int collapseActionView = 2131230763;
+ // aapt resource value: 0x7f0c002e
+ public const int bottom = 2131492910;
- // aapt resource value: 0x7F08002C
- public const int contentPanel = 2131230764;
+ // aapt resource value: 0x7f0c007d
+ public const int btnCancel = 2131492989;
- // aapt resource value: 0x7F08002D
- public const int content_container = 2131230765;
+ // aapt resource value: 0x7f0c007f
+ public const int btnSubmit = 2131492991;
- // aapt resource value: 0x7F080001
- public const int CTRL = 2131230721;
+ // aapt resource value: 0x7f0c0043
+ public const int buttonPanel = 2131492931;
- // aapt resource value: 0x7F08002E
- public const int custom = 2131230766;
+ // aapt resource value: 0x7f0c0096
+ public const int cancel_action = 2131493014;
- // aapt resource value: 0x7F08002F
- public const int customPanel = 2131230767;
+ // aapt resource value: 0x7f0c0037
+ public const int center = 2131492919;
- // aapt resource value: 0x7F080030
- public const int day = 2131230768;
+ // aapt resource value: 0x7f0c0053
+ public const int checkbox = 2131492947;
- // aapt resource value: 0x7F080031
- public const int decor_content_parent = 2131230769;
+ // aapt resource value: 0x7f0c009e
+ public const int chronometer = 2131493022;
- // aapt resource value: 0x7F080032
- public const int default_activity_button = 2131230770;
+ // aapt resource value: 0x7f0c002a
+ public const int collapseActionView = 2131492906;
- // aapt resource value: 0x7F080033
- public const int description = 2131230771;
+ // aapt resource value: 0x7f0c0046
+ public const int contentPanel = 2131492934;
- // aapt resource value: 0x7F080034
- public const int disableHome = 2131230772;
+ // aapt resource value: 0x7f0c0081
+ public const int content_container = 2131492993;
- // aapt resource value: 0x7F080035
- public const int edit_query = 2131230773;
+ // aapt resource value: 0x7f0c004d
+ public const int custom = 2131492941;
- // aapt resource value: 0x7F080036
- public const int end = 2131230774;
+ // aapt resource value: 0x7f0c004c
+ public const int customPanel = 2131492940;
- // aapt resource value: 0x7F080037
- public const int end_padder = 2131230775;
+ // aapt resource value: 0x7f0c008d
+ public const int day = 2131493005;
- // aapt resource value: 0x7F080039
- public const int expanded_menu = 2131230777;
+ // aapt resource value: 0x7f0c005a
+ public const int decor_content_parent = 2131492954;
- // aapt resource value: 0x7F080038
- public const int expand_activities_button = 2131230776;
+ // aapt resource value: 0x7f0c0040
+ public const int default_activity_button = 2131492928;
- // aapt resource value: 0x7F080002
- public const int FILL = 2131230722;
+ // aapt resource value: 0x7f0c006c
+ public const int description = 2131492972;
- // aapt resource value: 0x7F080003
- public const int FILL_STROKE = 2131230723;
+ // aapt resource value: 0x7f0c0011
+ public const int disableHome = 2131492881;
- // aapt resource value: 0x7F08003A
- public const int fingerprint_icon = 2131230778;
+ // aapt resource value: 0x7f0c005e
+ public const int edit_query = 2131492958;
- // aapt resource value: 0x7F08003B
- public const int forever = 2131230779;
+ // aapt resource value: 0x7f0c0021
+ public const int end = 2131492897;
- // aapt resource value: 0x7F080004
- public const int FUNCTION = 2131230724;
+ // aapt resource value: 0x7f0c00a4
+ public const int end_padder = 2131493028;
- // aapt resource value: 0x7F08003C
- public const int gd_btn_back = 2131230780;
+ // aapt resource value: 0x7f0c003e
+ public const int expand_activities_button = 2131492926;
- // aapt resource value: 0x7F08003D
- public const int gd_btn_myLocation = 2131230781;
+ // aapt resource value: 0x7f0c0052
+ public const int expanded_menu = 2131492946;
- // aapt resource value: 0x7F08003E
- public const int gd_btn_save = 2131230782;
+ // aapt resource value: 0x7f0c006d
+ public const int fingerprint_icon = 2131492973;
- // aapt resource value: 0x7F08003F
- public const int gd_img_search_delete = 2131230783;
+ // aapt resource value: 0x7f0c0032
+ public const int forever = 2131492914;
- // aapt resource value: 0x7F080040
- public const int gd_ll_myhome = 2131230784;
+ // aapt resource value: 0x7f0c0072
+ public const int gd_btn_back = 2131492978;
- // aapt resource value: 0x7F080041
- public const int gd_ll_search = 2131230785;
+ // aapt resource value: 0x7f0c007b
+ public const int gd_btn_myLocation = 2131492987;
- // aapt resource value: 0x7F080042
- public const int gd_mapView = 2131230786;
+ // aapt resource value: 0x7f0c007a
+ public const int gd_btn_save = 2131492986;
- // aapt resource value: 0x7F080043
- public const int gd_rl_topview = 2131230787;
+ // aapt resource value: 0x7f0c0077
+ public const int gd_img_search_delete = 2131492983;
- // aapt resource value: 0x7F080044
- public const int gd_tv_activity_title = 2131230788;
+ // aapt resource value: 0x7f0c0079
+ public const int gd_ll_myhome = 2131492985;
- // aapt resource value: 0x7F080045
- public const int gd_tv_radius = 2131230789;
+ // aapt resource value: 0x7f0c0075
+ public const int gd_ll_search = 2131492981;
- // aapt resource value: 0x7F080046
- public const int gd_tv_search_title = 2131230790;
+ // aapt resource value: 0x7f0c0074
+ public const int gd_mapView = 2131492980;
- // aapt resource value: 0x7F080047
- public const int hdl_gallery_rootView = 2131230791;
+ // aapt resource value: 0x7f0c0071
+ public const int gd_rl_topview = 2131492977;
- // aapt resource value: 0x7F080048
- public const int hdl_gallery_viewPager = 2131230792;
+ // aapt resource value: 0x7f0c0073
+ public const int gd_tv_activity_title = 2131492979;
- // aapt resource value: 0x7F080049
- public const int hdl_options1 = 2131230793;
+ // aapt resource value: 0x7f0c0078
+ public const int gd_tv_radius = 2131492984;
- // aapt resource value: 0x7F08004A
- public const int hdl_options2 = 2131230794;
+ // aapt resource value: 0x7f0c0076
+ public const int gd_tv_search_title = 2131492982;
- // aapt resource value: 0x7F08004B
- public const int hdl_options3 = 2131230795;
+ // aapt resource value: 0x7f0c006f
+ public const int hdl_gallery_rootView = 2131492975;
- // aapt resource value: 0x7F08004C
- public const int hdl_pickerview_ll = 2131230796;
+ // aapt resource value: 0x7f0c0070
+ public const int hdl_gallery_viewPager = 2131492976;
- // aapt resource value: 0x7F08004D
- public const int home = 2131230797;
+ // aapt resource value: 0x7f0c0083
+ public const int hdl_options1 = 2131492995;
- // aapt resource value: 0x7F08004E
- public const int homeAsUp = 2131230798;
+ // aapt resource value: 0x7f0c0084
+ public const int hdl_options2 = 2131492996;
- // aapt resource value: 0x7F08004F
- public const int hour = 2131230799;
+ // aapt resource value: 0x7f0c0085
+ public const int hdl_options3 = 2131492997;
- // aapt resource value: 0x7F080050
- public const int icon = 2131230800;
+ // aapt resource value: 0x7f0c0082
+ public const int hdl_pickerview_ll = 2131492994;
- // aapt resource value: 0x7F080051
- public const int icon_group = 2131230801;
+ // aapt resource value: 0x7f0c0004
+ public const int home = 2131492868;
- // aapt resource value: 0x7F080052
- public const int ifRoom = 2131230802;
+ // aapt resource value: 0x7f0c0012
+ public const int homeAsUp = 2131492882;
- // aapt resource value: 0x7F080053
- public const int image = 2131230803;
+ // aapt resource value: 0x7f0c008e
+ public const int hour = 2131493006;
- // aapt resource value: 0x7F080054
- public const int info = 2131230804;
+ // aapt resource value: 0x7f0c0042
+ public const int icon = 2131492930;
- // aapt resource value: 0x7F080055
- public const int italic = 2131230805;
+ // aapt resource value: 0x7f0c00a3
+ public const int icon_group = 2131493027;
- // aapt resource value: 0x7F080056
- public const int left = 2131230806;
+ // aapt resource value: 0x7f0c002b
+ public const int ifRoom = 2131492907;
- // aapt resource value: 0x7F080057
- public const int line1 = 2131230807;
+ // aapt resource value: 0x7f0c003f
+ public const int image = 2131492927;
- // aapt resource value: 0x7F080058
- public const int line3 = 2131230808;
+ // aapt resource value: 0x7f0c009f
+ public const int info = 2131493023;
- // aapt resource value: 0x7F080059
- public const int listMode = 2131230809;
+ // aapt resource value: 0x7f0c0033
+ public const int italic = 2131492915;
- // aapt resource value: 0x7F08005A
- public const int list_item = 2131230810;
+ // aapt resource value: 0x7f0c0038
+ public const int left = 2131492920;
- // aapt resource value: 0x7F08005B
- public const int media_actions = 2131230811;
+ // aapt resource value: 0x7f0c0009
+ public const int line1 = 2131492873;
- // aapt resource value: 0x7F08005C
- public const int message = 2131230812;
+ // aapt resource value: 0x7f0c000a
+ public const int line3 = 2131492874;
- // aapt resource value: 0x7F080005
- public const int META = 2131230725;
+ // aapt resource value: 0x7f0c000e
+ public const int listMode = 2131492878;
- // aapt resource value: 0x7F08005D
- public const int middle = 2131230813;
+ // aapt resource value: 0x7f0c0041
+ public const int list_item = 2131492929;
- // aapt resource value: 0x7F08005E
- public const int min = 2131230814;
+ // aapt resource value: 0x7f0c0098
+ public const int media_actions = 2131493016;
- // aapt resource value: 0x7F08005F
- public const int month = 2131230815;
+ // aapt resource value: 0x7f0c00a5
+ public const int message = 2131493029;
- // aapt resource value: 0x7F080060
- public const int multiply = 2131230816;
+ // aapt resource value: 0x7f0c0022
+ public const int middle = 2131492898;
- // aapt resource value: 0x7F080061
- public const int myButton = 2131230817;
+ // aapt resource value: 0x7f0c008f
+ public const int min = 2131493007;
- // aapt resource value: 0x7F080062
- public const int never = 2131230818;
+ // aapt resource value: 0x7f0c008c
+ public const int month = 2131493004;
- // aapt resource value: 0x7F080063
- public const int none = 2131230819;
+ // aapt resource value: 0x7f0c0018
+ public const int multiply = 2131492888;
- // aapt resource value: 0x7F080064
- public const int normal = 2131230820;
+ // aapt resource value: 0x7f0c0091
+ public const int myButton = 2131493009;
- // aapt resource value: 0x7F080065
- public const int notification_background = 2131230821;
+ // aapt resource value: 0x7f0c002c
+ public const int never = 2131492908;
- // aapt resource value: 0x7F080066
- public const int notification_main_column = 2131230822;
+ // aapt resource value: 0x7f0c0013
+ public const int none = 2131492883;
- // aapt resource value: 0x7F080067
- public const int notification_main_column_container = 2131230823;
+ // aapt resource value: 0x7f0c000f
+ public const int normal = 2131492879;
- // aapt resource value: 0x7F080068
- public const int options1 = 2131230824;
+ // aapt resource value: 0x7f0c00a1
+ public const int notification_background = 2131493025;
- // aapt resource value: 0x7F080069
- public const int options2 = 2131230825;
+ // aapt resource value: 0x7f0c009b
+ public const int notification_main_column = 2131493019;
- // aapt resource value: 0x7F08006A
- public const int options3 = 2131230826;
+ // aapt resource value: 0x7f0c009a
+ public const int notification_main_column_container = 2131493018;
- // aapt resource value: 0x7F08006B
- public const int optionspicker = 2131230827;
+ // aapt resource value: 0x7f0c0087
+ public const int options1 = 2131492999;
- // aapt resource value: 0x7F08006C
- public const int outmost_container = 2131230828;
+ // aapt resource value: 0x7f0c0088
+ public const int options2 = 2131493000;
- // aapt resource value: 0x7F08006D
- public const int parentPanel = 2131230829;
+ // aapt resource value: 0x7f0c0089
+ public const int options3 = 2131493001;
- // aapt resource value: 0x7F08006E
- public const int progress_circular = 2131230830;
+ // aapt resource value: 0x7f0c0086
+ public const int optionspicker = 2131492998;
- // aapt resource value: 0x7F08006F
- public const int progress_horizontal = 2131230831;
+ // aapt resource value: 0x7f0c0080
+ public const int outmost_container = 2131492992;
- // aapt resource value: 0x7F080070
- public const int radio = 2131230832;
+ // aapt resource value: 0x7f0c0045
+ public const int parentPanel = 2131492933;
- // aapt resource value: 0x7F080071
- public const int right = 2131230833;
+ // aapt resource value: 0x7f0c0005
+ public const int progress_circular = 2131492869;
- // aapt resource value: 0x7F080072
- public const int right_icon = 2131230834;
+ // aapt resource value: 0x7f0c0006
+ public const int progress_horizontal = 2131492870;
- // aapt resource value: 0x7F080073
- public const int right_side = 2131230835;
+ // aapt resource value: 0x7f0c0055
+ public const int radio = 2131492949;
- // aapt resource value: 0x7F080074
- public const int rv_topbar = 2131230836;
+ // aapt resource value: 0x7f0c0039
+ public const int right = 2131492921;
- // aapt resource value: 0x7F080075
- public const int screen = 2131230837;
+ // aapt resource value: 0x7f0c00a0
+ public const int right_icon = 2131493024;
- // aapt resource value: 0x7F080076
- public const int scrollIndicatorDown = 2131230838;
+ // aapt resource value: 0x7f0c009c
+ public const int right_side = 2131493020;
- // aapt resource value: 0x7F080077
- public const int scrollIndicatorUp = 2131230839;
+ // aapt resource value: 0x7f0c007c
+ public const int rv_topbar = 2131492988;
- // aapt resource value: 0x7F080078
- public const int scrollView = 2131230840;
+ // aapt resource value: 0x7f0c0019
+ public const int screen = 2131492889;
- // aapt resource value: 0x7F080079
- public const int search_badge = 2131230841;
+ // aapt resource value: 0x7f0c004b
+ public const int scrollIndicatorDown = 2131492939;
- // aapt resource value: 0x7F08007A
- public const int search_bar = 2131230842;
+ // aapt resource value: 0x7f0c0047
+ public const int scrollIndicatorUp = 2131492935;
- // aapt resource value: 0x7F08007B
- public const int search_button = 2131230843;
+ // aapt resource value: 0x7f0c0048
+ public const int scrollView = 2131492936;
- // aapt resource value: 0x7F08007C
- public const int search_close_btn = 2131230844;
+ // aapt resource value: 0x7f0c0060
+ public const int search_badge = 2131492960;
- // aapt resource value: 0x7F08007D
- public const int search_edit_frame = 2131230845;
+ // aapt resource value: 0x7f0c005f
+ public const int search_bar = 2131492959;
- // aapt resource value: 0x7F08007E
- public const int search_go_btn = 2131230846;
+ // aapt resource value: 0x7f0c0061
+ public const int search_button = 2131492961;
- // aapt resource value: 0x7F08007F
- public const int search_mag_icon = 2131230847;
+ // aapt resource value: 0x7f0c0066
+ public const int search_close_btn = 2131492966;
- // aapt resource value: 0x7F080080
- public const int search_plate = 2131230848;
+ // aapt resource value: 0x7f0c0062
+ public const int search_edit_frame = 2131492962;
- // aapt resource value: 0x7F080081
- public const int search_src_text = 2131230849;
+ // aapt resource value: 0x7f0c0068
+ public const int search_go_btn = 2131492968;
- // aapt resource value: 0x7F080082
- public const int search_voice_btn = 2131230850;
+ // aapt resource value: 0x7f0c0063
+ public const int search_mag_icon = 2131492963;
- // aapt resource value: 0x7F080083
- public const int second = 2131230851;
+ // aapt resource value: 0x7f0c0064
+ public const int search_plate = 2131492964;
- // aapt resource value: 0x7F080084
- public const int select_dialog_listview = 2131230852;
+ // aapt resource value: 0x7f0c0065
+ public const int search_src_text = 2131492965;
- // aapt resource value: 0x7F080006
- public const int SHIFT = 2131230726;
+ // aapt resource value: 0x7f0c0069
+ public const int search_voice_btn = 2131492969;
- // aapt resource value: 0x7F080085
- public const int shortcut = 2131230853;
+ // aapt resource value: 0x7f0c0090
+ public const int second = 2131493008;
- // aapt resource value: 0x7F080086
- public const int showCustom = 2131230854;
+ // aapt resource value: 0x7f0c006a
+ public const int select_dialog_listview = 2131492970;
- // aapt resource value: 0x7F080087
- public const int showHome = 2131230855;
+ // aapt resource value: 0x7f0c0054
+ public const int shortcut = 2131492948;
- // aapt resource value: 0x7F080088
- public const int showTitle = 2131230856;
+ // aapt resource value: 0x7f0c0014
+ public const int showCustom = 2131492884;
- // aapt resource value: 0x7F080089
- public const int spacer = 2131230857;
+ // aapt resource value: 0x7f0c0015
+ public const int showHome = 2131492885;
- // aapt resource value: 0x7F08008A
- public const int split_action_bar = 2131230858;
+ // aapt resource value: 0x7f0c0016
+ public const int showTitle = 2131492886;
- // aapt resource value: 0x7F08008B
- public const int src_atop = 2131230859;
+ // aapt resource value: 0x7f0c0044
+ public const int spacer = 2131492932;
- // aapt resource value: 0x7F08008C
- public const int src_in = 2131230860;
+ // aapt resource value: 0x7f0c0007
+ public const int split_action_bar = 2131492871;
- // aapt resource value: 0x7F08008D
- public const int src_over = 2131230861;
+ // aapt resource value: 0x7f0c001a
+ public const int src_atop = 2131492890;
- // aapt resource value: 0x7F08008E
- public const int status = 2131230862;
+ // aapt resource value: 0x7f0c001b
+ public const int src_in = 2131492891;
- // aapt resource value: 0x7F08008F
- public const int status_bar_latest_event_content = 2131230863;
+ // aapt resource value: 0x7f0c001c
+ public const int src_over = 2131492892;
- // aapt resource value: 0x7F080007
- public const int STROKE = 2131230727;
+ // aapt resource value: 0x7f0c006e
+ public const int status = 2131492974;
- // aapt resource value: 0x7F080090
- public const int submenuarrow = 2131230864;
+ // aapt resource value: 0x7f0c0097
+ public const int status_bar_latest_event_content = 2131493015;
- // aapt resource value: 0x7F080091
- public const int submit_area = 2131230865;
+ // aapt resource value: 0x7f0c0056
+ public const int submenuarrow = 2131492950;
- // aapt resource value: 0x7F080092
- public const int subtitle = 2131230866;
+ // aapt resource value: 0x7f0c0067
+ public const int submit_area = 2131492967;
- // aapt resource value: 0x7F080008
- public const int SYM = 2131230728;
+ // aapt resource value: 0x7f0c006b
+ public const int subtitle = 2131492971;
- // aapt resource value: 0x7F080093
- public const int tabMode = 2131230867;
+ // aapt resource value: 0x7f0c0010
+ public const int tabMode = 2131492880;
- // aapt resource value: 0x7F080094
- public const int text = 2131230868;
+ // aapt resource value: 0x7f0c000b
+ public const int text = 2131492875;
- // aapt resource value: 0x7F080095
- public const int text2 = 2131230869;
+ // aapt resource value: 0x7f0c000c
+ public const int text2 = 2131492876;
- // aapt resource value: 0x7F080096
- public const int textSpacerNoButtons = 2131230870;
+ // aapt resource value: 0x7f0c004a
+ public const int textSpacerNoButtons = 2131492938;
- // aapt resource value: 0x7F080097
- public const int textSpacerNoTitle = 2131230871;
+ // aapt resource value: 0x7f0c0049
+ public const int textSpacerNoTitle = 2131492937;
- // aapt resource value: 0x7F080098
- public const int time = 2131230872;
+ // aapt resource value: 0x7f0c009d
+ public const int time = 2131493021;
- // aapt resource value: 0x7F080099
- public const int timepicker = 2131230873;
+ // aapt resource value: 0x7f0c008a
+ public const int timepicker = 2131493002;
- // aapt resource value: 0x7F08009A
- public const int title = 2131230874;
+ // aapt resource value: 0x7f0c000d
+ public const int title = 2131492877;
- // aapt resource value: 0x7F08009B
- public const int titleDividerNoCustom = 2131230875;
+ // aapt resource value: 0x7f0c0051
+ public const int titleDividerNoCustom = 2131492945;
- // aapt resource value: 0x7F08009C
- public const int title_template = 2131230876;
+ // aapt resource value: 0x7f0c004f
+ public const int title_template = 2131492943;
- // aapt resource value: 0x7F08009D
- public const int top = 2131230877;
+ // aapt resource value: 0x7f0c002f
+ public const int top = 2131492911;
- // aapt resource value: 0x7F08009E
- public const int topPanel = 2131230878;
+ // aapt resource value: 0x7f0c004e
+ public const int topPanel = 2131492942;
- // aapt resource value: 0x7F08009F
- public const int tvTitle = 2131230879;
+ // aapt resource value: 0x7f0c007e
+ public const int tvTitle = 2131492990;
- // aapt resource value: 0x7F0800A0
- public const int uniform = 2131230880;
+ // aapt resource value: 0x7f0c001e
+ public const int uniform = 2131492894;
- // aapt resource value: 0x7F0800A1
- public const int up = 2131230881;
+ // aapt resource value: 0x7f0c0008
+ public const int up = 2131492872;
- // aapt resource value: 0x7F0800A2
- public const int useLogo = 2131230882;
+ // aapt resource value: 0x7f0c0017
+ public const int useLogo = 2131492887;
- // aapt resource value: 0x7F0800A3
- public const int withText = 2131230883;
+ // aapt resource value: 0x7f0c002d
+ public const int withText = 2131492909;
- // aapt resource value: 0x7F0800A4
- public const int wrap_content = 2131230884;
+ // aapt resource value: 0x7f0c001f
+ public const int wrap_content = 2131492895;
- // aapt resource value: 0x7F0800A5
- public const int year = 2131230885;
+ // aapt resource value: 0x7f0c008b
+ public const int year = 2131493003;
static Id()
{
@@ -2772,23 +2772,23 @@
public partial class Integer
{
- // aapt resource value: 0x7F090000
- public const int abc_config_activityDefaultDur = 2131296256;
+ // aapt resource value: 0x7f0d0000
+ public const int abc_config_activityDefaultDur = 2131558400;
- // aapt resource value: 0x7F090001
- public const int abc_config_activityShortDur = 2131296257;
+ // aapt resource value: 0x7f0d0001
+ public const int abc_config_activityShortDur = 2131558401;
- // aapt resource value: 0x7F090002
- public const int animation_default_duration = 2131296258;
+ // aapt resource value: 0x7f0d0005
+ public const int animation_default_duration = 2131558405;
- // aapt resource value: 0x7F090003
- public const int cancel_button_image_alpha = 2131296259;
+ // aapt resource value: 0x7f0d0002
+ public const int cancel_button_image_alpha = 2131558402;
- // aapt resource value: 0x7F090004
- public const int config_tooltipAnimTime = 2131296260;
+ // aapt resource value: 0x7f0d0003
+ public const int config_tooltipAnimTime = 2131558403;
- // aapt resource value: 0x7F090005
- public const int status_bar_notification_info_maxnum = 2131296261;
+ // aapt resource value: 0x7f0d0004
+ public const int status_bar_notification_info_maxnum = 2131558404;
static Integer()
{
@@ -2803,176 +2803,176 @@
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 biometric_prompt_dialog_content = 2130968603;
- // aapt resource value: 0x7F0A001C
- public const int hdl_gallery_banner_view_layout = 2131361820;
+ // aapt resource value: 0x7f04001c
+ public const int hdl_gallery_banner_view_layout = 2130968604;
- // aapt resource value: 0x7F0A001D
- public const int hdl_widget_activity_crop_image = 2131361821;
+ // aapt resource value: 0x7f04001d
+ public const int hdl_widget_activity_crop_image = 2130968605;
- // aapt resource value: 0x7F0A001E
- public const int hdl_widget_activity_geofence_round = 2131361822;
+ // aapt resource value: 0x7f04001e
+ public const int hdl_widget_activity_geofence_round = 2130968606;
- // aapt resource value: 0x7F0A001F
- public const int hdl_widget_include_pickerview_topbar = 2131361823;
+ // aapt resource value: 0x7f04001f
+ public const int hdl_widget_include_pickerview_topbar = 2130968607;
- // aapt resource value: 0x7F0A0020
- public const int hdl_widget_layout_basepickerview = 2131361824;
+ // aapt resource value: 0x7f040020
+ public const int hdl_widget_layout_basepickerview = 2130968608;
- // aapt resource value: 0x7F0A0021
- public const int hdl_widget_pickerview = 2131361825;
+ // aapt resource value: 0x7f040021
+ public const int hdl_widget_pickerview = 2130968609;
- // aapt resource value: 0x7F0A0022
- public const int hdl_widget_pickerview_options = 2131361826;
+ // aapt resource value: 0x7f040022
+ public const int hdl_widget_pickerview_options = 2130968610;
- // aapt resource value: 0x7F0A0023
- public const int hdl_widget_pickerview_time = 2131361827;
+ // aapt resource value: 0x7f040023
+ public const int hdl_widget_pickerview_time = 2130968611;
- // aapt resource value: 0x7F0A0024
- public const int Main = 2131361828;
+ // aapt resource value: 0x7f040024
+ public const int Main = 2130968612;
- // aapt resource value: 0x7F0A0025
- public const int notification_action = 2131361829;
+ // aapt resource value: 0x7f040025
+ public const int notification_action = 2130968613;
- // aapt resource value: 0x7F0A0026
- public const int notification_action_tombstone = 2131361830;
+ // aapt resource value: 0x7f040026
+ public const int notification_action_tombstone = 2130968614;
- // aapt resource value: 0x7F0A0027
- public const int notification_media_action = 2131361831;
+ // aapt resource value: 0x7f040027
+ public const int notification_media_action = 2130968615;
- // aapt resource value: 0x7F0A0028
- public const int notification_media_cancel_action = 2131361832;
+ // aapt resource value: 0x7f040028
+ public const int notification_media_cancel_action = 2130968616;
- // aapt resource value: 0x7F0A0029
- public const int notification_template_big_media = 2131361833;
+ // aapt resource value: 0x7f040029
+ public const int notification_template_big_media = 2130968617;
- // aapt resource value: 0x7F0A002A
- public const int notification_template_big_media_custom = 2131361834;
+ // aapt resource value: 0x7f04002a
+ public const int notification_template_big_media_custom = 2130968618;
- // aapt resource value: 0x7F0A002B
- public const int notification_template_big_media_narrow = 2131361835;
+ // aapt resource value: 0x7f04002b
+ public const int notification_template_big_media_narrow = 2130968619;
- // aapt resource value: 0x7F0A002C
- public const int notification_template_big_media_narrow_custom = 2131361836;
+ // aapt resource value: 0x7f04002c
+ public const int notification_template_big_media_narrow_custom = 2130968620;
- // aapt resource value: 0x7F0A002D
- public const int notification_template_custom_big = 2131361837;
+ // aapt resource value: 0x7f04002d
+ public const int notification_template_custom_big = 2130968621;
- // aapt resource value: 0x7F0A002E
- public const int notification_template_icon_group = 2131361838;
+ // aapt resource value: 0x7f04002e
+ public const int notification_template_icon_group = 2130968622;
- // aapt resource value: 0x7F0A002F
- public const int notification_template_lines_media = 2131361839;
+ // aapt resource value: 0x7f04002f
+ public const int notification_template_lines_media = 2130968623;
- // aapt resource value: 0x7F0A0030
- public const int notification_template_media = 2131361840;
+ // aapt resource value: 0x7f040030
+ public const int notification_template_media = 2130968624;
- // aapt resource value: 0x7F0A0031
- public const int notification_template_media_custom = 2131361841;
+ // aapt resource value: 0x7f040031
+ public const int notification_template_media_custom = 2130968625;
- // aapt resource value: 0x7F0A0032
- public const int notification_template_part_chronometer = 2131361842;
+ // aapt resource value: 0x7f040032
+ public const int notification_template_part_chronometer = 2130968626;
- // aapt resource value: 0x7F0A0033
- public const int notification_template_part_time = 2131361843;
+ // aapt resource value: 0x7f040033
+ public const int notification_template_part_time = 2130968627;
- // aapt resource value: 0x7F0A0034
- public const int select_dialog_item_material = 2131361844;
+ // aapt resource value: 0x7f040034
+ public const int select_dialog_item_material = 2130968628;
- // aapt resource value: 0x7F0A0035
- public const int select_dialog_multichoice_material = 2131361845;
+ // aapt resource value: 0x7f040035
+ public const int select_dialog_multichoice_material = 2130968629;
- // aapt resource value: 0x7F0A0036
- public const int select_dialog_singlechoice_material = 2131361846;
+ // aapt resource value: 0x7f040036
+ public const int select_dialog_singlechoice_material = 2130968630;
- // aapt resource value: 0x7F0A0037
- public const int support_simple_spinner_dropdown_item = 2131361847;
+ // aapt resource value: 0x7f040037
+ public const int support_simple_spinner_dropdown_item = 2130968631;
- // aapt resource value: 0x7F0A0038
- public const int tooltip = 2131361848;
+ // aapt resource value: 0x7f040038
+ public const int tooltip = 2130968632;
static Layout()
{
@@ -2987,8 +2987,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()
{
@@ -3003,164 +3003,164 @@
public partial class String
{
- // aapt resource value: 0x7F0C0000
- public const int abc_action_bar_home_description = 2131492864;
+ // aapt resource value: 0x7f070000
+ public const int abc_action_bar_home_description = 2131165184;
- // aapt resource value: 0x7F0C0001
- public const int abc_action_bar_home_description_format = 2131492865;
+ // aapt resource value: 0x7f070001
+ public const int abc_action_bar_home_description_format = 2131165185;
- // aapt resource value: 0x7F0C0002
- public const int abc_action_bar_home_subtitle_description_format = 2131492866;
+ // aapt resource value: 0x7f070002
+ public const int abc_action_bar_home_subtitle_description_format = 2131165186;
- // aapt resource value: 0x7F0C0003
- public const int abc_action_bar_up_description = 2131492867;
+ // aapt resource value: 0x7f070003
+ public const int abc_action_bar_up_description = 2131165187;
- // aapt resource value: 0x7F0C0004
- public const int abc_action_menu_overflow_description = 2131492868;
+ // aapt resource value: 0x7f070004
+ public const int abc_action_menu_overflow_description = 2131165188;
- // aapt resource value: 0x7F0C0005
- public const int abc_action_mode_done = 2131492869;
+ // aapt resource value: 0x7f070005
+ public const int abc_action_mode_done = 2131165189;
- // aapt resource value: 0x7F0C0007
- public const int abc_activitychooserview_choose_application = 2131492871;
+ // aapt resource value: 0x7f070006
+ public const int abc_activity_chooser_view_see_all = 2131165190;
- // aapt resource value: 0x7F0C0006
- public const int abc_activity_chooser_view_see_all = 2131492870;
+ // aapt resource value: 0x7f070007
+ public const int abc_activitychooserview_choose_application = 2131165191;
- // aapt resource value: 0x7F0C0008
- public const int abc_capital_off = 2131492872;
+ // aapt resource value: 0x7f070008
+ public const int abc_capital_off = 2131165192;
- // aapt resource value: 0x7F0C0009
- public const int abc_capital_on = 2131492873;
+ // aapt resource value: 0x7f070009
+ public const int abc_capital_on = 2131165193;
- // aapt resource value: 0x7F0C000A
- public const int abc_font_family_body_1_material = 2131492874;
+ // aapt resource value: 0x7f070015
+ public const int abc_font_family_body_1_material = 2131165205;
- // aapt resource value: 0x7F0C000B
- public const int abc_font_family_body_2_material = 2131492875;
+ // aapt resource value: 0x7f070016
+ public const int abc_font_family_body_2_material = 2131165206;
- // aapt resource value: 0x7F0C000C
- public const int abc_font_family_button_material = 2131492876;
+ // aapt resource value: 0x7f070017
+ public const int abc_font_family_button_material = 2131165207;
- // aapt resource value: 0x7F0C000D
- public const int abc_font_family_caption_material = 2131492877;
+ // aapt resource value: 0x7f070018
+ public const int abc_font_family_caption_material = 2131165208;
- // aapt resource value: 0x7F0C000E
- public const int abc_font_family_display_1_material = 2131492878;
+ // aapt resource value: 0x7f070019
+ public const int abc_font_family_display_1_material = 2131165209;
- // aapt resource value: 0x7F0C000F
- public const int abc_font_family_display_2_material = 2131492879;
+ // aapt resource value: 0x7f07001a
+ public const int abc_font_family_display_2_material = 2131165210;
- // aapt resource value: 0x7F0C0010
- public const int abc_font_family_display_3_material = 2131492880;
+ // aapt resource value: 0x7f07001b
+ public const int abc_font_family_display_3_material = 2131165211;
- // aapt resource value: 0x7F0C0011
- public const int abc_font_family_display_4_material = 2131492881;
+ // aapt resource value: 0x7f07001c
+ public const int abc_font_family_display_4_material = 2131165212;
- // aapt resource value: 0x7F0C0012
- public const int abc_font_family_headline_material = 2131492882;
+ // aapt resource value: 0x7f07001d
+ public const int abc_font_family_headline_material = 2131165213;
- // aapt resource value: 0x7F0C0013
- public const int abc_font_family_menu_material = 2131492883;
+ // aapt resource value: 0x7f07001e
+ public const int abc_font_family_menu_material = 2131165214;
- // aapt resource value: 0x7F0C0014
- public const int abc_font_family_subhead_material = 2131492884;
+ // aapt resource value: 0x7f07001f
+ public const int abc_font_family_subhead_material = 2131165215;
- // aapt resource value: 0x7F0C0015
- public const int abc_font_family_title_material = 2131492885;
+ // aapt resource value: 0x7f070020
+ public const int abc_font_family_title_material = 2131165216;
- // aapt resource value: 0x7F0C0017
- public const int abc_searchview_description_clear = 2131492887;
+ // aapt resource value: 0x7f07000a
+ public const int abc_search_hint = 2131165194;
- // aapt resource value: 0x7F0C0018
- public const int abc_searchview_description_query = 2131492888;
+ // aapt resource value: 0x7f07000b
+ public const int abc_searchview_description_clear = 2131165195;
- // aapt resource value: 0x7F0C0019
- public const int abc_searchview_description_search = 2131492889;
+ // aapt resource value: 0x7f07000c
+ public const int abc_searchview_description_query = 2131165196;
- // aapt resource value: 0x7F0C001A
- public const int abc_searchview_description_submit = 2131492890;
+ // aapt resource value: 0x7f07000d
+ public const int abc_searchview_description_search = 2131165197;
- // aapt resource value: 0x7F0C001B
- public const int abc_searchview_description_voice = 2131492891;
+ // aapt resource value: 0x7f07000e
+ public const int abc_searchview_description_submit = 2131165198;
- // aapt resource value: 0x7F0C0016
- public const int abc_search_hint = 2131492886;
+ // aapt resource value: 0x7f07000f
+ public const int abc_searchview_description_voice = 2131165199;
- // aapt resource value: 0x7F0C001C
- public const int abc_shareactionprovider_share_with = 2131492892;
+ // aapt resource value: 0x7f070010
+ public const int abc_shareactionprovider_share_with = 2131165200;
- // aapt resource value: 0x7F0C001D
- public const int abc_shareactionprovider_share_with_application = 2131492893;
+ // aapt resource value: 0x7f070011
+ public const int abc_shareactionprovider_share_with_application = 2131165201;
- // aapt resource value: 0x7F0C001E
- public const int abc_toolbar_collapse_description = 2131492894;
+ // aapt resource value: 0x7f070012
+ public const int abc_toolbar_collapse_description = 2131165202;
- // aapt resource value: 0x7F0C001F
- public const int app_name = 2131492895;
+ // aapt resource value: 0x7f070023
+ public const int app_name = 2131165219;
- // aapt resource value: 0x7F0C0020
- public const int gd_activity_title = 2131492896;
+ // aapt resource value: 0x7f070024
+ public const int gd_activity_title = 2131165220;
- // aapt resource value: 0x7F0C0021
- public const int gd_cancel = 2131492897;
+ // aapt resource value: 0x7f070025
+ public const int gd_cancel = 2131165221;
- // aapt resource value: 0x7F0C0022
- public const int gd_myhome = 2131492898;
+ // aapt resource value: 0x7f070026
+ public const int gd_myhome = 2131165222;
- // aapt resource value: 0x7F0C0023
- public const int gd_notifyMsg = 2131492899;
+ // aapt resource value: 0x7f070027
+ public const int gd_notifyMsg = 2131165223;
- // aapt resource value: 0x7F0C0024
- public const int gd_notifyTitle = 2131492900;
+ // aapt resource value: 0x7f070028
+ public const int gd_notifyTitle = 2131165224;
- // aapt resource value: 0x7F0C0025
- public const int gd_save = 2131492901;
+ // aapt resource value: 0x7f070029
+ public const int gd_save = 2131165225;
- // aapt resource value: 0x7F0C0026
- public const int gd_search_tip = 2131492902;
+ // aapt resource value: 0x7f07002a
+ public const int gd_search_tip = 2131165226;
- // aapt resource value: 0x7F0C0027
- public const int gd_setting = 2131492903;
+ // aapt resource value: 0x7f07002b
+ public const int gd_setting = 2131165227;
- // aapt resource value: 0x7F0C0028
- public const int hello = 2131492904;
+ // aapt resource value: 0x7f070034
+ public const int hello = 2131165236;
- // aapt resource value: 0x7F0C0029
- public const int not_recognized_fingerprint_hint = 2131492905;
+ // aapt resource value: 0x7f070021
+ public const int not_recognized_fingerprint_hint = 2131165217;
- // aapt resource value: 0x7F0C002A
- public const int pickerview_cancel = 2131492906;
+ // aapt resource value: 0x7f07002c
+ public const int pickerview_cancel = 2131165228;
- // aapt resource value: 0x7F0C002B
- public const int pickerview_day = 2131492907;
+ // aapt resource value: 0x7f07002d
+ public const int pickerview_day = 2131165229;
- // aapt resource value: 0x7F0C002C
- public const int pickerview_hours = 2131492908;
+ // aapt resource value: 0x7f07002e
+ public const int pickerview_hours = 2131165230;
- // aapt resource value: 0x7F0C002D
- public const int pickerview_minutes = 2131492909;
+ // aapt resource value: 0x7f07002f
+ public const int pickerview_minutes = 2131165231;
- // aapt resource value: 0x7F0C002E
- public const int pickerview_month = 2131492910;
+ // aapt resource value: 0x7f070030
+ public const int pickerview_month = 2131165232;
- // aapt resource value: 0x7F0C002F
- public const int pickerview_seconds = 2131492911;
+ // aapt resource value: 0x7f070031
+ public const int pickerview_seconds = 2131165233;
- // aapt resource value: 0x7F0C0030
- public const int pickerview_submit = 2131492912;
+ // aapt resource value: 0x7f070032
+ public const int pickerview_submit = 2131165234;
- // aapt resource value: 0x7F0C0031
- public const int pickerview_year = 2131492913;
+ // aapt resource value: 0x7f070033
+ public const int pickerview_year = 2131165235;
- // aapt resource value: 0x7F0C0032
- public const int search_menu_title = 2131492914;
+ // aapt resource value: 0x7f070013
+ public const int search_menu_title = 2131165203;
- // aapt resource value: 0x7F0C0033
- public const int status_bar_notification_info_overflow = 2131492915;
+ // aapt resource value: 0x7f070014
+ public const int status_bar_notification_info_overflow = 2131165204;
- // aapt resource value: 0x7F0C0034
- public const int touch_fingerprint_sensor_hint = 2131492916;
+ // aapt resource value: 0x7f070022
+ public const int touch_fingerprint_sensor_hint = 2131165218;
static String()
{
@@ -3175,1115 +3175,1115 @@
public partial class Style
{
- // aapt resource value: 0x7F0D0000
- public const int AlertDialog_AppCompat = 2131558400;
+ // aapt resource value: 0x7f09009d
+ public const int AlertDialog_AppCompat = 2131296413;
- // aapt resource value: 0x7F0D0001
- public const int AlertDialog_AppCompat_Light = 2131558401;
+ // aapt resource value: 0x7f09009e
+ public const int AlertDialog_AppCompat_Light = 2131296414;
- // aapt resource value: 0x7F0D0002
- public const int Animation_AppCompat_Dialog = 2131558402;
+ // aapt resource value: 0x7f09009f
+ public const int Animation_AppCompat_Dialog = 2131296415;
- // aapt resource value: 0x7F0D0003
- public const int Animation_AppCompat_DropDownUp = 2131558403;
+ // aapt resource value: 0x7f0900a0
+ public const int Animation_AppCompat_DropDownUp = 2131296416;
- // aapt resource value: 0x7F0D0004
- public const int Animation_AppCompat_Tooltip = 2131558404;
+ // aapt resource value: 0x7f0900a1
+ public const int Animation_AppCompat_Tooltip = 2131296417;
- // aapt resource value: 0x7F0D0005
- public const int Base_AlertDialog_AppCompat = 2131558405;
+ // aapt resource value: 0x7f0900a2
+ public const int Base_AlertDialog_AppCompat = 2131296418;
- // aapt resource value: 0x7F0D0006
- public const int Base_AlertDialog_AppCompat_Light = 2131558406;
+ // aapt resource value: 0x7f0900a3
+ public const int Base_AlertDialog_AppCompat_Light = 2131296419;
- // aapt resource value: 0x7F0D0007
- public const int Base_Animation_AppCompat_Dialog = 2131558407;
+ // aapt resource value: 0x7f0900a4
+ public const int Base_Animation_AppCompat_Dialog = 2131296420;
- // aapt resource value: 0x7F0D0008
- public const int Base_Animation_AppCompat_DropDownUp = 2131558408;
+ // aapt resource value: 0x7f0900a5
+ public const int Base_Animation_AppCompat_DropDownUp = 2131296421;
- // aapt resource value: 0x7F0D0009
- public const int Base_Animation_AppCompat_Tooltip = 2131558409;
+ // aapt resource value: 0x7f0900a6
+ public const int Base_Animation_AppCompat_Tooltip = 2131296422;
- // aapt resource value: 0x7F0D000B
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131558411;
+ // aapt resource value: 0x7f0900a7
+ public const int Base_DialogWindowTitle_AppCompat = 2131296423;
- // aapt resource value: 0x7F0D000A
- public const int Base_DialogWindowTitle_AppCompat = 2131558410;
+ // aapt resource value: 0x7f0900a8
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131296424;
- // aapt resource value: 0x7F0D000C
- public const int Base_TextAppearance_AppCompat = 2131558412;
+ // aapt resource value: 0x7f090039
+ public const int Base_TextAppearance_AppCompat = 2131296313;
- // aapt resource value: 0x7F0D000D
- public const int Base_TextAppearance_AppCompat_Body1 = 2131558413;
+ // aapt resource value: 0x7f09003a
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131296314;
- // aapt resource value: 0x7F0D000E
- public const int Base_TextAppearance_AppCompat_Body2 = 2131558414;
+ // aapt resource value: 0x7f09003b
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131296315;
- // aapt resource value: 0x7F0D000F
- public const int Base_TextAppearance_AppCompat_Button = 2131558415;
+ // aapt resource value: 0x7f090027
+ public const int Base_TextAppearance_AppCompat_Button = 2131296295;
- // aapt resource value: 0x7F0D0010
- public const int Base_TextAppearance_AppCompat_Caption = 2131558416;
+ // aapt resource value: 0x7f09003c
+ public const int Base_TextAppearance_AppCompat_Caption = 2131296316;
- // aapt resource value: 0x7F0D0011
- public const int Base_TextAppearance_AppCompat_Display1 = 2131558417;
+ // aapt resource value: 0x7f09003d
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131296317;
- // aapt resource value: 0x7F0D0012
- public const int Base_TextAppearance_AppCompat_Display2 = 2131558418;
+ // aapt resource value: 0x7f09003e
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131296318;
- // aapt resource value: 0x7F0D0013
- public const int Base_TextAppearance_AppCompat_Display3 = 2131558419;
+ // aapt resource value: 0x7f09003f
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131296319;
- // aapt resource value: 0x7F0D0014
- public const int Base_TextAppearance_AppCompat_Display4 = 2131558420;
+ // aapt resource value: 0x7f090040
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131296320;
- // aapt resource value: 0x7F0D0015
- public const int Base_TextAppearance_AppCompat_Headline = 2131558421;
+ // aapt resource value: 0x7f090041
+ public const int Base_TextAppearance_AppCompat_Headline = 2131296321;
- // aapt resource value: 0x7F0D0016
- public const int Base_TextAppearance_AppCompat_Inverse = 2131558422;
+ // aapt resource value: 0x7f09000b
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131296267;
- // aapt resource value: 0x7F0D0017
- public const int Base_TextAppearance_AppCompat_Large = 2131558423;
+ // aapt resource value: 0x7f090042
+ public const int Base_TextAppearance_AppCompat_Large = 2131296322;
- // aapt resource value: 0x7F0D0018
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131558424;
+ // aapt resource value: 0x7f09000c
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131296268;
- // aapt resource value: 0x7F0D0019
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131558425;
+ // aapt resource value: 0x7f090043
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131296323;
- // aapt resource value: 0x7F0D001A
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131558426;
+ // aapt resource value: 0x7f090044
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131296324;
- // aapt resource value: 0x7F0D001B
- public const int Base_TextAppearance_AppCompat_Medium = 2131558427;
+ // aapt resource value: 0x7f090045
+ public const int Base_TextAppearance_AppCompat_Medium = 2131296325;
- // aapt resource value: 0x7F0D001C
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131558428;
+ // aapt resource value: 0x7f09000d
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131296269;
- // aapt resource value: 0x7F0D001D
- public const int Base_TextAppearance_AppCompat_Menu = 2131558429;
+ // aapt resource value: 0x7f090046
+ public const int Base_TextAppearance_AppCompat_Menu = 2131296326;
- // aapt resource value: 0x7F0D001E
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131558430;
+ // aapt resource value: 0x7f0900a9
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131296425;
- // aapt resource value: 0x7F0D001F
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131558431;
+ // aapt resource value: 0x7f090047
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131296327;
- // aapt resource value: 0x7F0D0020
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131558432;
+ // aapt resource value: 0x7f090048
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131296328;
- // aapt resource value: 0x7F0D0021
- public const int Base_TextAppearance_AppCompat_Small = 2131558433;
+ // aapt resource value: 0x7f090049
+ public const int Base_TextAppearance_AppCompat_Small = 2131296329;
- // aapt resource value: 0x7F0D0022
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131558434;
+ // aapt resource value: 0x7f09000e
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131296270;
- // aapt resource value: 0x7F0D0023
- public const int Base_TextAppearance_AppCompat_Subhead = 2131558435;
+ // aapt resource value: 0x7f09004a
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131296330;
- // aapt resource value: 0x7F0D0024
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131558436;
+ // aapt resource value: 0x7f09000f
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131296271;
- // aapt resource value: 0x7F0D0025
- public const int Base_TextAppearance_AppCompat_Title = 2131558437;
+ // aapt resource value: 0x7f09004b
+ public const int Base_TextAppearance_AppCompat_Title = 2131296331;
- // aapt resource value: 0x7F0D0026
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131558438;
+ // aapt resource value: 0x7f090010
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131296272;
- // aapt resource value: 0x7F0D0027
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131558439;
+ // aapt resource value: 0x7f0900aa
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131296426;
- // aapt resource value: 0x7F0D0028
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131558440;
+ // aapt resource value: 0x7f09008e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131296398;
- // aapt resource value: 0x7F0D0029
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131558441;
+ // aapt resource value: 0x7f09004c
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131296332;
- // aapt resource value: 0x7F0D002A
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131558442;
+ // aapt resource value: 0x7f09004d
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131296333;
- // aapt resource value: 0x7F0D002B
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131558443;
+ // aapt resource value: 0x7f09004e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131296334;
- // aapt resource value: 0x7F0D002C
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131558444;
+ // aapt resource value: 0x7f09004f
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131296335;
- // aapt resource value: 0x7F0D002D
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131558445;
+ // aapt resource value: 0x7f090050
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131296336;
- // aapt resource value: 0x7F0D002E
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131558446;
+ // aapt resource value: 0x7f090051
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131296337;
- // aapt resource value: 0x7F0D002F
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131558447;
+ // aapt resource value: 0x7f090052
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131296338;
- // aapt resource value: 0x7F0D0030
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131558448;
+ // aapt resource value: 0x7f090095
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131296405;
- // aapt resource value: 0x7F0D0031
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131558449;
+ // aapt resource value: 0x7f090096
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131296406;
- // aapt resource value: 0x7F0D0032
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131558450;
+ // aapt resource value: 0x7f09008f
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131296399;
- // aapt resource value: 0x7F0D0033
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131558451;
+ // aapt resource value: 0x7f0900ab
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131296427;
- // aapt resource value: 0x7F0D0034
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131558452;
+ // aapt resource value: 0x7f090053
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131296339;
- // aapt resource value: 0x7F0D0035
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131558453;
+ // aapt resource value: 0x7f090054
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131296340;
- // aapt resource value: 0x7F0D0036
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131558454;
+ // aapt resource value: 0x7f090055
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131296341;
- // aapt resource value: 0x7F0D0037
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131558455;
+ // aapt resource value: 0x7f090056
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131296342;
- // aapt resource value: 0x7F0D0038
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131558456;
+ // aapt resource value: 0x7f090057
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131296343;
- // aapt resource value: 0x7F0D0039
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131558457;
+ // aapt resource value: 0x7f0900ac
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131296428;
- // aapt resource value: 0x7F0D003A
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131558458;
+ // aapt resource value: 0x7f090058
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131296344;
- // aapt resource value: 0x7F0D003B
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131558459;
+ // aapt resource value: 0x7f090059
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131296345;
- // aapt resource value: 0x7F0D004A
- public const int Base_ThemeOverlay_AppCompat = 2131558474;
+ // aapt resource value: 0x7f09005a
+ public const int Base_Theme_AppCompat = 2131296346;
- // aapt resource value: 0x7F0D004B
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131558475;
+ // aapt resource value: 0x7f0900ad
+ public const int Base_Theme_AppCompat_CompactMenu = 2131296429;
- // aapt resource value: 0x7F0D004C
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131558476;
+ // aapt resource value: 0x7f090011
+ public const int Base_Theme_AppCompat_Dialog = 2131296273;
- // aapt resource value: 0x7F0D004D
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131558477;
+ // aapt resource value: 0x7f090012
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131296274;
- // aapt resource value: 0x7F0D004E
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131558478;
+ // aapt resource value: 0x7f0900ae
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131296430;
- // aapt resource value: 0x7F0D004F
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131558479;
+ // aapt resource value: 0x7f090013
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131296275;
- // aapt resource value: 0x7F0D0050
- public const int Base_ThemeOverlay_AppCompat_Light = 2131558480;
+ // aapt resource value: 0x7f090001
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131296257;
- // aapt resource value: 0x7F0D003C
- public const int Base_Theme_AppCompat = 2131558460;
+ // aapt resource value: 0x7f09005b
+ public const int Base_Theme_AppCompat_Light = 2131296347;
- // aapt resource value: 0x7F0D003D
- public const int Base_Theme_AppCompat_CompactMenu = 2131558461;
+ // aapt resource value: 0x7f0900af
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131296431;
- // aapt resource value: 0x7F0D003E
- public const int Base_Theme_AppCompat_Dialog = 2131558462;
+ // aapt resource value: 0x7f090014
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131296276;
- // aapt resource value: 0x7F0D0042
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131558466;
+ // aapt resource value: 0x7f090015
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131296277;
- // aapt resource value: 0x7F0D003F
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131558463;
+ // aapt resource value: 0x7f0900b0
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131296432;
- // aapt resource value: 0x7F0D0040
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131558464;
+ // aapt resource value: 0x7f090016
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131296278;
- // aapt resource value: 0x7F0D0041
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131558465;
+ // aapt resource value: 0x7f090002
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131296258;
- // aapt resource value: 0x7F0D0043
- public const int Base_Theme_AppCompat_Light = 2131558467;
+ // aapt resource value: 0x7f0900b1
+ public const int Base_ThemeOverlay_AppCompat = 2131296433;
- // aapt resource value: 0x7F0D0044
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131558468;
+ // aapt resource value: 0x7f0900b2
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131296434;
- // aapt resource value: 0x7F0D0045
- public const int Base_Theme_AppCompat_Light_Dialog = 2131558469;
+ // aapt resource value: 0x7f0900b3
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131296435;
- // aapt resource value: 0x7F0D0049
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131558473;
+ // aapt resource value: 0x7f0900b4
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131296436;
- // aapt resource value: 0x7F0D0046
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131558470;
+ // aapt resource value: 0x7f090017
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131296279;
- // aapt resource value: 0x7F0D0047
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131558471;
+ // aapt resource value: 0x7f090018
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131296280;
- // aapt resource value: 0x7F0D0048
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131558472;
+ // aapt resource value: 0x7f0900b5
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131296437;
- // aapt resource value: 0x7F0D0053
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131558483;
+ // aapt resource value: 0x7f090019
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131296281;
- // aapt resource value: 0x7F0D0051
- public const int Base_V11_Theme_AppCompat_Dialog = 2131558481;
+ // aapt resource value: 0x7f09001a
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131296282;
- // aapt resource value: 0x7F0D0052
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131558482;
+ // aapt resource value: 0x7f09001b
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131296283;
- // aapt resource value: 0x7F0D0054
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131558484;
+ // aapt resource value: 0x7f090023
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131296291;
- // aapt resource value: 0x7F0D0055
- public const int Base_V12_Widget_AppCompat_EditText = 2131558485;
+ // aapt resource value: 0x7f090024
+ public const int Base_V12_Widget_AppCompat_EditText = 2131296292;
- // aapt resource value: 0x7F0D005A
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131558490;
+ // aapt resource value: 0x7f09005c
+ public const int Base_V21_Theme_AppCompat = 2131296348;
- // aapt resource value: 0x7F0D0056
- public const int Base_V21_Theme_AppCompat = 2131558486;
+ // aapt resource value: 0x7f09005d
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131296349;
- // aapt resource value: 0x7F0D0057
- public const int Base_V21_Theme_AppCompat_Dialog = 2131558487;
+ // aapt resource value: 0x7f09005e
+ public const int Base_V21_Theme_AppCompat_Light = 2131296350;
- // aapt resource value: 0x7F0D0058
- public const int Base_V21_Theme_AppCompat_Light = 2131558488;
+ // aapt resource value: 0x7f09005f
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131296351;
- // aapt resource value: 0x7F0D0059
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131558489;
+ // aapt resource value: 0x7f090060
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131296352;
- // aapt resource value: 0x7F0D005B
- public const int Base_V22_Theme_AppCompat = 2131558491;
+ // aapt resource value: 0x7f09008c
+ public const int Base_V22_Theme_AppCompat = 2131296396;
- // aapt resource value: 0x7F0D005C
- public const int Base_V22_Theme_AppCompat_Light = 2131558492;
+ // aapt resource value: 0x7f09008d
+ public const int Base_V22_Theme_AppCompat_Light = 2131296397;
- // aapt resource value: 0x7F0D005D
- public const int Base_V23_Theme_AppCompat = 2131558493;
+ // aapt resource value: 0x7f090090
+ public const int Base_V23_Theme_AppCompat = 2131296400;
- // aapt resource value: 0x7F0D005E
- public const int Base_V23_Theme_AppCompat_Light = 2131558494;
+ // aapt resource value: 0x7f090091
+ public const int Base_V23_Theme_AppCompat_Light = 2131296401;
- // aapt resource value: 0x7F0D005F
- public const int Base_V26_Theme_AppCompat = 2131558495;
+ // aapt resource value: 0x7f090099
+ public const int Base_V26_Theme_AppCompat = 2131296409;
- // aapt resource value: 0x7F0D0060
- public const int Base_V26_Theme_AppCompat_Light = 2131558496;
+ // aapt resource value: 0x7f09009a
+ public const int Base_V26_Theme_AppCompat_Light = 2131296410;
- // aapt resource value: 0x7F0D0061
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131558497;
+ // aapt resource value: 0x7f09009b
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131296411;
- // aapt resource value: 0x7F0D0066
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131558502;
+ // aapt resource value: 0x7f0900b6
+ public const int Base_V7_Theme_AppCompat = 2131296438;
- // aapt resource value: 0x7F0D0062
- public const int Base_V7_Theme_AppCompat = 2131558498;
+ // aapt resource value: 0x7f0900b7
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131296439;
- // aapt resource value: 0x7F0D0063
- public const int Base_V7_Theme_AppCompat_Dialog = 2131558499;
+ // aapt resource value: 0x7f0900b8
+ public const int Base_V7_Theme_AppCompat_Light = 2131296440;
- // aapt resource value: 0x7F0D0064
- public const int Base_V7_Theme_AppCompat_Light = 2131558500;
+ // aapt resource value: 0x7f0900b9
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131296441;
- // aapt resource value: 0x7F0D0065
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131558501;
+ // aapt resource value: 0x7f0900ba
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131296442;
- // aapt resource value: 0x7F0D0067
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131558503;
+ // aapt resource value: 0x7f0900bb
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131296443;
- // aapt resource value: 0x7F0D0068
- public const int Base_V7_Widget_AppCompat_EditText = 2131558504;
+ // aapt resource value: 0x7f0900bc
+ public const int Base_V7_Widget_AppCompat_EditText = 2131296444;
- // aapt resource value: 0x7F0D0069
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131558505;
+ // aapt resource value: 0x7f0900bd
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131296445;
- // aapt resource value: 0x7F0D006A
- public const int Base_Widget_AppCompat_ActionBar = 2131558506;
+ // aapt resource value: 0x7f0900be
+ public const int Base_Widget_AppCompat_ActionBar = 2131296446;
- // aapt resource value: 0x7F0D006B
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131558507;
+ // aapt resource value: 0x7f0900bf
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131296447;
- // aapt resource value: 0x7F0D006C
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131558508;
+ // aapt resource value: 0x7f0900c0
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131296448;
- // aapt resource value: 0x7F0D006D
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131558509;
+ // aapt resource value: 0x7f090061
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131296353;
- // aapt resource value: 0x7F0D006E
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131558510;
+ // aapt resource value: 0x7f090062
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131296354;
- // aapt resource value: 0x7F0D006F
- public const int Base_Widget_AppCompat_ActionButton = 2131558511;
+ // aapt resource value: 0x7f090063
+ public const int Base_Widget_AppCompat_ActionButton = 2131296355;
- // aapt resource value: 0x7F0D0070
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131558512;
+ // aapt resource value: 0x7f090064
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131296356;
- // aapt resource value: 0x7F0D0071
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131558513;
+ // aapt resource value: 0x7f090065
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131296357;
- // aapt resource value: 0x7F0D0072
- public const int Base_Widget_AppCompat_ActionMode = 2131558514;
+ // aapt resource value: 0x7f0900c1
+ public const int Base_Widget_AppCompat_ActionMode = 2131296449;
- // aapt resource value: 0x7F0D0073
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131558515;
+ // aapt resource value: 0x7f0900c2
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131296450;
- // aapt resource value: 0x7F0D0074
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131558516;
+ // aapt resource value: 0x7f090025
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131296293;
- // aapt resource value: 0x7F0D0075
- public const int Base_Widget_AppCompat_Button = 2131558517;
+ // aapt resource value: 0x7f090066
+ public const int Base_Widget_AppCompat_Button = 2131296358;
- // aapt resource value: 0x7F0D007B
- public const int Base_Widget_AppCompat_ButtonBar = 2131558523;
+ // aapt resource value: 0x7f090067
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131296359;
- // aapt resource value: 0x7F0D007C
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131558524;
+ // aapt resource value: 0x7f090068
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131296360;
- // aapt resource value: 0x7F0D0076
- public const int Base_Widget_AppCompat_Button_Borderless = 2131558518;
+ // aapt resource value: 0x7f0900c3
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131296451;
- // aapt resource value: 0x7F0D0077
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131558519;
+ // aapt resource value: 0x7f090092
+ public const int Base_Widget_AppCompat_Button_Colored = 2131296402;
- // aapt resource value: 0x7F0D0078
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131558520;
+ // aapt resource value: 0x7f090069
+ public const int Base_Widget_AppCompat_Button_Small = 2131296361;
- // aapt resource value: 0x7F0D0079
- public const int Base_Widget_AppCompat_Button_Colored = 2131558521;
+ // aapt resource value: 0x7f09006a
+ public const int Base_Widget_AppCompat_ButtonBar = 2131296362;
- // aapt resource value: 0x7F0D007A
- public const int Base_Widget_AppCompat_Button_Small = 2131558522;
+ // aapt resource value: 0x7f0900c4
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131296452;
- // aapt resource value: 0x7F0D007D
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131558525;
+ // aapt resource value: 0x7f09006b
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131296363;
- // aapt resource value: 0x7F0D007E
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131558526;
+ // aapt resource value: 0x7f09006c
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131296364;
- // aapt resource value: 0x7F0D007F
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131558527;
+ // aapt resource value: 0x7f0900c5
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131296453;
- // aapt resource value: 0x7F0D0080
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131558528;
+ // aapt resource value: 0x7f090000
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131296256;
- // aapt resource value: 0x7F0D0081
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131558529;
+ // aapt resource value: 0x7f0900c6
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131296454;
- // aapt resource value: 0x7F0D0082
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131558530;
+ // aapt resource value: 0x7f09006d
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131296365;
- // aapt resource value: 0x7F0D0083
- public const int Base_Widget_AppCompat_EditText = 2131558531;
+ // aapt resource value: 0x7f090026
+ public const int Base_Widget_AppCompat_EditText = 2131296294;
- // aapt resource value: 0x7F0D0084
- public const int Base_Widget_AppCompat_ImageButton = 2131558532;
+ // aapt resource value: 0x7f09006e
+ public const int Base_Widget_AppCompat_ImageButton = 2131296366;
- // aapt resource value: 0x7F0D0085
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131558533;
+ // aapt resource value: 0x7f0900c7
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131296455;
- // aapt resource value: 0x7F0D0086
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131558534;
+ // aapt resource value: 0x7f0900c8
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131296456;
- // aapt resource value: 0x7F0D0087
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131558535;
+ // aapt resource value: 0x7f0900c9
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131296457;
- // aapt resource value: 0x7F0D0088
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131558536;
+ // aapt resource value: 0x7f09006f
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131296367;
- // aapt resource value: 0x7F0D0089
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131558537;
+ // aapt resource value: 0x7f090070
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131296368;
- // aapt resource value: 0x7F0D008A
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131558538;
+ // aapt resource value: 0x7f090071
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131296369;
- // aapt resource value: 0x7F0D008B
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131558539;
+ // aapt resource value: 0x7f090072
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131296370;
- // aapt resource value: 0x7F0D008C
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131558540;
+ // aapt resource value: 0x7f090073
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131296371;
- // aapt resource value: 0x7F0D008D
- public const int Base_Widget_AppCompat_ListMenuView = 2131558541;
+ // aapt resource value: 0x7f0900ca
+ public const int Base_Widget_AppCompat_ListMenuView = 2131296458;
- // aapt resource value: 0x7F0D008E
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131558542;
+ // aapt resource value: 0x7f090074
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131296372;
- // aapt resource value: 0x7F0D008F
- public const int Base_Widget_AppCompat_ListView = 2131558543;
+ // aapt resource value: 0x7f090075
+ public const int Base_Widget_AppCompat_ListView = 2131296373;
- // aapt resource value: 0x7F0D0090
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131558544;
+ // aapt resource value: 0x7f090076
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131296374;
- // aapt resource value: 0x7F0D0091
- public const int Base_Widget_AppCompat_ListView_Menu = 2131558545;
+ // aapt resource value: 0x7f090077
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131296375;
- // aapt resource value: 0x7F0D0092
- public const int Base_Widget_AppCompat_PopupMenu = 2131558546;
+ // aapt resource value: 0x7f090078
+ public const int Base_Widget_AppCompat_PopupMenu = 2131296376;
- // aapt resource value: 0x7F0D0093
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131558547;
+ // aapt resource value: 0x7f090079
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131296377;
- // aapt resource value: 0x7F0D0094
- public const int Base_Widget_AppCompat_PopupWindow = 2131558548;
+ // aapt resource value: 0x7f0900cb
+ public const int Base_Widget_AppCompat_PopupWindow = 2131296459;
- // aapt resource value: 0x7F0D0095
- public const int Base_Widget_AppCompat_ProgressBar = 2131558549;
+ // aapt resource value: 0x7f09001c
+ public const int Base_Widget_AppCompat_ProgressBar = 2131296284;
- // aapt resource value: 0x7F0D0096
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131558550;
+ // aapt resource value: 0x7f09001d
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131296285;
- // aapt resource value: 0x7F0D0097
- public const int Base_Widget_AppCompat_RatingBar = 2131558551;
+ // aapt resource value: 0x7f09007a
+ public const int Base_Widget_AppCompat_RatingBar = 2131296378;
- // aapt resource value: 0x7F0D0098
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131558552;
+ // aapt resource value: 0x7f090093
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131296403;
- // aapt resource value: 0x7F0D0099
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131558553;
+ // aapt resource value: 0x7f090094
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131296404;
- // aapt resource value: 0x7F0D009A
- public const int Base_Widget_AppCompat_SearchView = 2131558554;
+ // aapt resource value: 0x7f0900cc
+ public const int Base_Widget_AppCompat_SearchView = 2131296460;
- // aapt resource value: 0x7F0D009B
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131558555;
+ // aapt resource value: 0x7f0900cd
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131296461;
- // aapt resource value: 0x7F0D009C
- public const int Base_Widget_AppCompat_SeekBar = 2131558556;
+ // aapt resource value: 0x7f09007b
+ public const int Base_Widget_AppCompat_SeekBar = 2131296379;
- // aapt resource value: 0x7F0D009D
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131558557;
+ // aapt resource value: 0x7f0900ce
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131296462;
- // aapt resource value: 0x7F0D009E
- public const int Base_Widget_AppCompat_Spinner = 2131558558;
+ // aapt resource value: 0x7f09007c
+ public const int Base_Widget_AppCompat_Spinner = 2131296380;
- // aapt resource value: 0x7F0D009F
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131558559;
+ // aapt resource value: 0x7f090003
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131296259;
- // aapt resource value: 0x7F0D00A0
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131558560;
+ // aapt resource value: 0x7f09007d
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131296381;
- // aapt resource value: 0x7F0D00A1
- public const int Base_Widget_AppCompat_Toolbar = 2131558561;
+ // aapt resource value: 0x7f09009c
+ public const int Base_Widget_AppCompat_Toolbar = 2131296412;
- // aapt resource value: 0x7F0D00A2
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131558562;
+ // aapt resource value: 0x7f09007e
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131296382;
- // aapt resource value: 0x7F0D00A3
- public const int BottomSheetDialogAnimation = 2131558563;
+ // aapt resource value: 0x7f09016c
+ public const int BottomSheetDialogAnimation = 2131296620;
- // aapt resource value: 0x7F0D016F
- public const int custom_dialog2 = 2131558767;
+ // aapt resource value: 0x7f090171
+ public const int MyTheme = 2131296625;
- // aapt resource value: 0x7F0D00A4
- public const int MyTheme = 2131558564;
+ // aapt resource value: 0x7f09001e
+ public const int Platform_AppCompat = 2131296286;
- // aapt resource value: 0x7F0D0170
- public const int picker_view_scale_anim = 2131558768;
+ // aapt resource value: 0x7f09001f
+ public const int Platform_AppCompat_Light = 2131296287;
- // aapt resource value: 0x7F0D0171
- public const int picker_view_slide_anim = 2131558769;
+ // aapt resource value: 0x7f09007f
+ public const int Platform_ThemeOverlay_AppCompat = 2131296383;
- // aapt resource value: 0x7F0D00A5
- public const int Platform_AppCompat = 2131558565;
+ // aapt resource value: 0x7f090080
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131296384;
- // aapt resource value: 0x7F0D00A6
- public const int Platform_AppCompat_Light = 2131558566;
+ // aapt resource value: 0x7f090081
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131296385;
- // aapt resource value: 0x7F0D00A7
- public const int Platform_ThemeOverlay_AppCompat = 2131558567;
+ // aapt resource value: 0x7f090020
+ public const int Platform_V11_AppCompat = 2131296288;
- // aapt resource value: 0x7F0D00A8
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131558568;
+ // aapt resource value: 0x7f090021
+ public const int Platform_V11_AppCompat_Light = 2131296289;
- // aapt resource value: 0x7F0D00A9
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131558569;
+ // aapt resource value: 0x7f090028
+ public const int Platform_V14_AppCompat = 2131296296;
- // aapt resource value: 0x7F0D00AA
- public const int Platform_V11_AppCompat = 2131558570;
+ // aapt resource value: 0x7f090029
+ public const int Platform_V14_AppCompat_Light = 2131296297;
- // aapt resource value: 0x7F0D00AB
- public const int Platform_V11_AppCompat_Light = 2131558571;
+ // aapt resource value: 0x7f090082
+ public const int Platform_V21_AppCompat = 2131296386;
- // aapt resource value: 0x7F0D00AC
- public const int Platform_V14_AppCompat = 2131558572;
+ // aapt resource value: 0x7f090083
+ public const int Platform_V21_AppCompat_Light = 2131296387;
- // aapt resource value: 0x7F0D00AD
- public const int Platform_V14_AppCompat_Light = 2131558573;
+ // aapt resource value: 0x7f090097
+ public const int Platform_V25_AppCompat = 2131296407;
- // aapt resource value: 0x7F0D00AE
- public const int Platform_V21_AppCompat = 2131558574;
+ // aapt resource value: 0x7f090098
+ public const int Platform_V25_AppCompat_Light = 2131296408;
- // aapt resource value: 0x7F0D00AF
- public const int Platform_V21_AppCompat_Light = 2131558575;
+ // aapt resource value: 0x7f090022
+ public const int Platform_Widget_AppCompat_Spinner = 2131296290;
- // aapt resource value: 0x7F0D00B0
- public const int Platform_V25_AppCompat = 2131558576;
+ // aapt resource value: 0x7f09002b
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131296299;
- // aapt resource value: 0x7F0D00B1
- public const int Platform_V25_AppCompat_Light = 2131558577;
+ // aapt resource value: 0x7f09002c
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131296300;
- // aapt resource value: 0x7F0D00B2
- public const int Platform_Widget_AppCompat_Spinner = 2131558578;
+ // aapt resource value: 0x7f09002d
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131296301;
- // aapt resource value: 0x7F0D00B3
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131558579;
+ // aapt resource value: 0x7f09002e
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131296302;
- // aapt resource value: 0x7F0D00B4
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131558580;
+ // aapt resource value: 0x7f09002f
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131296303;
- // aapt resource value: 0x7F0D00B5
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131558581;
+ // aapt resource value: 0x7f090030
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131296304;
- // aapt resource value: 0x7F0D00B6
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131558582;
+ // aapt resource value: 0x7f090031
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131296305;
- // aapt resource value: 0x7F0D00B7
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131558583;
+ // aapt resource value: 0x7f090032
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131296306;
- // aapt resource value: 0x7F0D00B8
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131558584;
+ // aapt resource value: 0x7f090033
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131296307;
- // aapt resource value: 0x7F0D00BE
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131558590;
+ // aapt resource value: 0x7f090034
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131296308;
- // aapt resource value: 0x7F0D00B9
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131558585;
+ // aapt resource value: 0x7f090035
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131296309;
- // aapt resource value: 0x7F0D00BA
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131558586;
+ // aapt resource value: 0x7f090036
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131296310;
- // aapt resource value: 0x7F0D00BB
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131558587;
+ // aapt resource value: 0x7f090037
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131296311;
- // aapt resource value: 0x7F0D00BC
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131558588;
+ // aapt resource value: 0x7f090038
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131296312;
- // aapt resource value: 0x7F0D00BD
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131558589;
+ // aapt resource value: 0x7f0900cf
+ public const int TextAppearance_AppCompat = 2131296463;
- // aapt resource value: 0x7F0D00BF
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131558591;
+ // aapt resource value: 0x7f0900d0
+ public const int TextAppearance_AppCompat_Body1 = 2131296464;
- // aapt resource value: 0x7F0D00C0
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131558592;
+ // aapt resource value: 0x7f0900d1
+ public const int TextAppearance_AppCompat_Body2 = 2131296465;
- // aapt resource value: 0x7F0D00C1
- public const int TextAppearance_AppCompat = 2131558593;
+ // aapt resource value: 0x7f0900d2
+ public const int TextAppearance_AppCompat_Button = 2131296466;
- // aapt resource value: 0x7F0D00C2
- public const int TextAppearance_AppCompat_Body1 = 2131558594;
+ // aapt resource value: 0x7f0900d3
+ public const int TextAppearance_AppCompat_Caption = 2131296467;
- // aapt resource value: 0x7F0D00C3
- public const int TextAppearance_AppCompat_Body2 = 2131558595;
+ // aapt resource value: 0x7f0900d4
+ public const int TextAppearance_AppCompat_Display1 = 2131296468;
- // aapt resource value: 0x7F0D00C4
- public const int TextAppearance_AppCompat_Button = 2131558596;
+ // aapt resource value: 0x7f0900d5
+ public const int TextAppearance_AppCompat_Display2 = 2131296469;
- // aapt resource value: 0x7F0D00C5
- public const int TextAppearance_AppCompat_Caption = 2131558597;
+ // aapt resource value: 0x7f0900d6
+ public const int TextAppearance_AppCompat_Display3 = 2131296470;
- // aapt resource value: 0x7F0D00C6
- public const int TextAppearance_AppCompat_Display1 = 2131558598;
+ // aapt resource value: 0x7f0900d7
+ public const int TextAppearance_AppCompat_Display4 = 2131296471;
- // aapt resource value: 0x7F0D00C7
- public const int TextAppearance_AppCompat_Display2 = 2131558599;
+ // aapt resource value: 0x7f0900d8
+ public const int TextAppearance_AppCompat_Headline = 2131296472;
- // aapt resource value: 0x7F0D00C8
- public const int TextAppearance_AppCompat_Display3 = 2131558600;
+ // aapt resource value: 0x7f0900d9
+ public const int TextAppearance_AppCompat_Inverse = 2131296473;
- // aapt resource value: 0x7F0D00C9
- public const int TextAppearance_AppCompat_Display4 = 2131558601;
+ // aapt resource value: 0x7f0900da
+ public const int TextAppearance_AppCompat_Large = 2131296474;
- // aapt resource value: 0x7F0D00CA
- public const int TextAppearance_AppCompat_Headline = 2131558602;
+ // aapt resource value: 0x7f0900db
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131296475;
- // aapt resource value: 0x7F0D00CB
- public const int TextAppearance_AppCompat_Inverse = 2131558603;
+ // aapt resource value: 0x7f0900dc
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131296476;
- // aapt resource value: 0x7F0D00CC
- public const int TextAppearance_AppCompat_Large = 2131558604;
+ // aapt resource value: 0x7f0900dd
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131296477;
- // aapt resource value: 0x7F0D00CD
- public const int TextAppearance_AppCompat_Large_Inverse = 2131558605;
+ // aapt resource value: 0x7f0900de
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131296478;
- // aapt resource value: 0x7F0D00CE
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131558606;
+ // aapt resource value: 0x7f0900df
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131296479;
- // aapt resource value: 0x7F0D00CF
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131558607;
+ // aapt resource value: 0x7f0900e0
+ public const int TextAppearance_AppCompat_Medium = 2131296480;
- // aapt resource value: 0x7F0D00D0
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131558608;
+ // aapt resource value: 0x7f0900e1
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131296481;
- // aapt resource value: 0x7F0D00D1
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131558609;
+ // aapt resource value: 0x7f0900e2
+ public const int TextAppearance_AppCompat_Menu = 2131296482;
- // aapt resource value: 0x7F0D00D2
- public const int TextAppearance_AppCompat_Medium = 2131558610;
+ // aapt resource value: 0x7f090084
+ public const int TextAppearance_AppCompat_Notification = 2131296388;
- // aapt resource value: 0x7F0D00D3
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131558611;
+ // aapt resource value: 0x7f090085
+ public const int TextAppearance_AppCompat_Notification_Info = 2131296389;
- // aapt resource value: 0x7F0D00D4
- public const int TextAppearance_AppCompat_Menu = 2131558612;
+ // aapt resource value: 0x7f090086
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131296390;
- // aapt resource value: 0x7F0D00D5
- public const int TextAppearance_AppCompat_Notification = 2131558613;
+ // aapt resource value: 0x7f0900e3
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131296483;
- // aapt resource value: 0x7F0D00D6
- public const int TextAppearance_AppCompat_Notification_Info = 2131558614;
+ // aapt resource value: 0x7f0900e4
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131296484;
- // aapt resource value: 0x7F0D00D7
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131558615;
+ // aapt resource value: 0x7f090087
+ public const int TextAppearance_AppCompat_Notification_Media = 2131296391;
- // aapt resource value: 0x7F0D00D8
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131558616;
+ // aapt resource value: 0x7f090088
+ public const int TextAppearance_AppCompat_Notification_Time = 2131296392;
- // aapt resource value: 0x7F0D00D9
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131558617;
+ // aapt resource value: 0x7f090089
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131296393;
- // aapt resource value: 0x7F0D00DA
- public const int TextAppearance_AppCompat_Notification_Media = 2131558618;
+ // aapt resource value: 0x7f09008a
+ public const int TextAppearance_AppCompat_Notification_Title = 2131296394;
- // aapt resource value: 0x7F0D00DB
- public const int TextAppearance_AppCompat_Notification_Time = 2131558619;
+ // aapt resource value: 0x7f09008b
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131296395;
- // aapt resource value: 0x7F0D00DC
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131558620;
+ // aapt resource value: 0x7f0900e5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131296485;
- // aapt resource value: 0x7F0D00DD
- public const int TextAppearance_AppCompat_Notification_Title = 2131558621;
+ // aapt resource value: 0x7f0900e6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131296486;
- // aapt resource value: 0x7F0D00DE
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131558622;
+ // aapt resource value: 0x7f0900e7
+ public const int TextAppearance_AppCompat_Small = 2131296487;
- // aapt resource value: 0x7F0D00DF
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131558623;
+ // aapt resource value: 0x7f0900e8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131296488;
- // aapt resource value: 0x7F0D00E0
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131558624;
+ // aapt resource value: 0x7f0900e9
+ public const int TextAppearance_AppCompat_Subhead = 2131296489;
- // aapt resource value: 0x7F0D00E1
- public const int TextAppearance_AppCompat_Small = 2131558625;
+ // aapt resource value: 0x7f0900ea
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131296490;
- // aapt resource value: 0x7F0D00E2
- public const int TextAppearance_AppCompat_Small_Inverse = 2131558626;
+ // aapt resource value: 0x7f0900eb
+ public const int TextAppearance_AppCompat_Title = 2131296491;
- // aapt resource value: 0x7F0D00E3
- public const int TextAppearance_AppCompat_Subhead = 2131558627;
+ // aapt resource value: 0x7f0900ec
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131296492;
- // aapt resource value: 0x7F0D00E4
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131558628;
+ // aapt resource value: 0x7f09002a
+ public const int TextAppearance_AppCompat_Tooltip = 2131296298;
- // aapt resource value: 0x7F0D00E5
- public const int TextAppearance_AppCompat_Title = 2131558629;
+ // aapt resource value: 0x7f0900ed
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131296493;
- // aapt resource value: 0x7F0D00E6
- public const int TextAppearance_AppCompat_Title_Inverse = 2131558630;
+ // aapt resource value: 0x7f0900ee
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131296494;
- // aapt resource value: 0x7F0D00E7
- public const int TextAppearance_AppCompat_Tooltip = 2131558631;
+ // aapt resource value: 0x7f0900ef
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131296495;
- // aapt resource value: 0x7F0D00E8
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131558632;
+ // aapt resource value: 0x7f0900f0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131296496;
- // aapt resource value: 0x7F0D00E9
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131558633;
+ // aapt resource value: 0x7f0900f1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131296497;
- // aapt resource value: 0x7F0D00EA
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131558634;
+ // aapt resource value: 0x7f0900f2
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131296498;
- // aapt resource value: 0x7F0D00EB
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131558635;
+ // aapt resource value: 0x7f0900f3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131296499;
- // aapt resource value: 0x7F0D00EC
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131558636;
+ // aapt resource value: 0x7f0900f4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131296500;
- // aapt resource value: 0x7F0D00ED
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131558637;
+ // aapt resource value: 0x7f0900f5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131296501;
- // aapt resource value: 0x7F0D00EE
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131558638;
+ // aapt resource value: 0x7f0900f6
+ public const int TextAppearance_AppCompat_Widget_Button = 2131296502;
- // aapt resource value: 0x7F0D00EF
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131558639;
+ // aapt resource value: 0x7f0900f7
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131296503;
- // aapt resource value: 0x7F0D00F0
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131558640;
+ // aapt resource value: 0x7f0900f8
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131296504;
- // aapt resource value: 0x7F0D00F1
- public const int TextAppearance_AppCompat_Widget_Button = 2131558641;
+ // aapt resource value: 0x7f0900f9
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131296505;
- // aapt resource value: 0x7F0D00F2
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131558642;
+ // aapt resource value: 0x7f0900fa
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131296506;
- // aapt resource value: 0x7F0D00F3
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131558643;
+ // aapt resource value: 0x7f0900fb
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131296507;
- // aapt resource value: 0x7F0D00F4
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131558644;
+ // aapt resource value: 0x7f0900fc
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131296508;
- // aapt resource value: 0x7F0D00F5
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131558645;
+ // aapt resource value: 0x7f0900fd
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131296509;
- // aapt resource value: 0x7F0D00F6
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131558646;
+ // aapt resource value: 0x7f0900fe
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131296510;
- // aapt resource value: 0x7F0D00F7
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131558647;
+ // aapt resource value: 0x7f0900ff
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131296511;
- // aapt resource value: 0x7F0D00F8
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131558648;
+ // aapt resource value: 0x7f090165
+ public const int TextAppearance_Compat_Notification = 2131296613;
- // aapt resource value: 0x7F0D00F9
- public const int TextAppearance_AppCompat_Widget_Switch = 2131558649;
+ // aapt resource value: 0x7f090166
+ public const int TextAppearance_Compat_Notification_Info = 2131296614;
- // aapt resource value: 0x7F0D00FA
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131558650;
+ // aapt resource value: 0x7f090160
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131296608;
- // aapt resource value: 0x7F0D00FB
- public const int TextAppearance_Compat_Notification = 2131558651;
+ // aapt resource value: 0x7f09016b
+ public const int TextAppearance_Compat_Notification_Line2 = 2131296619;
- // aapt resource value: 0x7F0D00FC
- public const int TextAppearance_Compat_Notification_Info = 2131558652;
+ // aapt resource value: 0x7f090164
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131296612;
- // aapt resource value: 0x7F0D00FD
- public const int TextAppearance_Compat_Notification_Info_Media = 2131558653;
+ // aapt resource value: 0x7f090161
+ public const int TextAppearance_Compat_Notification_Media = 2131296609;
- // aapt resource value: 0x7F0D00FE
- public const int TextAppearance_Compat_Notification_Line2 = 2131558654;
+ // aapt resource value: 0x7f090167
+ public const int TextAppearance_Compat_Notification_Time = 2131296615;
- // aapt resource value: 0x7F0D00FF
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131558655;
+ // aapt resource value: 0x7f090162
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131296610;
- // aapt resource value: 0x7F0D0100
- public const int TextAppearance_Compat_Notification_Media = 2131558656;
+ // aapt resource value: 0x7f090168
+ public const int TextAppearance_Compat_Notification_Title = 2131296616;
- // aapt resource value: 0x7F0D0101
- public const int TextAppearance_Compat_Notification_Time = 2131558657;
+ // aapt resource value: 0x7f090163
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131296611;
- // aapt resource value: 0x7F0D0102
- public const int TextAppearance_Compat_Notification_Time_Media = 2131558658;
+ // aapt resource value: 0x7f090100
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131296512;
- // aapt resource value: 0x7F0D0103
- public const int TextAppearance_Compat_Notification_Title = 2131558659;
+ // aapt resource value: 0x7f090101
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131296513;
- // aapt resource value: 0x7F0D0104
- public const int TextAppearance_Compat_Notification_Title_Media = 2131558660;
+ // aapt resource value: 0x7f090102
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131296514;
- // aapt resource value: 0x7F0D0105
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131558661;
+ // aapt resource value: 0x7f090103
+ public const int Theme_AppCompat = 2131296515;
- // aapt resource value: 0x7F0D0106
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131558662;
+ // aapt resource value: 0x7f090104
+ public const int Theme_AppCompat_CompactMenu = 2131296516;
- // aapt resource value: 0x7F0D0107
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131558663;
+ // aapt resource value: 0x7f090004
+ public const int Theme_AppCompat_DayNight = 2131296260;
- // aapt resource value: 0x7F0D011E
- public const int ThemeOverlay_AppCompat = 2131558686;
+ // aapt resource value: 0x7f090005
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131296261;
- // aapt resource value: 0x7F0D011F
- public const int ThemeOverlay_AppCompat_ActionBar = 2131558687;
+ // aapt resource value: 0x7f090006
+ public const int Theme_AppCompat_DayNight_Dialog = 2131296262;
- // aapt resource value: 0x7F0D0120
- public const int ThemeOverlay_AppCompat_Dark = 2131558688;
+ // aapt resource value: 0x7f090007
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131296263;
- // aapt resource value: 0x7F0D0121
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131558689;
+ // aapt resource value: 0x7f090008
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131296264;
- // aapt resource value: 0x7F0D0122
- public const int ThemeOverlay_AppCompat_Dialog = 2131558690;
+ // aapt resource value: 0x7f090009
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131296265;
- // aapt resource value: 0x7F0D0123
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131558691;
+ // aapt resource value: 0x7f09000a
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131296266;
- // aapt resource value: 0x7F0D0124
- public const int ThemeOverlay_AppCompat_Light = 2131558692;
+ // aapt resource value: 0x7f090105
+ public const int Theme_AppCompat_Dialog = 2131296517;
- // aapt resource value: 0x7F0D0108
- public const int Theme_AppCompat = 2131558664;
+ // aapt resource value: 0x7f090106
+ public const int Theme_AppCompat_Dialog_Alert = 2131296518;
- // aapt resource value: 0x7F0D0109
- public const int Theme_AppCompat_CompactMenu = 2131558665;
+ // aapt resource value: 0x7f090107
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131296519;
- // aapt resource value: 0x7F0D010A
- public const int Theme_AppCompat_DayNight = 2131558666;
+ // aapt resource value: 0x7f090108
+ public const int Theme_AppCompat_DialogWhenLarge = 2131296520;
- // aapt resource value: 0x7F0D010B
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131558667;
+ // aapt resource value: 0x7f090109
+ public const int Theme_AppCompat_Light = 2131296521;
- // aapt resource value: 0x7F0D010C
- public const int Theme_AppCompat_DayNight_Dialog = 2131558668;
+ // aapt resource value: 0x7f09010a
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131296522;
- // aapt resource value: 0x7F0D010F
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131558671;
+ // aapt resource value: 0x7f09010b
+ public const int Theme_AppCompat_Light_Dialog = 2131296523;
- // aapt resource value: 0x7F0D010D
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131558669;
+ // aapt resource value: 0x7f09010c
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131296524;
- // aapt resource value: 0x7F0D010E
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131558670;
+ // aapt resource value: 0x7f09010d
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131296525;
- // aapt resource value: 0x7F0D0110
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131558672;
+ // aapt resource value: 0x7f09010e
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131296526;
- // aapt resource value: 0x7F0D0111
- public const int Theme_AppCompat_Dialog = 2131558673;
+ // aapt resource value: 0x7f09010f
+ public const int Theme_AppCompat_Light_NoActionBar = 2131296527;
- // aapt resource value: 0x7F0D0114
- public const int Theme_AppCompat_DialogWhenLarge = 2131558676;
+ // aapt resource value: 0x7f090110
+ public const int Theme_AppCompat_NoActionBar = 2131296528;
- // aapt resource value: 0x7F0D0112
- public const int Theme_AppCompat_Dialog_Alert = 2131558674;
+ // aapt resource value: 0x7f09016d
+ public const int Theme_BiometricPromptDialog = 2131296621;
- // aapt resource value: 0x7F0D0113
- public const int Theme_AppCompat_Dialog_MinWidth = 2131558675;
+ // aapt resource value: 0x7f090111
+ public const int ThemeOverlay_AppCompat = 2131296529;
- // aapt resource value: 0x7F0D0115
- public const int Theme_AppCompat_Light = 2131558677;
+ // aapt resource value: 0x7f090112
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131296530;
- // aapt resource value: 0x7F0D0116
- public const int Theme_AppCompat_Light_DarkActionBar = 2131558678;
+ // aapt resource value: 0x7f090113
+ public const int ThemeOverlay_AppCompat_Dark = 2131296531;
- // aapt resource value: 0x7F0D0117
- public const int Theme_AppCompat_Light_Dialog = 2131558679;
+ // aapt resource value: 0x7f090114
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131296532;
- // aapt resource value: 0x7F0D011A
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131558682;
+ // aapt resource value: 0x7f090115
+ public const int ThemeOverlay_AppCompat_Dialog = 2131296533;
- // aapt resource value: 0x7F0D0118
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131558680;
+ // aapt resource value: 0x7f090116
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131296534;
- // aapt resource value: 0x7F0D0119
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131558681;
+ // aapt resource value: 0x7f090117
+ public const int ThemeOverlay_AppCompat_Light = 2131296535;
- // aapt resource value: 0x7F0D011B
- public const int Theme_AppCompat_Light_NoActionBar = 2131558683;
+ // aapt resource value: 0x7f090118
+ public const int Widget_AppCompat_ActionBar = 2131296536;
- // aapt resource value: 0x7F0D011C
- public const int Theme_AppCompat_NoActionBar = 2131558684;
+ // aapt resource value: 0x7f090119
+ public const int Widget_AppCompat_ActionBar_Solid = 2131296537;
- // aapt resource value: 0x7F0D011D
- public const int Theme_BiometricPromptDialog = 2131558685;
+ // aapt resource value: 0x7f09011a
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131296538;
- // aapt resource value: 0x7F0D0125
- public const int Widget_AppCompat_ActionBar = 2131558693;
+ // aapt resource value: 0x7f09011b
+ public const int Widget_AppCompat_ActionBar_TabText = 2131296539;
- // aapt resource value: 0x7F0D0126
- public const int Widget_AppCompat_ActionBar_Solid = 2131558694;
+ // aapt resource value: 0x7f09011c
+ public const int Widget_AppCompat_ActionBar_TabView = 2131296540;
- // aapt resource value: 0x7F0D0127
- public const int Widget_AppCompat_ActionBar_TabBar = 2131558695;
+ // aapt resource value: 0x7f09011d
+ public const int Widget_AppCompat_ActionButton = 2131296541;
- // aapt resource value: 0x7F0D0128
- public const int Widget_AppCompat_ActionBar_TabText = 2131558696;
+ // aapt resource value: 0x7f09011e
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131296542;
- // aapt resource value: 0x7F0D0129
- public const int Widget_AppCompat_ActionBar_TabView = 2131558697;
+ // aapt resource value: 0x7f09011f
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131296543;
- // aapt resource value: 0x7F0D012A
- public const int Widget_AppCompat_ActionButton = 2131558698;
+ // aapt resource value: 0x7f090120
+ public const int Widget_AppCompat_ActionMode = 2131296544;
- // aapt resource value: 0x7F0D012B
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131558699;
+ // aapt resource value: 0x7f090121
+ public const int Widget_AppCompat_ActivityChooserView = 2131296545;
- // aapt resource value: 0x7F0D012C
- public const int Widget_AppCompat_ActionButton_Overflow = 2131558700;
+ // aapt resource value: 0x7f090122
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131296546;
- // aapt resource value: 0x7F0D012D
- public const int Widget_AppCompat_ActionMode = 2131558701;
+ // aapt resource value: 0x7f090123
+ public const int Widget_AppCompat_Button = 2131296547;
- // aapt resource value: 0x7F0D012E
- public const int Widget_AppCompat_ActivityChooserView = 2131558702;
+ // aapt resource value: 0x7f090124
+ public const int Widget_AppCompat_Button_Borderless = 2131296548;
- // aapt resource value: 0x7F0D012F
- public const int Widget_AppCompat_AutoCompleteTextView = 2131558703;
+ // aapt resource value: 0x7f090125
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131296549;
- // aapt resource value: 0x7F0D0130
- public const int Widget_AppCompat_Button = 2131558704;
+ // aapt resource value: 0x7f090126
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131296550;
- // aapt resource value: 0x7F0D0136
- public const int Widget_AppCompat_ButtonBar = 2131558710;
+ // aapt resource value: 0x7f090127
+ public const int Widget_AppCompat_Button_Colored = 2131296551;
- // aapt resource value: 0x7F0D0137
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131558711;
+ // aapt resource value: 0x7f090128
+ public const int Widget_AppCompat_Button_Small = 2131296552;
- // aapt resource value: 0x7F0D0131
- public const int Widget_AppCompat_Button_Borderless = 2131558705;
+ // aapt resource value: 0x7f090129
+ public const int Widget_AppCompat_ButtonBar = 2131296553;
- // aapt resource value: 0x7F0D0132
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131558706;
+ // aapt resource value: 0x7f09012a
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131296554;
- // aapt resource value: 0x7F0D0133
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131558707;
+ // aapt resource value: 0x7f09012b
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131296555;
- // aapt resource value: 0x7F0D0134
- public const int Widget_AppCompat_Button_Colored = 2131558708;
+ // aapt resource value: 0x7f09012c
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131296556;
- // aapt resource value: 0x7F0D0135
- public const int Widget_AppCompat_Button_Small = 2131558709;
+ // aapt resource value: 0x7f09012d
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131296557;
- // aapt resource value: 0x7F0D0138
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131558712;
+ // aapt resource value: 0x7f09012e
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131296558;
- // aapt resource value: 0x7F0D0139
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131558713;
+ // aapt resource value: 0x7f09012f
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131296559;
- // aapt resource value: 0x7F0D013A
- public const int Widget_AppCompat_CompoundButton_Switch = 2131558714;
+ // aapt resource value: 0x7f090130
+ public const int Widget_AppCompat_EditText = 2131296560;
- // aapt resource value: 0x7F0D013B
- public const int Widget_AppCompat_DrawerArrowToggle = 2131558715;
+ // aapt resource value: 0x7f090131
+ public const int Widget_AppCompat_ImageButton = 2131296561;
- // aapt resource value: 0x7F0D013C
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131558716;
+ // aapt resource value: 0x7f090132
+ public const int Widget_AppCompat_Light_ActionBar = 2131296562;
- // aapt resource value: 0x7F0D013D
- public const int Widget_AppCompat_EditText = 2131558717;
+ // aapt resource value: 0x7f090133
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131296563;
- // aapt resource value: 0x7F0D013E
- public const int Widget_AppCompat_ImageButton = 2131558718;
+ // aapt resource value: 0x7f090134
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131296564;
- // aapt resource value: 0x7F0D013F
- public const int Widget_AppCompat_Light_ActionBar = 2131558719;
+ // aapt resource value: 0x7f090135
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131296565;
- // aapt resource value: 0x7F0D0140
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131558720;
+ // aapt resource value: 0x7f090136
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131296566;
- // aapt resource value: 0x7F0D0141
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131558721;
+ // aapt resource value: 0x7f090137
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131296567;
- // aapt resource value: 0x7F0D0142
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131558722;
+ // aapt resource value: 0x7f090138
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131296568;
- // aapt resource value: 0x7F0D0143
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131558723;
+ // aapt resource value: 0x7f090139
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131296569;
- // aapt resource value: 0x7F0D0144
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131558724;
+ // aapt resource value: 0x7f09013a
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131296570;
- // aapt resource value: 0x7F0D0145
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131558725;
+ // aapt resource value: 0x7f09013b
+ public const int Widget_AppCompat_Light_ActionButton = 2131296571;
- // aapt resource value: 0x7F0D0146
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131558726;
+ // aapt resource value: 0x7f09013c
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131296572;
- // aapt resource value: 0x7F0D0147
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131558727;
+ // aapt resource value: 0x7f09013d
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131296573;
- // aapt resource value: 0x7F0D0148
- public const int Widget_AppCompat_Light_ActionButton = 2131558728;
+ // aapt resource value: 0x7f09013e
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131296574;
- // aapt resource value: 0x7F0D0149
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131558729;
+ // aapt resource value: 0x7f09013f
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131296575;
- // aapt resource value: 0x7F0D014A
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131558730;
+ // aapt resource value: 0x7f090140
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131296576;
- // aapt resource value: 0x7F0D014B
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131558731;
+ // aapt resource value: 0x7f090141
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131296577;
- // aapt resource value: 0x7F0D014C
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131558732;
+ // aapt resource value: 0x7f090142
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131296578;
- // aapt resource value: 0x7F0D014D
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131558733;
+ // aapt resource value: 0x7f090143
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131296579;
- // aapt resource value: 0x7F0D014E
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131558734;
+ // aapt resource value: 0x7f090144
+ public const int Widget_AppCompat_Light_PopupMenu = 2131296580;
- // aapt resource value: 0x7F0D014F
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131558735;
+ // aapt resource value: 0x7f090145
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131296581;
- // aapt resource value: 0x7F0D0150
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131558736;
+ // aapt resource value: 0x7f090146
+ public const int Widget_AppCompat_Light_SearchView = 2131296582;
- // aapt resource value: 0x7F0D0151
- public const int Widget_AppCompat_Light_PopupMenu = 2131558737;
+ // aapt resource value: 0x7f090147
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131296583;
- // aapt resource value: 0x7F0D0152
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131558738;
+ // aapt resource value: 0x7f090148
+ public const int Widget_AppCompat_ListMenuView = 2131296584;
- // aapt resource value: 0x7F0D0153
- public const int Widget_AppCompat_Light_SearchView = 2131558739;
+ // aapt resource value: 0x7f090149
+ public const int Widget_AppCompat_ListPopupWindow = 2131296585;
- // aapt resource value: 0x7F0D0154
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131558740;
+ // aapt resource value: 0x7f09014a
+ public const int Widget_AppCompat_ListView = 2131296586;
- // aapt resource value: 0x7F0D0155
- public const int Widget_AppCompat_ListMenuView = 2131558741;
+ // aapt resource value: 0x7f09014b
+ public const int Widget_AppCompat_ListView_DropDown = 2131296587;
- // aapt resource value: 0x7F0D0156
- public const int Widget_AppCompat_ListPopupWindow = 2131558742;
+ // aapt resource value: 0x7f09014c
+ public const int Widget_AppCompat_ListView_Menu = 2131296588;
- // aapt resource value: 0x7F0D0157
- public const int Widget_AppCompat_ListView = 2131558743;
+ // aapt resource value: 0x7f09014d
+ public const int Widget_AppCompat_PopupMenu = 2131296589;
- // aapt resource value: 0x7F0D0158
- public const int Widget_AppCompat_ListView_DropDown = 2131558744;
+ // aapt resource value: 0x7f09014e
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131296590;
- // aapt resource value: 0x7F0D0159
- public const int Widget_AppCompat_ListView_Menu = 2131558745;
+ // aapt resource value: 0x7f09014f
+ public const int Widget_AppCompat_PopupWindow = 2131296591;
- // aapt resource value: 0x7F0D015A
- public const int Widget_AppCompat_PopupMenu = 2131558746;
+ // aapt resource value: 0x7f090150
+ public const int Widget_AppCompat_ProgressBar = 2131296592;
- // aapt resource value: 0x7F0D015B
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131558747;
+ // aapt resource value: 0x7f090151
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131296593;
- // aapt resource value: 0x7F0D015C
- public const int Widget_AppCompat_PopupWindow = 2131558748;
+ // aapt resource value: 0x7f090152
+ public const int Widget_AppCompat_RatingBar = 2131296594;
- // aapt resource value: 0x7F0D015D
- public const int Widget_AppCompat_ProgressBar = 2131558749;
+ // aapt resource value: 0x7f090153
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131296595;
- // aapt resource value: 0x7F0D015E
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131558750;
+ // aapt resource value: 0x7f090154
+ public const int Widget_AppCompat_RatingBar_Small = 2131296596;
- // aapt resource value: 0x7F0D015F
- public const int Widget_AppCompat_RatingBar = 2131558751;
+ // aapt resource value: 0x7f090155
+ public const int Widget_AppCompat_SearchView = 2131296597;
- // aapt resource value: 0x7F0D0160
- public const int Widget_AppCompat_RatingBar_Indicator = 2131558752;
+ // aapt resource value: 0x7f090156
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131296598;
- // aapt resource value: 0x7F0D0161
- public const int Widget_AppCompat_RatingBar_Small = 2131558753;
+ // aapt resource value: 0x7f090157
+ public const int Widget_AppCompat_SeekBar = 2131296599;
- // aapt resource value: 0x7F0D0162
- public const int Widget_AppCompat_SearchView = 2131558754;
+ // aapt resource value: 0x7f090158
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131296600;
- // aapt resource value: 0x7F0D0163
- public const int Widget_AppCompat_SearchView_ActionBar = 2131558755;
+ // aapt resource value: 0x7f090159
+ public const int Widget_AppCompat_Spinner = 2131296601;
- // aapt resource value: 0x7F0D0164
- public const int Widget_AppCompat_SeekBar = 2131558756;
+ // aapt resource value: 0x7f09015a
+ public const int Widget_AppCompat_Spinner_DropDown = 2131296602;
- // aapt resource value: 0x7F0D0165
- public const int Widget_AppCompat_SeekBar_Discrete = 2131558757;
+ // aapt resource value: 0x7f09015b
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131296603;
- // aapt resource value: 0x7F0D0166
- public const int Widget_AppCompat_Spinner = 2131558758;
+ // aapt resource value: 0x7f09015c
+ public const int Widget_AppCompat_Spinner_Underlined = 2131296604;
- // aapt resource value: 0x7F0D0167
- public const int Widget_AppCompat_Spinner_DropDown = 2131558759;
+ // aapt resource value: 0x7f09015d
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131296605;
- // aapt resource value: 0x7F0D0168
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131558760;
+ // aapt resource value: 0x7f09015e
+ public const int Widget_AppCompat_Toolbar = 2131296606;
- // aapt resource value: 0x7F0D0169
- public const int Widget_AppCompat_Spinner_Underlined = 2131558761;
+ // aapt resource value: 0x7f09015f
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131296607;
- // aapt resource value: 0x7F0D016A
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131558762;
+ // aapt resource value: 0x7f090169
+ public const int Widget_Compat_NotificationActionContainer = 2131296617;
- // aapt resource value: 0x7F0D016B
- public const int Widget_AppCompat_Toolbar = 2131558763;
+ // aapt resource value: 0x7f09016a
+ public const int Widget_Compat_NotificationActionText = 2131296618;
- // aapt resource value: 0x7F0D016C
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131558764;
+ // aapt resource value: 0x7f09016e
+ public const int custom_dialog2 = 2131296622;
- // aapt resource value: 0x7F0D016D
- public const int Widget_Compat_NotificationActionContainer = 2131558765;
+ // aapt resource value: 0x7f09016f
+ public const int picker_view_scale_anim = 2131296623;
- // aapt resource value: 0x7F0D016E
- public const int Widget_Compat_NotificationActionText = 2131558766;
+ // aapt resource value: 0x7f090170
+ public const int picker_view_slide_anim = 2131296624;
static Style()
{
@@ -4295,193 +4295,204 @@
}
}
+ public partial class Xml
+ {
+
+ // aapt resource value: 0x7f060000
+ public const int file_paths = 2131099648;
+
+ // aapt resource value: 0x7f060001
+ public const int hdl_filepaths = 2131099649;
+
+ static Xml()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Xml()
+ {
+ }
+ }
+
public partial class Styleable
{
- // aapt resource value: { 0x7F030042,0x7F030043,0x7F030044,0x7F030068,0x7F030069,0x7F03006A,0x7F03006B,0x7F03006C,0x7F03006D,0x7F030074,0x7F030078,0x7F030079,0x7F030084,0x7F030093,0x7F030094,0x7F030095,0x7F030096,0x7F030097,0x7F03009C,0x7F03009F,0x7F0300AC,0x7F0300B3,0x7F0300BE,0x7F0300C1,0x7F0300C2,0x7F0300DE,0x7F0300E1,0x7F0300FC,0x7F030105 }
public static int[] ActionBar = new int[] {
- 2130903106,
- 2130903107,
- 2130903108,
- 2130903144,
- 2130903145,
- 2130903146,
- 2130903147,
- 2130903148,
- 2130903149,
- 2130903156,
- 2130903160,
- 2130903161,
- 2130903172,
- 2130903187,
- 2130903188,
- 2130903189,
- 2130903190,
- 2130903191,
- 2130903196,
- 2130903199,
- 2130903212,
- 2130903219,
- 2130903230,
- 2130903233,
- 2130903234,
- 2130903262,
- 2130903265,
- 2130903292,
- 2130903301};
+ 2130771969,
+ 2130771971,
+ 2130771972,
+ 2130771973,
+ 2130771974,
+ 2130771975,
+ 2130771976,
+ 2130771977,
+ 2130771978,
+ 2130771979,
+ 2130771980,
+ 2130771981,
+ 2130771982,
+ 2130771983,
+ 2130771984,
+ 2130771985,
+ 2130771986,
+ 2130771987,
+ 2130771988,
+ 2130771989,
+ 2130771990,
+ 2130771991,
+ 2130771992,
+ 2130771993,
+ 2130771994,
+ 2130771995,
+ 2130771996,
+ 2130771997,
+ 2130772067};
- // 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,0x7F030093,0x7F0300E1,0x7F030105 }
public static int[] ActionMode = new int[] {
- 2130903106,
- 2130903107,
- 2130903128,
- 2130903187,
- 2130903265,
- 2130903301};
-
- // 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;
+ 2130771969,
+ 2130771975,
+ 2130771976,
+ 2130771980,
+ 2130771982,
+ 2130771998};
// 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,0x7F03009D }
- public static int[] ActivityChooserView = new int[] {
- 2130903173,
- 2130903197};
+ 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,0x7F0300A3,0x7F0300A4,0x7F0300B0,0x7F0300D4,0x7F0300D5 }
+ public static int[] ActivityChooserView = new int[] {
+ 2130771999,
+ 2130772000};
+
+ // 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,
- 2130903203,
- 2130903204,
- 2130903216,
- 2130903252,
- 2130903253};
+ 2130772001,
+ 2130772002,
+ 2130772003,
+ 2130772004,
+ 2130772005,
+ 2130772006};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -4489,27 +4500,26 @@
// 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,0x7F0300DA,0x7F0300FA,0x7F0300FB }
+ // aapt resource value: 4
+ public const int AlertDialog_singleChoiceItemLayout = 4;
+
public static int[] AppCompatImageView = new int[] {
16843033,
- 2130903258,
- 2130903290,
- 2130903291};
+ 2130772007,
+ 2130772008,
+ 2130772009};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -4523,12 +4533,11 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
- // aapt resource value: { 0x1010142,0x7F0300F7,0x7F0300F8,0x7F0300F9 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130903287,
- 2130903288,
- 2130903289};
+ 2130772010,
+ 2130772011,
+ 2130772012};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -4542,7 +4551,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,
@@ -4573,267 +4581,265 @@
// aapt resource value: 0
public const int AppCompatTextHelper_android_textAppearance = 0;
- // aapt resource value: { 0x1010034,0x7F03003D,0x7F03003E,0x7F03003F,0x7F030040,0x7F030041,0x7F030087,0x7F0300E7 }
public static int[] AppCompatTextView = new int[] {
16842804,
- 2130903101,
- 2130903102,
- 2130903103,
- 2130903104,
- 2130903105,
- 2130903175,
- 2130903271};
+ 2130772013,
+ 2130772014,
+ 2130772015,
+ 2130772016,
+ 2130772017,
+ 2130772018,
+ 2130772019};
// 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,0x7F030095,0x7F03009B,0x7F0300A1,0x7F0300A2,0x7F0300A5,0x7F0300A6,0x7F0300A7,0x7F0300A8,0x7F0300A9,0x7F0300AA,0x7F0300AB,0x7F0300BA,0x7F0300BB,0x7F0300BC,0x7F0300BD,0x7F0300BF,0x7F0300C5,0x7F0300C6,0x7F0300C7,0x7F0300C8,0x7F0300CB,0x7F0300CE,0x7F0300CF,0x7F0300D0,0x7F0300D7,0x7F0300D8,0x7F0300E5,0x7F0300E8,0x7F0300E9,0x7F0300EA,0x7F0300EB,0x7F0300EC,0x7F0300ED,0x7F0300EE,0x7F0300EF,0x7F0300F0,0x7F0300F1,0x7F030106,0x7F030107,0x7F030108,0x7F030109,0x7F03011A,0x7F03011B,0x7F03011C,0x7F03011D,0x7F03011E,0x7F03011F,0x7F030120,0x7F030121,0x7F030122,0x7F030123 }
+ // 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,
- 2130903189,
- 2130903195,
- 2130903201,
- 2130903202,
- 2130903205,
- 2130903206,
- 2130903207,
- 2130903208,
- 2130903209,
- 2130903210,
- 2130903211,
- 2130903226,
- 2130903227,
- 2130903228,
- 2130903229,
- 2130903231,
- 2130903237,
- 2130903238,
- 2130903239,
- 2130903240,
- 2130903243,
- 2130903246,
- 2130903247,
- 2130903248,
- 2130903255,
- 2130903256,
- 2130903269,
- 2130903272,
- 2130903273,
- 2130903274,
- 2130903275,
- 2130903276,
- 2130903277,
- 2130903278,
- 2130903279,
- 2130903280,
- 2130903281,
- 2130903302,
- 2130903303,
- 2130903304,
- 2130903305,
- 2130903322,
- 2130903323,
- 2130903324,
- 2130903325,
- 2130903326,
- 2130903327,
- 2130903328,
- 2130903329,
- 2130903330,
- 2130903331};
-
- // 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;
+ 2130772020,
+ 2130772021,
+ 2130772022,
+ 2130772023,
+ 2130772024,
+ 2130772025,
+ 2130772026,
+ 2130772027,
+ 2130772028,
+ 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};
// 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;
@@ -4841,264 +4847,262 @@
// 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: { 0x7F030026 }
+ // 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[] ButtonBarLayout = new int[] {
- 2130903078};
+ 2130772137};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
- // aapt resource value: { 0x10101A5,0x101031F,0x7F030027 }
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130903079};
+ 2130772138};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -5109,11 +5113,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};
+ 2130772139,
+ 2130772140};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -5124,223 +5127,216 @@
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
- // aapt resource value: { 0x7F03003A,0x7F03003B,0x7F030047,0x7F03005B,0x7F03007D,0x7F030090,0x7F0300D6,0x7F0300F3 }
public static int[] DrawerArrowToggle = new int[] {
- 2130903098,
- 2130903099,
- 2130903111,
- 2130903131,
- 2130903165,
- 2130903184,
- 2130903254,
- 2130903283};
-
- // aapt resource value: 0
- public const int DrawerArrowToggle_arrowHeadLength = 0;
-
- // aapt resource value: 1
- public const int DrawerArrowToggle_arrowShaftLength = 1;
-
- // aapt resource value: 2
- public const int DrawerArrowToggle_barLength = 2;
-
- // aapt resource value: 3
- public const int DrawerArrowToggle_color = 3;
+ 2130772141,
+ 2130772142,
+ 2130772143,
+ 2130772144,
+ 2130772145,
+ 2130772146,
+ 2130772147,
+ 2130772148};
// aapt resource value: 4
- public const int DrawerArrowToggle_drawableSize = 4;
+ public const int DrawerArrowToggle_arrowHeadLength = 4;
// aapt resource value: 5
- public const int DrawerArrowToggle_gapBetweenBars = 5;
+ public const int DrawerArrowToggle_arrowShaftLength = 5;
// aapt resource value: 6
- public const int DrawerArrowToggle_spinBars = 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: { 0x7F030088,0x7F030089,0x7F03008A,0x7F03008B,0x7F03008C,0x7F03008D }
public static int[] FontFamily = new int[] {
- 2130903176,
- 2130903177,
- 2130903178,
- 2130903179,
- 2130903180,
- 2130903181};
-
- // aapt resource value: { 0x7F030086,0x7F03008E,0x7F03008F }
- public static int[] FontFamilyFont = new int[] {
- 2130903174,
- 2130903182,
- 2130903183};
-
- // aapt resource value: 0
- public const int FontFamilyFont_font = 0;
-
- // aapt resource value: 1
- public const int FontFamilyFont_fontStyle = 1;
-
- // aapt resource value: 2
- public const int FontFamilyFont_fontWeight = 2;
+ 2130772214,
+ 2130772215,
+ 2130772216,
+ 2130772217,
+ 2130772218,
+ 2130772219};
// 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,0x7F030092 }
- public static int[] HDLArcSeekBar = new int[] {
- 2130903081,
- 2130903082,
- 2130903083,
- 2130903084,
- 2130903085,
- 2130903086,
- 2130903087,
- 2130903088,
- 2130903089,
- 2130903090,
- 2130903091,
- 2130903092,
- 2130903093,
- 2130903094,
- 2130903095,
- 2130903096,
- 2130903097,
- 2130903186};
+ // 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[] {
+ 2130772220,
+ 2130772221,
+ 2130772222};
+
+ // 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;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_min = 4;
+ public static int[] HDLArcSeekBar = new int[] {
+ 2130772224,
+ 2130772225,
+ 2130772226,
+ 2130772227,
+ 2130772228,
+ 2130772229,
+ 2130772230,
+ 2130772231,
+ 2130772232,
+ 2130772233,
+ 2130772234,
+ 2130772235,
+ 2130772236,
+ 2130772237,
+ 2130772238,
+ 2130772239,
+ 2130772240,
+ 2130772241};
// 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,0x7F0300CC }
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130903151,
- 2130903152,
- 2130903153,
- 2130903154,
- 2130903155,
- 2130903244};
+ // 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[] {
+ 2130772242,
+ 2130772243,
+ 2130772244,
+ 2130772245,
+ 2130772246,
+ 2130772247};
// 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: { 0x7F0300CD,0x7F03010F,0x7F030110,0x7F030111,0x7F030112,0x7F030113 }
public static int[] HDLWaveSeekBar = new int[] {
- 2130903245,
- 2130903311,
- 2130903312,
- 2130903313,
- 2130903314,
- 2130903315};
-
- // aapt resource value: 0
- public const int HDLWaveSeekBar_second_wave_color = 0;
+ 2130772248,
+ 2130772249,
+ 2130772250,
+ 2130772251,
+ 2130772252,
+ 2130772253};
// 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,0x7F0300AF,0x7F0300D2 }
+ // aapt resource value: 4
+ public const int HDLWaveSeekBar_wave_width = 4;
+
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130903161,
- 2130903163,
- 2130903215,
- 2130903250};
+ 2130771979,
+ 2130772149,
+ 2130772150,
+ 2130772151};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -5360,10 +5356,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,
@@ -5382,13 +5383,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};
@@ -5399,7 +5393,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,
@@ -5426,7 +5419,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,0x7F030098,0x7F030099,0x7F0300B4,0x7F0300D1,0x7F03010A }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -5441,28 +5433,28 @@
16843236,
16843237,
16843375,
- 2130903053,
- 2130903071,
- 2130903072,
- 2130903080,
- 2130903143,
- 2130903192,
- 2130903193,
- 2130903220,
- 2130903249,
- 2130903306};
-
- // 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;
+ 2130772152,
+ 2130772153,
+ 2130772154,
+ 2130772155,
+ 2130772156,
+ 2130772157,
+ 2130772158,
+ 2130772159,
+ 2130772160,
+ 2130772161};
// 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;
@@ -5503,25 +5495,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,0x7F0300C0,0x7F0300DC }
+ // 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,
@@ -5530,8 +5521,8 @@
16843055,
16843056,
16843057,
- 2130903232,
- 2130903260};
+ 2130772162,
+ 2130772163};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -5560,45 +5551,10 @@
// aapt resource value: 8
public const int MenuView_subMenuArrow = 8;
- // aapt resource value: { 0x7F030114,0x7F030115,0x7F030116,0x7F030117,0x7F030118,0x7F030119 }
- public static int[] pickerview = new int[] {
- 2130903316,
- 2130903317,
- 2130903318,
- 2130903319,
- 2130903320,
- 2130903321};
-
- // aapt resource value: 0
- public const int pickerview_wheelview_dividerColor = 0;
-
- // aapt resource value: 1
- public const int pickerview_wheelview_gravity = 1;
-
- // aapt resource value: 2
- public const int pickerview_wheelview_lineSpacingMultiplier = 2;
-
- // aapt resource value: 3
- public const int pickerview_wheelview_textColorCenter = 3;
-
- // aapt resource value: 4
- public const int pickerview_wheelview_textColorOut = 4;
-
- // aapt resource value: 5
- public const int pickerview_wheelview_textSize = 5;
-
- // aapt resource value: { 0x1010176,0x10102C9,0x7F0300B5 }
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130903221};
-
- // aapt resource value: { 0x7F0300DB }
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130903259};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
+ 2130772164};
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -5609,10 +5565,15 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- // aapt resource value: { 0x7F0300B6,0x7F0300B9 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130772165};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
+
public static int[] RecycleListView = new int[] {
- 2130903222,
- 2130903225};
+ 2130772166,
+ 2130772167};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -5620,25 +5581,24 @@
// aapt resource value: 1
public const int RecycleListView_paddingTopNoTitle = 1;
- // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F030057,0x7F030066,0x7F030075,0x7F030091,0x7F03009A,0x7F0300A0,0x7F0300C3,0x7F0300C4,0x7F0300C9,0x7F0300CA,0x7F0300DD,0x7F0300E2,0x7F03010E }
public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
16843364,
- 2130903127,
- 2130903142,
- 2130903157,
- 2130903185,
- 2130903194,
- 2130903200,
- 2130903235,
- 2130903236,
- 2130903241,
- 2130903242,
- 2130903261,
- 2130903266,
- 2130903310};
+ 2130772168,
+ 2130772169,
+ 2130772170,
+ 2130772171,
+ 2130772172,
+ 2130772173,
+ 2130772174,
+ 2130772175,
+ 2130772176,
+ 2130772177,
+ 2130772178,
+ 2130772179,
+ 2130772180};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -5652,52 +5612,51 @@
// 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: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0300BE }
+ // aapt resource value: 14
+ public const int SearchView_suggestionRowLayout = 14;
+
+ // aapt resource value: 12
+ public const int SearchView_voiceIcon = 12;
+
public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
16843362,
- 2130903230};
+ 2130771997};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -5714,22 +5673,21 @@
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
- // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F0300D3,0x7F0300D9,0x7F0300E3,0x7F0300E4,0x7F0300E6,0x7F0300F4,0x7F0300F5,0x7F0300F6,0x7F03010B,0x7F03010C,0x7F03010D }
public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
- 2130903251,
- 2130903257,
- 2130903267,
- 2130903268,
- 2130903270,
- 2130903284,
- 2130903285,
- 2130903286,
- 2130903307,
- 2130903308,
- 2130903309};
+ 2130772181,
+ 2130772182,
+ 2130772183,
+ 2130772184,
+ 2130772185,
+ 2130772186,
+ 2130772187,
+ 2130772188,
+ 2130772189,
+ 2130772190,
+ 2130772191};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -5740,40 +5698,39 @@
// 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: 13
- public const int SwitchCompat_trackTintMode = 13;
+ // aapt resource value: 7
+ public const int SwitchCompat_trackTintMode = 7;
- // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F030087,0x7F0300E7 }
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -5786,8 +5743,8 @@
16843107,
16843108,
16843692,
- 2130903175,
- 2130903271};
+ 2130772013,
+ 2130772019};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -5822,43 +5779,42 @@
// aapt resource value: 1
public const int TextAppearance_android_typeface = 1;
- // aapt resource value: 11
- public const int TextAppearance_fontFamily = 11;
-
// aapt resource value: 12
- public const int TextAppearance_textAllCaps = 12;
+ public const int TextAppearance_fontFamily = 12;
- // aapt resource value: { 0x10100AF,0x1010140,0x7F03004F,0x7F030059,0x7F03005A,0x7F030068,0x7F030069,0x7F03006A,0x7F03006B,0x7F03006C,0x7F03006D,0x7F0300AC,0x7F0300AD,0x7F0300AE,0x7F0300B1,0x7F0300B2,0x7F0300BE,0x7F0300DE,0x7F0300DF,0x7F0300E0,0x7F0300FC,0x7F0300FD,0x7F0300FE,0x7F0300FF,0x7F030100,0x7F030101,0x7F030102,0x7F030103,0x7F030104 }
+ // aapt resource value: 11
+ public const int TextAppearance_textAllCaps = 11;
+
public static int[] Toolbar = new int[] {
16842927,
16843072,
- 2130903119,
- 2130903129,
- 2130903130,
- 2130903144,
- 2130903145,
- 2130903146,
- 2130903147,
- 2130903148,
- 2130903149,
- 2130903212,
- 2130903213,
- 2130903214,
- 2130903217,
- 2130903218,
- 2130903230,
- 2130903262,
- 2130903263,
- 2130903264,
- 2130903292,
- 2130903293,
- 2130903294,
- 2130903295,
- 2130903296,
- 2130903297,
- 2130903298,
- 2130903299,
- 2130903300};
+ 2130771971,
+ 2130771974,
+ 2130771978,
+ 2130771990,
+ 2130771991,
+ 2130771992,
+ 2130771993,
+ 2130771994,
+ 2130771995,
+ 2130771997,
+ 2130772192,
+ 2130772193,
+ 2130772194,
+ 2130772195,
+ 2130772196,
+ 2130772197,
+ 2130772198,
+ 2130772199,
+ 2130772200,
+ 2130772201,
+ 2130772202,
+ 2130772203,
+ 2130772204,
+ 2130772205,
+ 2130772206,
+ 2130772207,
+ 2130772208};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -5866,20 +5822,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;
@@ -5887,79 +5843,92 @@
// 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;
+ public const int Toolbar_contentInsetStartWithNavigation = 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: 4
+ public const int Toolbar_logo = 4;
// aapt resource value: 26
- public const int Toolbar_titleMargins = 26;
+ public const int Toolbar_logoDescription = 26;
- // aapt resource value: 24
- public const int Toolbar_titleMarginStart = 24;
+ // aapt resource value: 20
+ public const int Toolbar_maxButtonHeight = 20;
// aapt resource value: 25
- public const int Toolbar_titleMarginTop = 25;
+ public const int Toolbar_navigationContentDescription = 25;
- // aapt resource value: 27
- public const int Toolbar_titleTextAppearance = 27;
+ // 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_titleTextColor = 28;
+ public const int Toolbar_subtitleTextColor = 28;
- // aapt resource value: { 0x1010000,0x10100DA,0x7F0300B7,0x7F0300B8,0x7F0300F2 }
+ // 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[] View = new int[] {
16842752,
16842970,
- 2130903223,
- 2130903224,
- 2130903282};
+ 2130772209,
+ 2130772210,
+ 2130772211};
- // 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};
+ 2130772212,
+ 2130772213};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -5970,7 +5939,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,
@@ -5985,20 +5953,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[] {
+ 2130772254,
+ 2130772255,
+ 2130772256,
+ 2130772257,
+ 2130772258,
+ 2130772259};
// 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()
{
@@ -6006,25 +5985,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/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
index f03d643..c8a6407 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Language.ini
+++ b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
@@ -206,7 +206,19 @@
200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
202=涓�妤�
-203=缃戝叧鍥炲瓒呮椂
+203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
+204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
+206=鍐荤粨澶辫触
+207=瑙ｅ喕澶辫触
+208=鍏变韩
+209=寮�閿佹柟寮忎笉鍖归厤锛岃褰曞叆褰撳墠鐣岄潰鐨勫紑閿佹柟寮忋��
+210=纭畾鎺堟潈璇ユ垚鍛樻嫢鏈夎繙绋嬪紑閿佹潈闄�
+211=鎺堟潈鎴愬姛
+212=鎺堟潈澶辫触
+213=璇ユ垚鍛樿鍐荤粨锛屼笉鑳芥坊鍔犲紑閿佹柟寮�
+214=鏈巿鏉�
+
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -589,6 +601,7 @@
10000=HDL Home
+10001=甯哥敤
10100=鎵嬫満鍙�
10101=閭
@@ -798,7 +811,7 @@
15080=鎸夐敭闈㈡澘
15081=浼犳劅鍣�
15083=鐕冩皵浼犳劅鍣�
-15084=瀹夐槻鍔熻兘
+15084=鏈垎閰�
15085=璁惧绫诲瀷
15086=璁惧淇℃伅
15087=璁惧鍚嶇О
@@ -1186,14 +1199,14 @@
15518=鐢垫睜鐢甸噺浣�
15519=璁惧琚媶闄�
15520=缃戝叧绫诲瀷
-15521=璁惧纭欢鐗堟湰
+15521=纭欢鐗堟湰
15522=缃戝叧鍥轰欢鐗堟湰
15523=缃戝叧纭欢鐗堟湰
15524=鍗忚皟鍣ㄥ浐浠剁増鏈�
15525=鍗忚皟鍣ㄧ‖浠剁増鏈�
15526=璁惧鍥轰欢鐗堟湰
15527=璁惧闀滃儚ID
-15528=缃戝叧闀滃儚ID
+15528=闀滃儚ID
15529=铏氭嫙椹卞姩闀滃儚ID
15530=铏氭嫙椹卞姩鍥轰欢鐗堟湰
15531=铏氭嫙椹卞姩纭欢鐗堟湰
@@ -1268,9 +1281,7 @@
15611=鍘昏缃�
15612=璇风‘淇濇墜鏈哄凡缁忛摼鎺IFI
15614=璇烽�夋嫨缃戠粶
-15615=鍚� 绉�
-15616=瀵� 鐮�
-15617=璇疯緭鍏ョ綉缁滃瘑鐮�
+15617=璇疯緭鍏ifi瀵嗙爜
15618=瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
15619=璇风偣鎸夋棤绾跨綉鍏充笂鐨勬寜閿�
15620=浣跨綉鍏宠繘鍏ラ厤缃戠姸鎬�
@@ -1551,6 +1562,16 @@
15895=璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
15896=璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
15897=鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+15898=鑾峰彇绌鸿皟妯″紡澶辫触
+15899=璁剧疆绌鸿皟妯″紡澶辫触
+15900=缁х画娣诲姞缃戝叧
+15901=杩斿洖涓婚〉
+15902=娣诲姞鏅鸿兘缃戝叧鎴愬姛
+15903=UDP妯″紡(鎺ㄨ崘)
+15904=AP妯″紡
+15905=璺宠浆鍒扮Щ鍔ㄨ澶�
+15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
+
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/AddGatewaySuccess.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/AddGatewaySuccess.png
new file mode 100755
index 0000000..1aa7a5c
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/AddGatewaySuccess.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1.png
index a35b196..f11d3c7 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1.png
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1Selected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1Selected.png
deleted file mode 100755
index 06ff779..0000000
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon1Selected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6.png
index a312288..8100032 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6.png
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6Selected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6Selected.png
deleted file mode 100755
index e5ba8ce..0000000
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/GatewayIcon6Selected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/SearchGateway.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/SearchGateway.png
deleted file mode 100755
index 6dedbe5..0000000
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/SearchGateway.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WiredGatewaySelected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WiredGatewaySelected.png
deleted file mode 100755
index 06ff779..0000000
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WiredGatewaySelected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySearching.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySearching.png
new file mode 100755
index 0000000..ac95145
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySearching.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySelected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySelected.png
deleted file mode 100755
index f8b3f62..0000000
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/Gateway/WirelessGatewaySelected.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFF.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFF.png
new file mode 100755
index 0000000..7ee2648
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFF.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFFSelected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFFSelected.png
new file mode 100755
index 0000000..8614965
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OFFSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ON.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ON.png
new file mode 100755
index 0000000..12f5830
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ON.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ONSelected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ONSelected.png
new file mode 100755
index 0000000..a724963
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/ONSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OnOff.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OnOff.png
new file mode 100755
index 0000000..378f162
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/OnOff.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/Plug.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/Plug.png
new file mode 100755
index 0000000..4a8ec82
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/Plug.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/PlugSelected.png b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/PlugSelected.png
new file mode 100755
index 0000000..9b7f865
--- /dev/null
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/Light/PlugSelected.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 354c51a..3151e47 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -57,7 +57,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.19103101";
+ public static string CodeIDString = "1.0.19110701";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 5e8b4ad..3ef2309 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1796,7 +1796,7 @@
string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceListFail);
msg += "\r\n[" + HdlGatewayLogic.Current.GetGatewayName(zbGateway).ToString() + "]";
msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂", false);
- this.ShowErrorMsg(msg);
+ this.ShowTipMsg(msg);
}
return null;
}
diff --git a/ZigbeeApp/Shared/Common/DeviceUI.cs b/ZigbeeApp/Shared/Common/DeviceUI.cs
index 4e36b30..fa24c33 100755
--- a/ZigbeeApp/Shared/Common/DeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/DeviceUI.cs
@@ -368,73 +368,72 @@
}
else if (CommonDevice.Type == DeviceType.WindowCoveringDevice)
{
- if ((CommonDevice as ZigBee.Device.Rollershade).WcdCurrentPositionLiftPercentage == 0)
+ if ((CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage == 0)
{
return Language.StringByID(R.MyInternationalizationString.Shut);
}
- return $"{(CommonDevice as ZigBee.Device.Rollershade).WcdCurrentPositionLiftPercentage}%";
+ return $"{(CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage}%";
}
- //else if (CommonDevice.Type == DeviceType.Thermostat)
- //{
- ////娓╁害锛屾ā寮忥紝椋庨��
- //string tempareture = string.Empty;
- //string model = string.Empty;
- //string wind = string.Empty;
- //if (TaskList.Count == 0)
- //{
- // return null;
- //}
- //foreach (var taskListInfo in TaskList)
- //{
- // if (taskListInfo.Data1 == 3)
- // {
- // if (taskListInfo.Data2 == 0)
- // {
- // return Language.StringByID(R.MyInternationalizationString.Shut);
- // }
- // else if (taskListInfo.Data2 == 1)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Auto);
- // }
- // else if (taskListInfo.Data2 == 3)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Cool);
- // }
- // else if (taskListInfo.Data2 == 4)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Heat);
- // }
- // else if (taskListInfo.Data2 == 7)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_FanOnly);
- // }
- // else if (taskListInfo.Data2 == 8)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Dry);
- // }
- // }
- // else if (taskListInfo.Data1 == 4 || taskListInfo.Data1 == 5)
- // {
- // tempareture = $"{ taskListInfo.Data2} 鈩�";
- // }
- // else if (taskListInfo.Data1 == 6)
- // {
- // if (taskListInfo.Data2 == 1)
- // {
- // wind = Language.StringByID(R.MyInternationalizationString.Fan_Low);
- // }
- // else if (taskListInfo.Data2 == 2)
- // {
- // wind = Language.StringByID(R.MyInternationalizationString.Fan_Middle);
- // }
- // else if (taskListInfo.Data2 == 3)
- // {
- // wind = Language.StringByID(R.MyInternationalizationString.Fan_Height);
- // }
- // }
- //}
- //return $"{tempareture},{model},{wind}";
- //}
+ else if (CommonDevice.Type == DeviceType.Thermostat)
+ {
+ //娓╁害锛屾ā寮忥紝椋庨��
+ string tempareture = string.Empty;
+ string model = string.Empty;
+ string wind = string.Empty;
+
+ var ac = CommonDevice as AC;
+
+ if (ac.currentSystemMode == 0)
+ {
+ return Language.StringByID(R.MyInternationalizationString.Shut);
+ }
+ else if (ac.currentSystemMode == 1)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Auto);
+ tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ }
+ else if (ac.currentSystemMode == 3)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Cool);
+ tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ }
+ else if (ac.currentSystemMode == 4)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Heat);
+ tempareture = $"{ac.currentHeatingSetpoint} 鈩�";
+ }
+ else if (ac.currentSystemMode == 7)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_FanOnly);
+ }
+ else if (ac.currentSystemMode == 8)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Dry);
+ tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ }
+
+ if (ac.currentFanMode == 1)
+ {
+ wind = Language.StringByID(R.MyInternationalizationString.Fan_Low);
+ }
+ else if (ac.currentFanMode == 2)
+ {
+ wind = Language.StringByID(R.MyInternationalizationString.Fan_Middle);
+ }
+ else
+ {
+ wind = Language.StringByID(R.MyInternationalizationString.Fan_Height);
+ }
+
+ if (string.IsNullOrEmpty(tempareture))
+ {
+ return $"{model},{wind}";
+ }
+ else
+ {
+ return $"{model},{wind},{tempareture}";
+ }
+ }
else
{
return null;
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index fd52a18..8279080 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -76,10 +76,26 @@
/// </summary>
public string HumidityDevice = string.Empty;
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬埧闂�
+ /// </summary>
+ private static Room m_CurrentRoom = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勬埧闂�
/// </summary>
- public static Room CurrentRoom;
+ [Newtonsoft.Json.JsonIgnore]
+ public static Room CurrentRoom
+ {
+ get
+ {
+ if (m_CurrentRoom == null && Lists.Count > 0)
+ {
+ return Lists[0];
+ }
+ return m_CurrentRoom;
+ }
+ set { m_CurrentRoom = value; }
+ }
/// <summary>
/// 鎴块棿閲屾墍鏈夌殑璁惧鍒楄〃
@@ -266,10 +282,10 @@
/// </summary>
public static void InitAllRoom()
{
- if (CanInitAllRoom == false)
- {
- return;
- }
+ //if (CanInitAllRoom == false)
+ //{
+ // return;
+ //}
Lists.Clear();
if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
{
@@ -622,6 +638,10 @@
/// <returns></returns>
public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
{
+ if(Config.Instance.Home.FloorDics.Count==0)
+ {
+ return Lists;
+ }
var r = Lists.FindAll((obj) => obj.FloorId == Config.Instance.Home.CurrentFloorId);
r.Insert(0, GetLoveRoom());
return r;
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 2c7eb8b..7150dfc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -714,6 +714,15 @@
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
}
+ /// <summary>
+ /// HidenFloor
+ /// </summary>
+ /// <param name="statu"></param>
+ private void HidenFloor(bool statu)
+ {
+ selectFloorBtn.Visible = !statu;
+ floorBtn.Visible = !statu;
+ }
#endregion
@@ -726,14 +735,17 @@
functionSceneAutoBodyView.RemoveAll();
if (functionBtn.IsSelected)
{
+ HidenFloor(false);
ShowFunction();
}
else if (sceneBtn.IsSelected)
{
+ HidenFloor(false);
ShowScene();
}
else if (automationBtn.IsSelected)
{
+ HidenFloor(true);
ShowAutotion();
}
}
@@ -945,13 +957,32 @@
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
- var lightControl = new Phone.Device.Light.LightControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- //lightControl.action = RefreshBodyView;
- lightControl.Show(deviceUI, room);
+ if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ var lightControl = new Phone.Device.Light.OnOffControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
+ }
+ else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ var lightControl = new Phone.Device.Light.PlugControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
+ }
+ else
+ {
+ var lightControl = new Phone.Device.Light.LightControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
+ }
};
-
+
var editBtn = new CommonForm.RowLayoutEditButton()
{
Tag = deviceUI,
@@ -1284,6 +1315,7 @@
UserHomeView.ReadStatus(rollerShade, () =>
{
rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ rollerShade.ReadWcdCurrentPositionLiftPercentage();
});
}
else
@@ -1292,6 +1324,7 @@
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ rollerShade.ReadWcdCurrentPositionLiftPercentage();
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index 681e7eb..249b723 100755
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -386,7 +386,7 @@
itemView.AddChidren(OpenOrUpBtn);
OpenOrUpBtn.MouseUpEventHandler += (sender, e) =>
{
- (device.CommonDevice as ZigBee.Device.Rollershade).CurtainUpDownStopControl(0);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
};
StopBtn = new Button
@@ -401,7 +401,7 @@
itemView.AddChidren(StopBtn);
StopBtn.MouseUpEventHandler += (sender, e) =>
{
- (device.CommonDevice as ZigBee.Device.Rollershade).CurtainUpDownStopControl(2);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(2);
};
CloseOrDownBtn = new Button
@@ -414,7 +414,7 @@
itemView.AddChidren(CloseOrDownBtn);
CloseOrDownBtn.MouseUpEventHandler += (sender, e) =>
{
- (device.CommonDevice as ZigBee.Device.Rollershade).CurtainUpDownStopControl(1);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
};
SetRollerShadeIcon((device.CommonDevice as Rollershade).WcdType);
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
index 5e8a5be..b23b5bc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
@@ -157,8 +157,8 @@
public override void RemoveFromParent()
{
ZbGateway.StatusList.Remove(this);
- action();
- action = null;
+ //action();
+ //action = null;
RemoveUpdateControlDeviceStatuAction();
base.RemoveFromParent();
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
index ae5cd7d..965a4d8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
@@ -145,7 +145,30 @@
}
else if (typeTag == "OnlineStatusChange")
{
-
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ var deviceUI = device;
+ //璁惧涓虹┖
+ if (deviceUI.CommonDevice == null)
+ {
+ return;
+ }
+ //鏄惁涓哄綋鍓嶈澶�
+ if (deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint || deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr)
+ {
+ return;
+ }
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ deviceIMG.IsSelected = switchBtn.IsSelected = deviceUI.CommonDevice.IsOnline == 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"Error:{ex.Message}");
+ }
+ });
}
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
index 2c82b6e..dae9d4c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
@@ -1,13 +1,639 @@
锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.Phone.Device.CommonForm;
+using Shared.Phone.UserView;
+using ZigBee.Device;
namespace Shared.Phone.Device.Light
{
/// <summary>
/// 寮�鍏�
/// </summary>
- public class OnOffControl
+ public class OnOffControl:FrameLayout, ZigBee.Common.IStatus
{
+ #region 鈼� 鍙橀噺__________________________
+ /// <summary>
+ /// 寮�鍏�
+ /// </summary>
+ private Button switchBtn;
+ /// <summary>
+ /// The action.
+ /// </summary>
+ public Action action;
+
+ /// <summary>
+ /// The light image.
+ /// </summary>
+ private Button deviceIMG;
+ /// <summary>
+ /// 鏀惰棌鎸夐挳
+ /// </summary>
+ private Button collectionBtn;
+ /// <summary>
+ /// 浼犺繃鏉ョ殑璁惧
+ /// </summary>
+ private DeviceUI device;
+ /// <summary>
+ /// 浼犺繃鏉ョ殑鎴块棿
+ /// </summary>
+ private Shared.Common.Room room;
+
+ /// <summary>
+ /// 鎴块棿
+ /// </summary>
+ private Button roomBtn;
+ /// <summary>
+ /// 鎴块棿鍚�
+ /// </summary>
+ private Button roomName;
+ /// <summary>
+ /// 缃戝叧
+ /// </summary>
+ private ZbGateway zbGateway = null;
+ /// <summary>
+ /// 鏄惁鍙戦�佹帶鍒跺懡浠ゆ垚鍔熶簡
+ /// </summary>
+ private bool sendedControlCommand = false;
+
+ /// <summary>
+ /// bodyFrameLayout
+ /// </summary>
+ private FrameLayout bodyFrameLayout;
+
+ private Button StatuBtn;
+ /// <summary>
+ /// OnBtn
+ /// </summary>
+ private Button OnBtn;
+ /// <summary>
+ /// OffBtn
+ /// </summary>
+ private Button OffBtn;
+
+ #endregion
+
+ #region 鈼� 鎺ュ彛__________________________
+ /// <summary>
+ /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
+ /// </summary>
+ /// <returns>The changed.</returns>
+ /// <param name="common">Common.</param>
+ public void Changed(CommonDevice common)
+ {
+
+ }
+ /// <summary>
+ /// Changeds the IL ogic status.
+ /// </summary>
+ /// <param name="logic">Logic.</param>
+ public void ChangedILogicStatus(ZigBee.Device.Logic logic)
+ {
+ //throw new NotImplementedException();
+ }
+ /// <summary>
+ /// Changeds the IS cene status.
+ /// </summary>
+ /// <param name="scene">Scene.</param>
+ public void ChangedISceneStatus(Scene scene)
+ {
+ //throw new NotImplementedException();
+ }
+ /// <summary>
+ /// 璁惧鐘舵�佹洿鏂版帴鍙�
+ /// <para>type锛氬鏋滀负 DeviceInComingRespon:璁惧鏂颁笂鎶�</para>
+ /// <para>type锛氬鏋滀负 IASInfoReport:RemoveDeviceRespon</para>
+ /// <para>type锛氬鏋滀负 DeviceStatusReport:璁惧涓婃姤</para>
+ /// <para>type锛氬鏋滀负 IASInfoReport:IAS瀹夐槻淇℃伅涓婃姤</para>
+ /// <para>type锛氬鏋滀负 OnlineStatusChange: 璁惧鍦ㄧ嚎鐘舵�佹洿鏂�</para>
+ /// </summary>
+ /// <param name="common">Common.</param>
+ /// <param name="typeTag">Type tag.</param>
+ public void DeviceInfoChange(CommonDevice common, string typeTag)
+ {
+ if (typeTag == "DeviceStatusReport")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ var deviceUI = device;
+ //璁惧涓虹┖
+ if (deviceUI.CommonDevice == null)
+ {
+ return;
+ }
+ //鏄惁涓哄綋鍓嶈澶�
+ if (deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint || deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr)
+ {
+ return;
+ }
+ if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
+ {
+ if (common.DeviceStatusReport.CluterID == 6)
+ {
+ var light = deviceUI.CommonDevice as ToggleLight;
+ light.DeviceStatusReport = common.DeviceStatusReport;
+ //璁板綍銆佹洿鏂扮姸鎬�
+ if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
+ {
+ return;
+ }
+ light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
+ SetONOFFStatu(light.OnOffStatus == 1);
+ StatuBtn.Text = CommonFormResouce.GetSwitchStatu(light.OnOffStatus == 1);
+ light.LastDateTime = DateTime.Now;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"Error:{ex.Message}");
+ }
+ });
+ }
+ else if (typeTag == "OnlineStatusChange")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ var deviceUI = device;
+ //璁惧涓虹┖
+ if (deviceUI.CommonDevice == null)
+ {
+ return;
+ }
+ //鏄惁涓哄綋鍓嶈澶�
+ if (deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint || deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr)
+ {
+ return;
+ }
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ OnBtn.IsSelected = OffBtn.IsSelected= deviceUI.CommonDevice.IsOnline == 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"Error:{ex.Message}");
+ }
+ });
+ }
+ }
+ #endregion
+
+ #region 鈼� 鍒濆鍖朹____________________
+ /// <summary>
+ /// 閲嶅啓绉婚櫎鏂规硶
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ ZbGateway.StatusList.Remove(this);
+ //action();
+ //action = null;
+ RemoveUpdateControlDeviceStatuAction();
+ base.RemoveFromParent();
+ }
+
+ /// <summary>
+ /// 鏋勯�犳柟娉�
+ /// </summary>
public OnOffControl()
{
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ ZbGateway.StatusList.Add(this);
}
+ /// <summary>
+ /// 鏄剧ず鐣岄潰
+ /// </summary>
+ /// <param name="dev">Device.</param>
+ /// <param name="room">Room.</param>
+ public void Show(DeviceUI dev, Shared.Common.Room room)
+ {
+ device = dev;
+ zbGateway = this.device.CommonDevice.Gateway;
+ this.room = room;
+
+ AddTop();
+
+ AddBodyView(device);
+
+
+ var light = dev.CommonDevice as ToggleLight;
+ //琛ヤ笂闈炶繙绋�
+ if (light.Gateway == null)
+ {
+ return;
+ }
+ if (light.Gateway.IsVirtual)
+ {
+ UserHomeView.ReadStatus(light, () =>
+ {
+ light.ReadOnOffStatus();
+ light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ });
+ }
+ else
+ {
+ //闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
+ if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
+ {
+ light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ light.ReadOnOffStatus();
+ }
+ }
+
+ var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
+ if (de == null)
+ {
+ collectionBtn.IsSelected = false;
+ }
+ else
+ {
+ collectionBtn.IsSelected = true;
+ }
+
+
+ BindEvent();
+
+ }
+
+ #endregion
+
+ #region 鈼� Add______________________________
+
+ /// <summary>
+ /// AddTop
+ /// </summary>
+ public void AddTop()
+ {
+ var top = new TopFrameLayout();
+ AddChidren(top);
+ top.InitTopview();
+ top.backButton.MouseUpEventHandler += (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+
+ var sharedBtn = new Button
+ {
+ X = Application.GetRealWidth(850),
+ Width = Application.GetMinReal(69),
+ Height = Application.GetMinReal(69),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Item/Shared.png"
+ };
+ top.topView.AddChidren(sharedBtn);
+
+ var moreBtn = new Button
+ {
+ X = Application.GetRealWidth(953),
+ Width = Application.GetMinReal(69),
+ Height = Application.GetMinReal(69),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Item/More.png"
+ };
+ top.topView.AddChidren(moreBtn);
+
+ moreBtn.MouseUpEventHandler += More;
+
+ }
+ /// <summary>
+ /// AddBodyView
+ /// </summary>
+ public void AddBodyView(DeviceUI device)
+ {
+ bodyFrameLayout = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(184),
+ Height = Application.GetRealHeight(1737),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
+ };
+ AddChidren(bodyFrameLayout);
+
+ var itemView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(115),
+ Width = Application.GetRealWidth(965),
+ Height = Application.GetRealHeight(1316),
+ Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ bodyFrameLayout.AddChidren(itemView);
+
+ collectionBtn = new Button()
+ {
+ X = Application.GetRealWidth(850),
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetMinReal(69),
+ Height = Application.GetMinReal(69),
+ UnSelectedImagePath = "Item/Collection.png",
+ SelectedImagePath = "Item/CollectionSelected.png"
+ };
+ itemView.AddChidren(collectionBtn);
+
+ var deviceNameBtn = new Button()
+ {
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetRealWidth(500),
+ Height = Application.GetRealHeight(60),
+ Gravity = Gravity.CenterHorizontal,
+ Text = device.CommonDevice.DeviceEpointName,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 15
+ };
+ itemView.AddChidren(deviceNameBtn);
+
+ StatuBtn = new Button
+ {
+ Y = Application.GetRealHeight(118),
+ Width = Application.GetRealWidth(600),
+ Height = Application.GetRealHeight(60),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ Text = CommonFormResouce.GetSwitchStatu(device.CommonDevice.IsOnline == 1)
+ };
+ itemView.AddChidren(StatuBtn);
+
+ deviceIMG = new Button()
+ {
+ Y = Application.GetRealHeight(340),
+ Width = Application.GetMinRealAverage(579),
+ Height = Application.GetMinRealAverage(579),
+ Gravity = Gravity.CenterHorizontal,
+ UnSelectedImagePath = "Light/OnOff.png",
+ };
+ itemView.AddChidren(deviceIMG);
+
+ OffBtn = new Button
+ {
+ X = Application.GetRealWidth(294),
+ Y = Application.GetRealHeight(588),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
+ UnSelectedImagePath = "Light/OFF.png",
+ SelectedImagePath = "Light/OFFSelected.png",
+ IsSelected = (device.CommonDevice as ToggleLight).OnOffStatus == 0
+ };
+ itemView.AddChidren(OffBtn);
+
+ OnBtn = new Button
+ {
+ X = Application.GetRealWidth(590),
+ Y = Application.GetRealHeight(588),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
+ UnSelectedImagePath = "Light/ON.png",
+ SelectedImagePath = "Light/ONSelected.png",
+ IsSelected = (device.CommonDevice as ToggleLight).OnOffStatus == 1
+ };
+ itemView.AddChidren(OnBtn);
+
+ var roomBG = new Button
+ {
+ Y = Application.GetRealHeight(1178 - 50),
+ Height = Application.GetRealHeight(138 + 50),
+ BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius)
+ };
+ itemView.AddChidren(roomBG);
+
+ var roomBG2 = new Button
+ {
+ Y = Application.GetRealHeight(1178 - 50),
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
+ };
+ itemView.AddChidren(roomBG2);
+
+ roomBtn = new Button()
+ {
+ X = Application.GetRealWidth(CommonFormResouce.X_Left),
+ Y = Application.GetRealHeight(1207),
+ Width = Application.GetMinReal(80),
+ Height = Application.GetMinReal(80),
+ UnSelectedImagePath = "Item/Room.png"
+ };
+ itemView.AddChidren(roomBtn);
+
+ roomName = new Button()
+ {
+ X = Application.GetRealWidth(150),
+ Y = Application.GetRealHeight(1224),
+ Width = Application.GetRealWidth(400),
+ Height = Application.GetRealHeight(50),
+ Text = room.Name,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ itemView.AddChidren(roomName);
+ }
+
+ #endregion
+
+ #region 鈼� 缁戝畾鎸夐挳_______________________
+ /// <summary>
+ /// 缁戝畾鎸夐挳鐨勪簨浠�
+ /// </summary>
+ private void BindEvent()
+ {
+ OnBtn.MouseUpEventHandler += ON;
+ OffBtn.MouseUpEventHandler += OFF;
+ collectionBtn.MouseUpEventHandler += Collection;
+ }
+
+ #endregion
+
+ #region 鈼� 寮�鍏砡_________________________
+
+ /// <summary>
+ /// 寮�鍏宠缃�
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="eventArgs">Event arguments.</param>
+ //private void Switch(object sender, MouseEventArgs eventArgs)
+ //{
+ // sendedControlCommand = false;
+ // zbGateway.ReportAction += UpdateDeviceControllStatu;
+ // switchBtn.IsSelected = !switchBtn.IsSelected;
+ // deviceIMG.IsSelected = !deviceIMG.IsSelected;
+ // StatuBtn.Text = CommonFormResouce.GetSwitchStatu(deviceIMG.IsSelected);
+ // if (switchBtn.IsSelected == true)
+ // {
+ // (device.CommonDevice as ToggleLight).SwitchControl(1);
+ // }
+ // else
+ // {
+ // (device.CommonDevice as ToggleLight).SwitchControl(0);
+ // }
+ // //鎺у埗寤舵椂鍥炶皟
+ // DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ // {
+ // if (Parent == null)
+ // {
+ // return;
+ // }
+ // RemoveUpdateControlDeviceStatuAction();
+ // if (sendedControlCommand == false)
+ // {
+ // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ // }
+ // });
+ //}
+
+ /// <summary>
+ /// ON
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="eventArgs"></param>
+ private void ON(object sender, MouseEventArgs eventArgs)
+ {
+ SetONOFFStatu(true);
+ (device.CommonDevice as ToggleLight).SwitchControl(1);
+ //鎺у埗寤舵椂鍥炶皟
+ zbGateway.ReportAction += UpdateDeviceControllStatu;
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction();
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
+ });
+ }
+ /// <summary>
+ /// OFF
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="eventArgs"></param>
+ private void OFF(object sender, MouseEventArgs eventArgs)
+ {
+ SetONOFFStatu(false);
+ (device.CommonDevice as ToggleLight).SwitchControl(0);
+ //鎺у埗寤舵椂鍥炶皟
+ zbGateway.ReportAction += UpdateDeviceControllStatu;
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction();
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
+ });
+ }
+
+ /// <summary>
+ /// SetONOFFStatu
+ /// </summary>
+ /// <param name="statu"></param>
+ private void SetONOFFStatu(bool statu)
+ {
+ if (statu)
+ {
+ OnBtn.IsSelected = true;
+ OffBtn.IsSelected = false;
+ }
+ else
+ {
+ OnBtn.IsSelected = false;
+ OffBtn.IsSelected = true;
+ }
+ }
+
+
+ #endregion
+
+ #region 鈼� 璁剧疆__________________________
+ /// <summary>
+ /// 鏇村璁剧疆
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">E.</param>
+ private void More(object sender, MouseEventArgs e)
+ {
+ var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
+ UserView.HomePage.Instance.AddChidren(detailInfo);
+ UserView.HomePage.Instance.PageIndex += 1;
+ detailInfo.Show(device, room);
+ detailInfo.action = () =>
+ {
+ Show(device, room);
+ };
+ }
+
+ #endregion
+
+ #region 鈼� 鏀惰棌__________________________
+ /// <summary>
+ /// 鏀惰棌鍒颁富椤�
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">E.</param>
+ private void Collection(object sender, MouseEventArgs e)
+ {
+ //collection
+ if ((sender as Button).IsSelected)
+ {
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
+ (sender as Button).IsSelected = false;
+ }
+ else
+ {
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
+ (sender as Button).IsSelected = true;
+ }
+ }
+
+ #endregion
+
+ #region 鈼� 璁惧鎺у埗鐘舵�乢____________________
+
+ /// <summary>
+ /// 鏄剧ず璁惧鎺у埗鐘舵��
+ /// </summary>
+ /// <param name="command">Command.</param>
+ /// <param name="objValue">Object value.</param>
+ private void UpdateDeviceControllStatu(string command, object objValue)
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ if (command != "DeviceDefaultAck" || objValue == null)
+ {
+ return;
+ }
+ var tempDevice = (CommonDevice)objValue;
+ if (tempDevice.DeviceEpoint != this.device.CommonDevice.DeviceEpoint || tempDevice.DeviceAddr != this.device.CommonDevice.DeviceAddr)
+ {
+ //涓嶆槸褰撳墠璁惧鐨勬帹閫侊紝鍒欎笉澶勭悊
+ return;
+ }
+ //鏍囪宸茬粡鍙戦�佹帶鍒跺懡浠ゅ埌缃戝叧
+ sendedControlCommand = true;
+ //DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
+ }
+
+ /// <summary>
+ /// 绉婚櫎鏇存柊鎺у埗璁惧鐨刟ction
+ /// </summary>
+ private void RemoveUpdateControlDeviceStatuAction()
+ {
+ //绉婚櫎action
+ if (zbGateway != null)
+ {
+ zbGateway.ReportAction -= UpdateDeviceControllStatu;
+ }
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
index 04fa9fa..18c2427 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
@@ -1,13 +1,556 @@
锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.Phone.Device.CommonForm;
+using Shared.Phone.UserView;
+using ZigBee.Device;
namespace Shared.Phone.Device.Light
{
/// <summary>
/// 鎻掑骇
/// </summary>
- public class PlugControl
+ public class PlugControl:FrameLayout, ZigBee.Common.IStatus
{
+
+ #region 鈼� 鍙橀噺__________________________
+ /// <summary>
+ /// 寮�鍏�
+ /// </summary>
+ private Button switchBtn;
+ /// <summary>
+ /// The action.
+ /// </summary>
+ public Action action;
+
+ /// <summary>
+ /// The light image.
+ /// </summary>
+ private Button deviceIMG;
+ /// <summary>
+ /// 鏀惰棌鎸夐挳
+ /// </summary>
+ private Button collectionBtn;
+ /// <summary>
+ /// 浼犺繃鏉ョ殑璁惧
+ /// </summary>
+ private DeviceUI device;
+ /// <summary>
+ /// 浼犺繃鏉ョ殑鎴块棿
+ /// </summary>
+ private Shared.Common.Room room;
+
+ /// <summary>
+ /// 鎴块棿
+ /// </summary>
+ private Button roomBtn;
+ /// <summary>
+ /// 鎴块棿鍚�
+ /// </summary>
+ private Button roomName;
+ /// <summary>
+ /// 缃戝叧
+ /// </summary>
+ private ZbGateway zbGateway = null;
+ /// <summary>
+ /// 鏄惁鍙戦�佹帶鍒跺懡浠ゆ垚鍔熶簡
+ /// </summary>
+ private bool sendedControlCommand = false;
+
+ /// <summary>
+ /// bodyFrameLayout
+ /// </summary>
+ private FrameLayout bodyFrameLayout;
+
+ private Button StatuBtn;
+
+ #endregion
+
+ #region 鈼� 鎺ュ彛__________________________
+ /// <summary>
+ /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
+ /// </summary>
+ /// <returns>The changed.</returns>
+ /// <param name="common">Common.</param>
+ public void Changed(CommonDevice common)
+ {
+
+ }
+ /// <summary>
+ /// Changeds the IL ogic status.
+ /// </summary>
+ /// <param name="logic">Logic.</param>
+ public void ChangedILogicStatus(ZigBee.Device.Logic logic)
+ {
+ //throw new NotImplementedException();
+ }
+ /// <summary>
+ /// Changeds the IS cene status.
+ /// </summary>
+ /// <param name="scene">Scene.</param>
+ public void ChangedISceneStatus(Scene scene)
+ {
+ //throw new NotImplementedException();
+ }
+ /// <summary>
+ /// 璁惧鐘舵�佹洿鏂版帴鍙�
+ /// <para>type锛氬鏋滀负 DeviceInComingRespon:璁惧鏂颁笂鎶�</para>
+ /// <para>type锛氬鏋滀负 IASInfoReport:RemoveDeviceRespon</para>
+ /// <para>type锛氬鏋滀负 DeviceStatusReport:璁惧涓婃姤</para>
+ /// <para>type锛氬鏋滀负 IASInfoReport:IAS瀹夐槻淇℃伅涓婃姤</para>
+ /// <para>type锛氬鏋滀负 OnlineStatusChange: 璁惧鍦ㄧ嚎鐘舵�佹洿鏂�</para>
+ /// </summary>
+ /// <param name="common">Common.</param>
+ /// <param name="typeTag">Type tag.</param>
+ public void DeviceInfoChange(CommonDevice common, string typeTag)
+ {
+ if (typeTag == "DeviceStatusReport")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ var deviceUI = device;
+ //璁惧涓虹┖
+ if (deviceUI.CommonDevice == null)
+ {
+ return;
+ }
+ //鏄惁涓哄綋鍓嶈澶�
+ if (deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint || deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr)
+ {
+ return;
+ }
+ if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
+ {
+ if (common.DeviceStatusReport.CluterID == 6)
+ {
+ var light = deviceUI.CommonDevice as ToggleLight;
+ light.DeviceStatusReport = common.DeviceStatusReport;
+ //璁板綍銆佹洿鏂扮姸鎬�
+ if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
+ {
+ return;
+ }
+ light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
+ deviceIMG.IsSelected = switchBtn.IsSelected = light.OnOffStatus == 1;
+ StatuBtn.Text = CommonFormResouce.GetSwitchStatu(deviceIMG.IsSelected);
+ light.LastDateTime = DateTime.Now;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"Error:{ex.Message}");
+ }
+ });
+ }
+ else if (typeTag == "OnlineStatusChange")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ var deviceUI = device;
+ //璁惧涓虹┖
+ if (deviceUI.CommonDevice == null)
+ {
+ return;
+ }
+ //鏄惁涓哄綋鍓嶈澶�
+ if (deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint || deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr)
+ {
+ return;
+ }
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ deviceIMG.IsSelected = switchBtn.IsSelected = deviceUI.CommonDevice.IsOnline == 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"Error:{ex.Message}");
+ }
+ });
+ }
+ }
+ #endregion
+
+ #region 鈼� 鍒濆鍖朹____________________
+ /// <summary>
+ /// 閲嶅啓绉婚櫎鏂规硶
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ ZbGateway.StatusList.Remove(this);
+ //action();
+ //action = null;
+ RemoveUpdateControlDeviceStatuAction();
+ base.RemoveFromParent();
+ }
+
+ /// <summary>
+ /// 鏋勯�犳柟娉�
+ /// </summary>
public PlugControl()
{
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ ZbGateway.StatusList.Add(this);
}
+ /// <summary>
+ /// 鏄剧ず鐣岄潰
+ /// </summary>
+ /// <param name="dev">Device.</param>
+ /// <param name="room">Room.</param>
+ public void Show(DeviceUI dev, Shared.Common.Room room)
+ {
+ device = dev;
+ zbGateway = this.device.CommonDevice.Gateway;
+ this.room = room;
+
+ AddTop();
+
+ AddBodyView(device);
+
+
+ var light = dev.CommonDevice as ToggleLight;
+ //琛ヤ笂闈炶繙绋�
+ if (light.Gateway == null)
+ {
+ return;
+ }
+ if (light.Gateway.IsVirtual)
+ {
+ UserHomeView.ReadStatus(light, () =>
+ {
+ light.ReadOnOffStatus();
+ light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ });
+ }
+ else
+ {
+ //闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
+ if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
+ {
+ light.ReadOnOffStatus();
+ light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ }
+ }
+
+ var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
+ if (de == null)
+ {
+ collectionBtn.IsSelected = false;
+ }
+ else
+ {
+ collectionBtn.IsSelected = true;
+ }
+
+
+ BindEvent();
+
+ }
+
+ #endregion
+
+ #region 鈼� Add______________________________
+
+ /// <summary>
+ /// AddTop
+ /// </summary>
+ public void AddTop()
+ {
+ var top = new TopFrameLayout();
+ AddChidren(top);
+ top.InitTopview();
+ top.backButton.MouseUpEventHandler += (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+
+ var sharedBtn = new Button
+ {
+ X = Application.GetRealWidth(850),
+ Width = Application.GetMinReal(69),
+ Height = Application.GetMinReal(69),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Item/Shared.png"
+ };
+ top.topView.AddChidren(sharedBtn);
+
+ var moreBtn = new Button
+ {
+ X = Application.GetRealWidth(953),
+ Width = Application.GetMinReal(69),
+ Height = Application.GetMinReal(69),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Item/More.png"
+ };
+ top.topView.AddChidren(moreBtn);
+
+ moreBtn.MouseUpEventHandler += More;
+
+ }
+ /// <summary>
+ /// AddBodyView
+ /// </summary>
+ public void AddBodyView(DeviceUI device)
+ {
+ bodyFrameLayout = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(184),
+ Height = Application.GetRealHeight(1737),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
+ };
+ AddChidren(bodyFrameLayout);
+
+ var itemView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(115),
+ Width = Application.GetRealWidth(965),
+ Height = Application.GetRealHeight(1316),
+ Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ bodyFrameLayout.AddChidren(itemView);
+
+ collectionBtn = new Button()
+ {
+ X = Application.GetRealWidth(850),
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetMinReal(69),
+ Height = Application.GetMinReal(69),
+ UnSelectedImagePath = "Item/Collection.png",
+ SelectedImagePath = "Item/CollectionSelected.png"
+ };
+ itemView.AddChidren(collectionBtn);
+
+ var deviceNameBtn = new Button()
+ {
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetRealWidth(500),
+ Height = Application.GetRealHeight(60),
+ Gravity = Gravity.CenterHorizontal,
+ Text = device.CommonDevice.DeviceEpointName,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 15
+ };
+ itemView.AddChidren(deviceNameBtn);
+
+ StatuBtn = new Button
+ {
+ Y = Application.GetRealHeight(118),
+ Width = Application.GetRealWidth(600),
+ Height = Application.GetRealHeight(60),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ Text = CommonFormResouce.GetSwitchStatu(device.CommonDevice.IsOnline == 1)
+ };
+ itemView.AddChidren(StatuBtn);
+
+ deviceIMG = new Button()
+ {
+ Y = Application.GetRealHeight(344),
+ Width = Application.GetMinRealAverage(567),
+ Height = Application.GetMinRealAverage(567),
+ Gravity = Gravity.CenterHorizontal,
+ UnSelectedImagePath = "Light/Plug.png",
+ SelectedImagePath = "Light/PlugSelected.png",
+ IsSelected = (device.CommonDevice as ToggleLight).OnOffStatus == 1
+ };
+ itemView.AddChidren(deviceIMG);
+
+ switchBtn = new Button()
+ {
+ Y = Application.GetRealHeight(996),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
+ Gravity = Gravity.CenterHorizontal,
+ UnSelectedImagePath = "Item/Switch.png",
+ SelectedImagePath = "Item/SwitchSelected.png",
+ IsSelected = (device.CommonDevice as ToggleLight).OnOffStatus == 1
+ };
+ itemView.AddChidren(switchBtn);
+
+ var roomBG = new Button
+ {
+ Y = Application.GetRealHeight(1178 - 50),
+ Height = Application.GetRealHeight(138 + 50),
+ BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius)
+ };
+ itemView.AddChidren(roomBG);
+
+ var roomBG2 = new Button
+ {
+ Y = Application.GetRealHeight(1178 - 50),
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
+ };
+ itemView.AddChidren(roomBG2);
+
+ roomBtn = new Button()
+ {
+ X = Application.GetRealWidth(CommonFormResouce.X_Left),
+ Y = Application.GetRealHeight(1207),
+ Width = Application.GetMinReal(80),
+ Height = Application.GetMinReal(80),
+ UnSelectedImagePath = "Item/Room.png"
+ };
+ itemView.AddChidren(roomBtn);
+
+ roomName = new Button()
+ {
+ X = Application.GetRealWidth(150),
+ Y = Application.GetRealHeight(1224),
+ Width = Application.GetRealWidth(400),
+ Height = Application.GetRealHeight(50),
+ Text = room.Name,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ itemView.AddChidren(roomName);
+ }
+
+ #endregion
+
+ #region 鈼� 缁戝畾鎸夐挳_______________________
+ /// <summary>
+ /// 缁戝畾鎸夐挳鐨勪簨浠�
+ /// </summary>
+ private void BindEvent()
+ {
+ switchBtn.MouseUpEventHandler += Switch;
+ deviceIMG.MouseUpEventHandler += Switch;
+ collectionBtn.MouseUpEventHandler += Collection;
+ }
+
+ #endregion
+
+ #region 鈼� 寮�鍏砡_________________________
+
+ /// <summary>
+ /// 寮�鍏宠缃�
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="eventArgs">Event arguments.</param>
+ private void Switch(object sender, MouseEventArgs eventArgs)
+ {
+ sendedControlCommand = false;
+ zbGateway.ReportAction += UpdateDeviceControllStatu;
+ switchBtn.IsSelected = !switchBtn.IsSelected;
+ deviceIMG.IsSelected = !deviceIMG.IsSelected;
+ StatuBtn.Text = CommonFormResouce.GetSwitchStatu(deviceIMG.IsSelected);
+ if (switchBtn.IsSelected == true)
+ {
+ (device.CommonDevice as ToggleLight).SwitchControl(1);
+ }
+ else
+ {
+ (device.CommonDevice as ToggleLight).SwitchControl(0);
+ }
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction();
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
+ });
+ }
+
+
+
+ #endregion
+
+ #region 鈼� 璁剧疆__________________________
+ /// <summary>
+ /// 鏇村璁剧疆
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">E.</param>
+ private void More(object sender, MouseEventArgs e)
+ {
+ var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
+ UserView.HomePage.Instance.AddChidren(detailInfo);
+ UserView.HomePage.Instance.PageIndex += 1;
+ detailInfo.Show(device, room);
+ detailInfo.action = () =>
+ {
+ Show(device, room);
+ };
+ }
+
+ #endregion
+
+ #region 鈼� 鏀惰棌__________________________
+ /// <summary>
+ /// 鏀惰棌鍒颁富椤�
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">E.</param>
+ private void Collection(object sender, MouseEventArgs e)
+ {
+ //collection
+ if ((sender as Button).IsSelected)
+ {
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
+ (sender as Button).IsSelected = false;
+ }
+ else
+ {
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
+ (sender as Button).IsSelected = true;
+ }
+ }
+
+ #endregion
+
+ #region 鈼� 璁惧鎺у埗鐘舵�乢____________________
+
+ /// <summary>
+ /// 鏄剧ず璁惧鎺у埗鐘舵��
+ /// </summary>
+ /// <param name="command">Command.</param>
+ /// <param name="objValue">Object value.</param>
+ private void UpdateDeviceControllStatu(string command, object objValue)
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ if (command != "DeviceDefaultAck" || objValue == null)
+ {
+ return;
+ }
+ var tempDevice = (CommonDevice)objValue;
+ if (tempDevice.DeviceEpoint != this.device.CommonDevice.DeviceEpoint || tempDevice.DeviceAddr != this.device.CommonDevice.DeviceAddr)
+ {
+ //涓嶆槸褰撳墠璁惧鐨勬帹閫侊紝鍒欎笉澶勭悊
+ return;
+ }
+ //鏍囪宸茬粡鍙戦�佹帶鍒跺懡浠ゅ埌缃戝叧
+ sendedControlCommand = true;
+ //DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
+ }
+
+ /// <summary>
+ /// 绉婚櫎鏇存柊鎺у埗璁惧鐨刟ction
+ /// </summary>
+ private void RemoveUpdateControlDeviceStatuAction()
+ {
+ //绉婚櫎action
+ if (zbGateway != null)
+ {
+ zbGateway.ReportAction -= UpdateDeviceControllStatu;
+ }
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index e88eec2..cc03759 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -108,7 +108,7 @@
///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
if (Common.Room.Lists.Count == 0)
{
- return;
+ return;
}
///鎴块棿婊戝姩鎺т欢
var roomhorizontalScrol = new HorizontalScrolViewLayout()
@@ -144,7 +144,7 @@
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
- middle.Height =Application.GetRealHeight(1920-40) - devicetypehorizontalScrol.Bottom;
+ middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
middle.X = Application.GetRealWidth(58);
middle.Radius = (uint)Application.GetRealHeight(50);
@@ -176,7 +176,7 @@
Height = Application.GetRealHeight(780),
X = Application.GetRealWidth(1080 - 468 - 35),
Y = Application.GetRealHeight(184),
- BackgroundImagePath= "Item/SelectFloor_Right.png",
+ BackgroundImagePath = "Item/SelectFloor_Right.png",
};
flMain.AddChidren(foolrbjicon);
@@ -195,7 +195,7 @@
{
Width = Application.GetRealWidth(450),
- Height =foolrbjicon.Height - btnfoolrtext.Height,
+ Height = foolrbjicon.Height - btnfoolrtext.Height,
X = Application.GetRealWidth(80),
Y = btnfoolrtext.Bottom,
};
@@ -206,7 +206,7 @@
var foolrRowLayout = new RowLayout
{
Height = Application.GetRealHeight(150),
- LineColor= ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
foolrbj.AddChidren(foolrRowLayout);
@@ -215,7 +215,7 @@
Width = Application.GetRealWidth(81),
Height = Application.GetRealHeight(81),
UnSelectedImagePath = "Floor/Floor.png",
- Gravity=Gravity.CenterVertical,
+ Gravity = Gravity.CenterVertical,
};
foolrRowLayout.AddChidren(btnfoolricon);
@@ -228,10 +228,11 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
Tag = foolr.Key,
- X= btnfoolricon.Right+Application.GetRealWidth(12),
+ X = btnfoolricon.Right + Application.GetRealWidth(12),
};
foolrRowLayout.AddChidren(btnfoolrname);
- if (foolrname.Text == foolr.Value) {
+ if (foolrname.Text == foolr.Value)
+ {
btnfoolricon.UnSelectedImagePath = "Floor/FloorSelected.png";
btnfoolrname.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
}
@@ -245,7 +246,7 @@
foolrname.Text = btnfoolrname.Text;
flMain.RemoveFromParent();
var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
-
+
AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
};
foolrRowLayout.MouseUpEventHandler += foolrnameclick;
@@ -303,20 +304,20 @@
Width = Application.GetRealWidth(255),
UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
- Y=Application.GetRealHeight(21),
+ Y = Application.GetRealHeight(21),
};
fra.AddChidren(roombjBtn);
- var roomnameBtn= new Button
+ var roomnameBtn = new Button
{
- Height = Application.GetRealHeight(152-26-20),
- Width = Application.GetRealWidth(255-20-50),
+ Height = Application.GetRealHeight(152 - 26 - 20),
+ Width = Application.GetRealWidth(255 - 20 - 50),
Text = room.Name,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Y=Application.GetRealHeight(21 +13+10),
- X=Application.GetRealWidth(10+25),
+ Y = Application.GetRealHeight(21 + 13 + 10),
+ X = Application.GetRealWidth(10 + 25),
};
fra.AddChidren(roomnameBtn);
@@ -334,7 +335,8 @@
var list = new List<DeviceUI>();
foreach (var device in room.DeviceUIList)
{
- if (device.CommonDevice==null) {
+ if (device.CommonDevice == null)
+ {
continue;
}
if (!deviceTypeList.Contains(device.CommonDevice.Type))
@@ -343,7 +345,7 @@
}
list.Add(device);
}
-
+
AllDeviceTypeView(list, devicetypehorizontalScrol);
}
@@ -364,7 +366,8 @@
var list = new List<DeviceUI>();
foreach (var device in room.DeviceUIList)
{
- if (device.CommonDevice==null) {
+ if (device.CommonDevice == null)
+ {
continue;
}
if (!deviceTypeList.Contains(device.CommonDevice.Type))
@@ -373,7 +376,7 @@
}
list.Add(device);
}
-
+
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -404,7 +407,7 @@
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
}
- var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone|| device.CommonDevice.Type == DeviceType.TemperatureSensor);
+ var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone || device.CommonDevice.Type == DeviceType.TemperatureSensor);
if (iASZonejosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
@@ -685,11 +688,11 @@
/// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠剁殑瑙嗗浘鏂规硶
/// </summary>
/// <param name="common">Common.</param>
- public async static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
+ public async static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
{
//涓嶈褰撳墠鐣岄潰婊戝姩
UserView.HomePage.Instance.ScrollEnabled = false;
- List<Dictionary<string, string>> doorlockConditionsInfo= new List<Dictionary<string, string>>();
+ List<Dictionary<string, string>> doorlockConditionsInfo = new List<Dictionary<string, string>>();
Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
dictionary(deviceConditionsInfo, "Type", "1");
dictionary(deviceConditionsInfo, "IsValid", "1");
@@ -1386,12 +1389,12 @@
var buttonSelected = new SelectedButton();
buttonRow.AddChidren(buttonSelected);
EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
- {
- buttonSelected.Visible = true;
- SelectedDeviceStatuscondition = "OnOffSwitch";
- button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ {
+ buttonSelected.Visible = true;
+ SelectedDeviceStatuscondition = "OnOffSwitch";
+ button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- };
+ };
buttonRow.MouseUpEventHandler += buttonclick;
button.MouseUpEventHandler += buttonclick;
buttonSelected.MouseUpEventHandler += buttonclick;
@@ -1544,7 +1547,7 @@
deviceConditionsInfo.Add(Key, Value);
}
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c5f558d..9077c94 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -16,23 +16,12 @@
Button selectedIcon = new Button();
public static Action action;
public static bool edit=false;
- Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
- Dictionary<string, string> userdictionary = new Dictionary<string, string>();
+
public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
{
- if (!edit)
- {
- deviceConditionsInfo.Add("Type", "1");
- deviceConditionsInfo.Add("IsValid", "1");
- deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
- deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
- deviceConditionsInfo.Add("Cluster_ID", "64529");
- deviceConditionsInfo.Add("AttriButeData1", "2");
- deviceConditionsInfo.Add("Range", "0");
- editdeviceConditionsInfo = deviceConditionsInfo;
- }
+
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -214,8 +203,8 @@
};
lockRow.AddChidren(Btncomplete);
#endregion
-
- string SelectedDeviceStatuscondition = "";
+ ///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
+ string userId = "", openMode = "", accountname="", SelectedDeviceStatuscondition = "";
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
for (int i = 0; i < user.UserIdMode.Count; i++)
@@ -285,48 +274,27 @@
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
+ userId = userifon.UserId;
+ openMode = userifon.OpenMode.ToString();
+ accountname = Btntitle.Text + doorlockBtn.Text;
//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- if (deviceConditionsInfo.ContainsKey("AttriButeId"))
- {
- deviceConditionsInfo.Remove("AttriButeId");
- }
- if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
- {
- deviceConditionsInfo.Remove("AttriButeData2");
- }
- deviceConditionsInfo.Add("AttriButeId", userifon.OpenMode.ToString());
- deviceConditionsInfo.Add("AttriButeData2", userifon.UserId);
- if (userdictionary.ContainsKey("Account"))
- {
- userdictionary.Remove("Account");
- }
- if (userdictionary.ContainsKey("Type"))
- {
- userdictionary.Remove("Type");
- }
- if (userdictionary.ContainsKey("UserId"))
- {
- userdictionary.Remove("UserId");
- }
- userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
- userdictionary.Add("Type", "1");
- userdictionary.Add("UserId", userifon.UserId);
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
doorlockSelected.MouseUpEventHandler += doorlockclick;
doorlockfra.MouseUpEventHandler += doorlockclick;
- if (edit&&editdeviceConditionsInfo!=null)
+
+ if (edit && editdeviceConditionsInfo != null)
{
- deviceConditionsInfo = editdeviceConditionsInfo;
+
if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
{
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
}
-
+
}
}
@@ -334,7 +302,31 @@
Btncomplete.MouseUpEventHandler += (sender3, e3) =>
{
-
+ string userIdstr = "", openModestr="";
+ var deviceConditionsInfo = new Dictionary<string, string>();
+ var userdictionary = new Dictionary<string, string>();
+ deviceConditionsInfo.Add("Type", "1");
+ deviceConditionsInfo.Add("IsValid", "1");
+ deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
+ deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
+ deviceConditionsInfo.Add("Cluster_ID", "64529");
+ deviceConditionsInfo.Add("AttriButeData1", "2");
+ deviceConditionsInfo.Add("Range", "0");
+ deviceConditionsInfo.Add("AttriButeId", openMode);
+ deviceConditionsInfo.Add("AttriButeData2", userId);
+ userdictionary.Add("Account",accountname);
+ userdictionary.Add("Type", "1");
+ userdictionary.Add("UserId", userId);
+ if (edit)
+ {
+ openModestr = editdeviceConditionsInfo["AttriButeId"];
+ userIdstr = editdeviceConditionsInfo["AttriButeData2"];
+ }
+ else
+ {
+ openModestr = deviceConditionsInfo["AttriButeId"];
+ userIdstr = deviceConditionsInfo["AttriButeData2"];
+ }
if (SelectedDeviceStatuscondition != "")
{
bool add = false;
@@ -344,13 +336,13 @@
{
if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
{
- if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == editdeviceConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == editdeviceConditionsInfo["AttriButeData2"])
+ if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == openModestr && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == userIdstr)
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
Common.Logic.CurrentLogic.Conditions.Insert(i, deviceConditionsInfo);
for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
{
- if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == editdeviceConditionsInfo["AttriButeData2"])
+ if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
{
Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index a2ddf40..1060bd2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -943,7 +943,7 @@
for (int j = 0; j < doorlockifonlist.Count; j++)
{
///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
- if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
+ if (membershipifon.SubAccountDistributedMark == doorlockifonlist[j].CloudAccountId)
{
LockMode lockMode = new LockMode();
lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 95b6431..9427cee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -133,7 +133,7 @@
}
catch (Exception ex)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
+ //鍑虹幇鏈煡閿欒
var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
alert.Show();
//Log鍑哄姏
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index 31075f1..80e2c5c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -159,8 +159,8 @@
//濡傛灉璁剧疆鏈夊唴閮ㄩ槻鍖�
string msg = string.Empty;
if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)
-
- {
+
+ {
//鍦ㄥ甯冮槻璁剧疆鎴愬姛
msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
index a79ddb8..05f38cb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
@@ -215,8 +215,19 @@
//LOG鍑哄姏
this.WriteLog();
}
- //璋冪敤濮旀墭
- ButtonClickEvent?.Invoke(sender, e);
+ try
+ {
+ //璋冪敤濮旀墭
+ ButtonClickEvent?.Invoke(sender, e);
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ alert.Show();
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index a9ac393..101b40e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -214,6 +214,7 @@
public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)
{
var btnContr = new MostRightIconControl(i_width, i_height);
+ btnContr.UseClickStatu = false;
this.AddChidren(btnContr, ChidrenBindMode.NotBind);
btnContr.InitControl();
//澶嶅悎鎺т欢闇�瑕佺壒娈婂鐞�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index 9fdbade..9d31add 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -23,6 +23,21 @@
/// 涓�涓病浠�涔堢敤鐨勪笢瑗�
/// </summary>
private FrameLayout frameBackTemp = null;
+ /// <summary>
+ /// 鑷畾涔夌殑鑾峰彇瀛愭帶浠朵釜鏁�
+ /// </summary>
+ public new int ChildrenCount
+ {
+ get
+ {
+ int count = base.ChildrenCount;
+ if (frameBackTemp != null)
+ {
+ count--;
+ }
+ return count < 0 ? 0 : count;
+ }
+ }
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index 358e286..cd3d842 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -368,7 +368,9 @@
{
return null;
}
- return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);
+ var myMethod = form.GetType().GetMethod(method);
+ return myMethod.Invoke(form, parameter);
+ //return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);
}
catch (Exception ex)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
index 2cca9c1..8b8cbf3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
@@ -234,9 +234,38 @@
}
#endregion
+
+ #region 鈻� 娣诲姞甯姪鎺т欢_______________________
+ /// <summary>
+ /// 娣诲姞鏌ョ湅甯姪鎺т欢
+ /// </summary>
+ /// <returns></returns>
+ public NormalViewControl AddHelpControl()
+ {
+ //鏌ョ湅甯姪
+ var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+ btnHelp.Y = Application.GetRealHeight(1388);
+ btnHelp.TextSize = 12;
+ btnHelp.TextAlignment = TextAlignment.Center;
+ btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
+ btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
+ bodyFrameLayout.AddChidren(btnHelp);
+ //搴曠嚎
+ int lineWidth = btnHelp.GetRealWidthByText(12);
+ var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
+ btnLine.Gravity = Gravity.CenterHorizontal;
+ btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
+ bodyFrameLayout.AddChidren(btnLine);
+
+ return btnHelp;
+ }
+
+ #endregion
+
#region 鈻� 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁坃________
-
+
/// <summary>
/// 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁�
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index c0de009..b8c406b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
@@ -110,6 +110,45 @@
#endregion
+ #region 鈻� 璁剧疆绌鸿皟鐨勮嚜瀹氫箟妯″紡_______________
+
+ /// <summary>
+ /// 璁剧疆绌鸿皟鐨勮嚜瀹氫箟妯″紡
+ /// </summary>
+ /// <param name="device">绌鸿皟瀵硅薄</param>
+ /// <param name="data">浠庝簩杩涘埗杞崲鐨勫崄杩涘埗鍊�</param>
+ /// <returns></returns>
+ public async Task<bool> SetAcModeSupport(AC device, int data)
+ {
+ var result = await HdlDeviceAttributeLogic.Current.WriteDeviceAttribute(device, 513, 4099, 25, data);
+ //妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
+ if (error != null)
+ {
+ this.ShowTipMsg(error);
+ return false;
+ }
+ if (result == null || result.setWritableValueResponData == null)
+ {
+ //璁剧疆绌鸿皟妯″紡澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetAcModeFail);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ this.ShowTipMsg(msg); ;
+ return false;
+ }
+ if (result.setWritableValueResponData.Status != 0)
+ {
+ //璁剧疆绌鸿皟妯″紡澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetAcModeFail);
+ this.ShowTipMsg(msg); ;
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
index 63fc904..1a2bc3b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
@@ -203,5 +203,86 @@
}
#endregion
+
+ #region 鈻� 鍐欏叆璁惧灞炴�______________________
+
+ /// <summary>
+ /// 璁剧疆绌鸿皟鐨勮嚜瀹氫箟妯″紡
+ /// </summary>
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <param name="clusterId">闀濱D</param>
+ /// <param name="attributeId">灞炴�D</param>
+ /// <param name="attributeDataType">鏁版嵁绫诲瀷</param>
+ /// <param name="attributeData">闇�瑕佸啓鍏ョ殑鏁版嵁</param>
+ /// <returns></returns>
+ public async System.Threading.Tasks.Task<CommonDevice.SetWritableValueResponAllData> WriteDeviceAttribute(CommonDevice device, int clusterId, int attributeId, int attributeDataType, int attributeData)
+ {
+ var MyGateway = device.Gateway;
+ if (MyGateway == null)
+ {
+ return null;
+ }
+
+ CommonDevice.SetWritableValueResponAllData d = null;
+ Action<string, string> action = (topic, message) =>
+ {
+ var gatewayID = topic.Split('/')[0];
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+
+ if (topic == gatewayID + "/" + "Error_Respon")
+ {
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ if (temp == null)
+ {
+ d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
+ }
+ else
+ {
+ d = new CommonDevice.SetWritableValueResponAllData { errorResponData = temp, errorMessageBase = HdlCheckLogic.Current.CheckCommonErrorCode(temp.Error) };
+ }
+ }
+
+ if (topic == gatewayID + "/" + "SetWritableValue_Respon")
+ {
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.SetWritableValueResponData>(jobject["Data"].ToString());
+ if (tempData == null)
+ {
+ d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
+ }
+ else
+ {
+ d = new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = tempData };
+ }
+ }
+ };
+ MyGateway.Actions += action;
+ try
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", clusterId }, { "Command", 120 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", attributeData } };
+ jObject.Add("Data", data);
+ MyGateway.Send("SetWritableValue", jObject.ToString());
+ }
+ catch { }
+
+ var timeOut = 0;
+ while (timeOut <= 30)
+ {
+ await System.Threading.Tasks.Task.Delay(100);
+ if (d != null)
+ {
+ break;
+ }
+ timeOut++;
+ }
+ if (timeOut > 30 && d == null)
+ {
+ d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ }
+ MyGateway.Actions -= action;
+ return d;
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
index 30dc880..e9135f8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
@@ -580,20 +580,17 @@
//绉婚櫎浜嬩欢
HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(otaDevice);
- Application.RunOnMainThread(() =>
- {
- //璁剧疆杩涘害鍊肩洿鎺ヤ负100%
- this.ProgressEvent?.Invoke(100);
- //鐘舵�佸彉鏇�
- this.IsFinishUpdate = true;
- //鍗囩骇瀹屾垚
- this.UpdateStatu = UpdateStatuMode.UpdateFinish;
+ //璁剧疆杩涘害鍊肩洿鎺ヤ负100%
+ this.ProgressEvent?.Invoke(100);
+ //鐘舵�佸彉鏇�
+ this.IsFinishUpdate = true;
+ //鍗囩骇瀹屾垚
+ this.UpdateStatu = UpdateStatuMode.UpdateFinish;
- HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
+ HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
- //璁惧鍗囩骇鎴愬姛!
- this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uDeviceUpdateSuccess));
- });
+ //璁惧鍗囩骇鎴愬姛!
+ this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uDeviceUpdateSuccess));
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
index 1d0ea04..716b00b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -23,7 +23,7 @@
/// </summary>
public Action<int, string> UpdateStatuChangedEvent = null;
/// <summary>
- /// 杩涘害鍊间簨浠�
+ /// 杩涘害鍊间簨浠�(宸茬粡鏄櫨鍒嗘瘮鐨勫��)
/// </summary>
public Action<decimal> ProgressEvent = null;
/// <summary>
@@ -412,6 +412,7 @@
//鍗忚皟鍣ㄥ浐浠朵笅杞戒腑
this.UpdateStatuChangedEvent(0, Language.StringByID(R.MyInternationalizationString.uCoordinatorFirmwareDownLoading));
+ this.SetProgressValue(0, 100);
//涓嬭浇鍗忚皟鍣ㄦ枃浠剁殑杩涘害
this.upDatezbGateway.ReportAction += this.DownLoadCoordinatorFileProgress;
@@ -462,6 +463,7 @@
//璁剧疆杩涘害
var responData = tempZb.downloadFileProgressResponData;
+ this.SetProgressValue(responData.DownloadPercent, 100);
//鍗忚皟鍣ㄥ浐浠朵笅杞戒腑
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uCoordinatorFirmwareDownLoading));
@@ -610,6 +612,7 @@
//缃戝叧鍥轰欢涓嬭浇涓�
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uGatewayFirmwareDownLoading));
+ this.SetProgressValue(0, 100);
//涓嬭浇缃戝叧鏂囦欢鐨勮繘搴�
this.upDatezbGateway.ReportAction += this.DownLoadGatewayFileProgress;
@@ -754,7 +757,10 @@
//鎵ц涓嬩竴涓崌绾�
HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
//缃戝叧鍗囩骇鎴愬姛!
- this.UpdateStatuChangedEvent?.Invoke(1, "");
+ this.SetProgressValue(100, 100);
+ System.Threading.Thread.Sleep(1500);
+
+ this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uGatewayUpdateSuccess));
});
}
@@ -807,7 +813,7 @@
return;
}
decimal result = value / maxValue;
- this.ProgressEvent?.Invoke(value);
+ this.ProgressEvent?.Invoke(result);
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 75734e9..7ea6cfd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -39,6 +39,11 @@
m_Current = value;
}
}
+ /// <summary>
+ /// 鍒嗕韩鐨勮澶囨枃浠�(key:璁惧涓婚敭,value:璁惧鏂囦欢)
+ /// </summary>
+ private Dictionary<string, string> dicShardDeviceFile = new Dictionary<string, string>();
+
#endregion
#region 鈻� 鑾峰彇鍒嗕韩鏂囦欢_______________________
@@ -220,125 +225,10 @@
/// </summary>
public void ClearShardDirectory()
{
+ this.dicShardDeviceFile.Clear();
//鍒涘缓鏂囦欢澶�
string strDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory);
Global.CreateEmptyDirectory(strDir, true);
- }
-
- #endregion
-
- #region 鈻� 鑾峰彇鎴愬憳鍏变韩鍒楄〃___________________
-
- /// <summary>
- /// 浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
- /// </summary>
- /// <param name="memberShardInfo">鎴愬憳鐨勫垎浜暟鎹殑缂撳瓨(璋冪敤杩欎釜鍑芥暟浼氬埛鏂拌繖涓彉閲忕殑淇℃伅)</param>
- public void GetMemberShardContentListFromLocal(MemberShardInfoData memberShardInfo)
- {
- memberShardInfo.dicShardRoom = new Dictionary<string, Common.Room>();
-
- var listDeviceFile = new HashSet<string>();
- var listSceneFile = new HashSet<string>();
-
- var listFile = this.GetLocalAllShardFile();
- //鍏堝垵濮嬪寲鎴块棿
- foreach (string fileName in listFile)
- {
- if (fileName.StartsWith("Room_") == true)
- {
- //鎴块棿鏂囦欢
- var byteData = this.GetShardFileContent(fileName);
- if (byteData != null)
- {
- string valueData = System.Text.Encoding.UTF8.GetString(byteData);
- var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);
- memberShardInfo.dicShardRoom[fileName] = roomTemp;
- }
- }
- else if (fileName == DirNameResourse.ShardFloorFile)
- {
- //妤煎眰鏂囦欢
- var byteData = this.GetShardFileContent(fileName);
- if (byteData != null)
- {
- string valueData = System.Text.Encoding.UTF8.GetString(byteData);
- memberShardInfo.dicShardFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(valueData);
- }
- }
- else if (fileName.StartsWith("Device_") == true)
- {
- //璁惧鏂囦欢
- listDeviceFile.Add(fileName);
- }
- else if (fileName.StartsWith("Scene_") == true)
- {
- //鍦烘櫙鏂囦欢
- listSceneFile.Add(fileName);
- }
- }
-
- //璁剧疆鎴块棿閲岄潰璁惧鐨刄I瀵硅薄(鍥犱负杩欎釜涓滆タ鏄弽搴忓垪鍖栧嚭鏉ョ殑,璁惧UI瀵硅薄鏄笉搴忓垪鍖栧璞�)
- foreach (var tempRoom in memberShardInfo.dicShardRoom.Values)
- {
- //杩樺師璁惧瀵硅薄
- tempRoom.DeviceUIList.Clear();
- for (int i = 0; i < tempRoom.DeviceUIFilePathList.Count; i++)
- {
- string deviceFile = tempRoom.DeviceUIFilePathList[i];
- //杩欎釜璁惧鏂囦欢鍖归厤寰楀埌鎴块棿
- listDeviceFile.Remove(deviceFile);
- if (this.IsFileExists(deviceFile) == false)
- {
- //绉婚櫎鎺夎繖涓笉瀵瑰姴鐨勮矾寰�
- tempRoom.DeviceUIFilePathList.RemoveAt(i);
- i--;
- continue;
- }
- tempRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFile));
- }
- //杩樺師鍦烘櫙瀵硅薄
- tempRoom.SceneUIList.Clear();
- for (int i = 0; i < tempRoom.SceneUIFilePathList.Count; i++)
- {
- string uiPath = tempRoom.SceneUIFilePathList[i];
- //杩欎釜鍦烘櫙鏂囦欢鍖归厤寰楀埌鎴块棿
- listSceneFile.Remove(uiPath);
- var byteData = this.GetShardFileContent(uiPath);
- if (byteData == null)
- {
- //绉婚櫎鎺夎繖涓笉瀵瑰姴鐨勮矾寰�
- tempRoom.SceneUIFilePathList.RemoveAt(i);
- i--;
- continue;
- }
- string valueData = System.Text.Encoding.UTF8.GetString(byteData);
- var tempUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(valueData);
- tempRoom.SceneUIList.Add(tempUi);
- }
- }
- //濡傛灉瀛樺湪鍖归厤涓嶄笂鐨勬枃浠�
- if (listDeviceFile.Count != 0 || listSceneFile.Count != 0)
- {
- //鍒涘缓涓�涓复鏃舵埧闂存潵瀛樺偍
- var roomTemp = new Room();
- roomTemp.Id = "Other";
- roomTemp.FloorId = "Other";
- memberShardInfo.dicShardRoom[roomTemp.FileName] = roomTemp;
- roomTemp.Name = Language.StringByID(R.MyInternationalizationString.uSharedRoom);
- //杩樺師璁惧瀵硅薄
- foreach (string deviceFile in listDeviceFile)
- {
- roomTemp.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFile));
- }
- //杩樺師鍦烘櫙瀵硅薄
- foreach (string uiPath in listSceneFile)
- {
- var byteData = this.GetShardFileContent(uiPath);
- string valueData = System.Text.Encoding.UTF8.GetString(byteData);
- var tempUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(valueData);
- roomTemp.SceneUIList.Add(tempUi);
- }
- }
}
#endregion
@@ -602,6 +492,8 @@
{
if (memberShardInfo.Refresh == false)
{
+ //浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
+ this.GetMemberShardContentListFromLocal(memberShardInfo);
return true;
}
memberShardInfo.Refresh = false;
@@ -657,11 +549,156 @@
ProgressBar.Close();
return false;
}
+
+ //浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
+ this.GetMemberShardContentListFromLocal(memberShardInfo);
+
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
return true;
}
+
+ /// <summary>
+ /// 浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
+ /// </summary>
+ /// <param name="memberShardInfo">鎴愬憳鐨勫垎浜暟鎹殑缂撳瓨(璋冪敤杩欎釜鍑芥暟浼氬埛鏂拌繖涓彉閲忕殑淇℃伅)</param>
+ private void GetMemberShardContentListFromLocal(MemberShardInfoData memberShardInfo)
+ {
+ memberShardInfo.dicShardRoom = new Dictionary<string, Common.Room>();
+ this.dicShardDeviceFile.Clear();
+
+ var listDeviceFile = new HashSet<string>();
+ var listSceneFile = new HashSet<string>();
+
+ var listFile = this.GetLocalAllShardFile();
+ //鍏堝垵濮嬪寲鎴块棿
+ foreach (string fileName in listFile)
+ {
+ if (fileName.StartsWith("Room_") == true)
+ {
+ //鎴块棿鏂囦欢
+ var byteData = this.GetShardFileContent(fileName);
+ if (byteData != null)
+ {
+ string valueData = System.Text.Encoding.UTF8.GetString(byteData);
+ var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);
+ memberShardInfo.dicShardRoom[fileName] = roomTemp;
+ }
+ }
+ else if (fileName == DirNameResourse.ShardFloorFile)
+ {
+ //妤煎眰鏂囦欢
+ var byteData = this.GetShardFileContent(fileName);
+ if (byteData != null)
+ {
+ string valueData = System.Text.Encoding.UTF8.GetString(byteData);
+ memberShardInfo.dicShardFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(valueData);
+ }
+ }
+ else if (fileName.StartsWith("Device_") == true)
+ {
+ string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));
+ this.dicShardDeviceFile[mainKeys] = fileName;
+
+ //璁惧鏂囦欢
+ listDeviceFile.Add(fileName);
+ }
+ else if (fileName.StartsWith("Scene_") == true)
+ {
+ //鍦烘櫙鏂囦欢
+ listSceneFile.Add(fileName);
+ }
+ }
+
+ //璁剧疆鎴块棿閲岄潰璁惧鐨刄I瀵硅薄(鍥犱负杩欎釜涓滆タ鏄弽搴忓垪鍖栧嚭鏉ョ殑,璁惧UI瀵硅薄鏄笉搴忓垪鍖栧璞�)
+ foreach (var tempRoom in memberShardInfo.dicShardRoom.Values)
+ {
+ //杩樺師璁惧瀵硅薄
+ tempRoom.DeviceUIList.Clear();
+ for (int i = 0; i < tempRoom.DeviceUIFilePathList.Count; i++)
+ {
+ string deviceFile = tempRoom.DeviceUIFilePathList[i];
+ //杩欎釜璁惧鏂囦欢鍖归厤寰楀埌鎴块棿
+ listDeviceFile.Remove(deviceFile);
+ if (this.IsFileExists(deviceFile) == false)
+ {
+ //绉婚櫎鎺夎繖涓笉瀵瑰姴鐨勮矾寰�
+ tempRoom.DeviceUIFilePathList.RemoveAt(i);
+ i--;
+ continue;
+ }
+ tempRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFile));
+ }
+ //杩樺師鍦烘櫙瀵硅薄
+ tempRoom.SceneUIList.Clear();
+ for (int i = 0; i < tempRoom.SceneUIFilePathList.Count; i++)
+ {
+ string uiPath = tempRoom.SceneUIFilePathList[i];
+ //杩欎釜鍦烘櫙鏂囦欢鍖归厤寰楀埌鎴块棿
+ listSceneFile.Remove(uiPath);
+ var byteData = this.GetShardFileContent(uiPath);
+ if (byteData == null)
+ {
+ //绉婚櫎鎺夎繖涓笉瀵瑰姴鐨勮矾寰�
+ tempRoom.SceneUIFilePathList.RemoveAt(i);
+ i--;
+ continue;
+ }
+ string valueData = System.Text.Encoding.UTF8.GetString(byteData);
+ var tempUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(valueData);
+ tempRoom.SceneUIList.Add(tempUi);
+
+ //鑾峰彇鍦烘櫙閲岄潰鐨勫叏閮ㄧ洰鏍�(2019.11.05杩藉姞鎿嶄綔,鏈夊彲鑳介偅涓澶囨槸鐢卞満鏅祵濂楁潵鐨�,鎵�浠ュ畠鏈夊彲鑳戒笉灞炰簬浠讳綍鎴块棿)
+ foreach (var data in tempUi.AddSceneMemberDataList)
+ {
+ //璁惧
+ if (data.Type == 0)
+ {
+ string mainkey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
+ if (dicShardDeviceFile.ContainsKey(mainkey) == true )
+ {
+ //杩欎釜璁惧鏂囦欢鍖归厤寰楀埌
+ listDeviceFile.Remove(dicShardDeviceFile[mainkey]);
+ }
+ }
+ if (data.Type == 1)
+ {
+ var temp = new SceneUI();
+ temp.Id = data.ElseScenesId;
+ //杩欎釜鍦烘櫙鏂囦欢鍖归厤寰楀埌
+ listSceneFile.Remove(temp.FileName);
+ }
+ }
+ }
+ }
+ //濡傛灉瀛樺湪鍖归厤涓嶄笂鐨勬枃浠�
+ if (listDeviceFile.Count != 0 || listSceneFile.Count != 0)
+ {
+ //鍒涘缓涓�涓复鏃舵埧闂存潵瀛樺偍
+ var roomTemp = new Room();
+ roomTemp.Id = "Other";
+ roomTemp.FloorId = "Other";
+ memberShardInfo.dicShardRoom[roomTemp.FileName] = roomTemp;
+ roomTemp.Name = Language.StringByID(R.MyInternationalizationString.uUnallocated);
+ //杩樺師璁惧瀵硅薄
+ foreach (string deviceFile in listDeviceFile)
+ {
+ roomTemp.DeviceUIFilePathList.Add(deviceFile);
+ roomTemp.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFile));
+ }
+ //杩樺師鍦烘櫙瀵硅薄
+ foreach (string uiPath in listSceneFile)
+ {
+ var byteData = this.GetShardFileContent(uiPath);
+ string valueData = System.Text.Encoding.UTF8.GetString(byteData);
+ var tempUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(valueData);
+ roomTemp.SceneUIList.Add(tempUi);
+ }
+ }
+ }
+
#endregion
@@ -833,6 +870,9 @@
listFile.Add(device.FilePath);
this.AddShardFile(device.FilePath);
+ //鍔犵偣缂撳瓨
+ this.dicShardDeviceFile[LocalDevice.Current.GetDeviceMainKeys(device)] = device.FilePath;
+
//璁惧鐨刄I
var deviceUi = device.FilePath;
if (roomTemp.DeviceUIFilePathList.Contains(deviceUi) == false)
@@ -846,6 +886,9 @@
//璁惧
listFile.Add(device.FilePath);
this.AddShardFile(device.FilePath);
+
+ //鍔犵偣缂撳瓨
+ this.dicShardDeviceFile[LocalDevice.Current.GetDeviceMainKeys(device)] = device.FilePath;
}
//鍦烘櫙
@@ -889,7 +932,7 @@
}
/// <summary>
- /// 浠庣綉鍏宠幏鍙栧満鏅殑鐩爣璁惧鍒楄〃
+ /// 鑾峰彇鍦烘櫙鐨勭洰鏍囪澶囧垪琛�(杩欎釜涓嶈兘浠庡垎浜暟鎹腑鑾峰彇)
/// </summary>
/// <param name="scene">鍦烘櫙</param>
/// <param name="listCheck">閲嶅妫�娴嬬敤</param>
@@ -1431,7 +1474,6 @@
}
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
- ;
for (int i = 0; i < listDeleteFile.Count; i++)
{
string fileName = listDeleteFile[i];
@@ -1638,7 +1680,7 @@
}
/// <summary>
- /// 浠庡満鏅璞￠噷闈㈣幏鍙栧叏閮ㄧ殑缁戝畾鐩爣鐨勬枃浠跺悕瀛�
+ /// 浠庡満鏅璞￠噷闈㈣幏鍙栧叏閮ㄧ殑缁戝畾鐩爣鐨勬枃浠跺悕瀛�(杩欓噷闈㈢殑涓滆タ蹇呴』浠庡垎浜暟鎹腑鑾峰彇)
/// </summary>
/// <param name="scene">鍦烘櫙</param>
/// <param name="listFile">鏂囦欢鍒楄〃(閲岄潰瀛樼殑鏄澶嘦I鏂囦欢鍜岃澶囨枃浠跺拰鍦烘櫙鏂囦欢)</param>
@@ -1650,10 +1692,10 @@
//璁惧
if (data.Type == 0)
{
- var device = Common.LocalDevice.Current.GetDevice(data.DeviceAddr, data.Epoint);
- if (device != null && listFile.Contains(device.FilePath) == false)
+ string mainkey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
+ if (dicShardDeviceFile.ContainsKey(mainkey) == true && listFile.Contains(dicShardDeviceFile[mainkey]) == false)
{
- listFile.Add(device.FilePath);
+ listFile.Add(dicShardDeviceFile[mainkey]);
}
}
if (data.Type == 1)
@@ -1665,13 +1707,10 @@
{
string valueData = System.Text.Encoding.UTF8.GetString(byteData);
var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(valueData);
- if (roomTemp != null)
+ dicBindScene[roomTemp.FileName] = roomTemp;
+ if (listFile.Contains(roomTemp.FileName) == false)
{
- dicBindScene[roomTemp.FileName] = roomTemp;
- if (listFile.Contains(roomTemp.FileName) == false)
- {
- listFile.Add(roomTemp.FileName);
- }
+ listFile.Add(roomTemp.FileName);
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
index d413616..470479a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
@@ -16,6 +16,18 @@
/// 褰撳墠閫夋嫨鐨勭綉鍏�
/// </summary>
private AC deviceAc = null;
+ /// <summary>
+ /// 涓婃姤鐨勬暟鎹�(鐢ㄤ簩杩涘埗鏉ョ帺鑷畾涔夋ā寮� 0:鍒跺喎 1:鍒剁儹 2:閫侀 3:闄ゆ箍 4:鑷姩 5~7:澶囩敤)
+ /// </summary>
+ private string reportValue = null;
+ /// <summary>
+ /// 鏃х殑鏁版嵁
+ /// </summary>
+ private string oldReportValue = null;
+ /// <summary>
+ /// 鍥哄畾棰勭暀鐨勬暟鎹�
+ /// </summary>
+ private string fixValue = null;
#endregion
@@ -31,6 +43,9 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAirConditionerMode));
+
+ //璇诲彇绌鸿皟鑷畾涔夋ā寮�
+ this.ReadAirConditionerModeSupport();
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
@@ -50,27 +65,71 @@
listView.Height = bodyFrameLayout.Height + Application.GetRealHeight(6);
bodyFrameLayout.AddChidren(listView);
- //鍒跺喎
- this.AddAirConditionerModeRow(listView, "AC/Mode_Cool2.png", Language.StringByID(R.MyInternationalizationString.uMode_Cool), 1);
- //鍒剁儹
- this.AddAirConditionerModeRow(listView, "AC/Mode_Heat2.png", Language.StringByID(R.MyInternationalizationString.uMode_Heat), 2);
- //鑷姩
- this.AddAirConditionerModeRow(listView, "AC/Mode_AutoSelected.png", Language.StringByID(R.MyInternationalizationString.uMode_Auto), 3);
- //閫侀
- this.AddAirConditionerModeRow(listView, "AC/Mode_Fan2.png", Language.StringByID(R.MyInternationalizationString.uMode_FanOnly), 4);
- //闄ゆ箍
- this.AddAirConditionerModeRow(listView, "AC/Mode_Dry2.png", Language.StringByID(R.MyInternationalizationString.uMode_Dry), 5);
-
- listView.AdjustRealHeight(Application.GetRealHeight(23));
-
- //淇濆瓨
- var btnOk = new BottomClickButton();
- btnOk.TextID = R.MyInternationalizationString.uSave;
- bodyFrameLayout.AddChidren(btnOk);
- btnOk.ButtonClickEvent += (sender, e) =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- this.CloseForm();
- };
+ //寮�鍚繘搴︽潯
+ this.ShowProgressBar();
+ int timeOut = 0;
+ while (this.reportValue == null && timeOut <= 30)
+ {
+ System.Threading.Thread.Sleep(100);
+ timeOut++;
+ }
+ if (this.reportValue == null)
+ {
+ //鑾峰彇绌鸿皟妯″紡澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uGetAcModeFail);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂");
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return;
+ }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍒跺喎
+ this.AddAirConditionerModeRow(listView, "AC/Mode_Cool2.png", Language.StringByID(R.MyInternationalizationString.uMode_Cool), 0);
+ //鍒剁儹
+ this.AddAirConditionerModeRow(listView, "AC/Mode_Heat2.png", Language.StringByID(R.MyInternationalizationString.uMode_Heat), 1);
+ //鑷姩
+ this.AddAirConditionerModeRow(listView, "AC/Mode_AutoSelected.png", Language.StringByID(R.MyInternationalizationString.uMode_Auto), 4);
+ //閫侀
+ this.AddAirConditionerModeRow(listView, "AC/Mode_Fan2.png", Language.StringByID(R.MyInternationalizationString.uMode_FanOnly), 2);
+ //闄ゆ箍
+ this.AddAirConditionerModeRow(listView, "AC/Mode_Dry2.png", Language.StringByID(R.MyInternationalizationString.uMode_Dry), 3);
+
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+
+ //淇濆瓨
+ var btnOk = new BottomClickButton();
+ btnOk.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnOk);
+ btnOk.ButtonClickEvent += async (sender, e) =>
+ {
+ if (this.oldReportValue == this.reportValue)
+ {
+ //鏁版嵁鐩稿悓,涓嶉渶瑕佷慨鏀�
+ this.CloseForm();
+ return;
+ }
+ //灏嗕簩杩涘埗杞崲涓哄崄杩涘埗
+ var data = Convert.ToInt32(this.fixValue + this.reportValue, 2);
+ var result = await HdlDeviceAirConditionerLogic.Current.SetAcModeSupport(deviceAc, data);
+ if (result == true)
+ {
+ //鏇存敼缂撳瓨
+ for (int i = 0; i < this.reportValue.Length; i++)
+ {
+ deviceAc.listSupportMode[i] = Convert.ToInt32(reportValue[i]);
+ }
+ deviceAc.ReSave();
+ this.CloseForm();
+ }
+ };
+ });
+ });
}
/// <summary>
@@ -90,21 +149,83 @@
//鏄剧ず鏂囨湰
var btnText = rowFrame.AddLeftCaption(textValue, 400);
btnText.TextSize = 15;
- if (div != 5)
+ if (div != 3)
{
//搴曠嚎
rowFrame.AddBottomLine();
}
//閫夋嫨
var btnSelect = rowFrame.AddMostRightEmptyIcon(58, 58);
- btnSelect.Visible = false;
+ if (this.reportValue[div] == '0')
+ {
+ btnSelect.Visible = false;
+ }
btnSelect.UnSelectedImagePath = "Item/ItemSelected.png";
rowFrame.ButtonClickEvent += (sender, e) =>
{
btnSelect.Visible = !btnSelect.Visible;
+ //鍙樻洿鍊�
+ if (btnSelect.Visible == true)
+ {
+ this.reportValue = reportValue.Substring(0, div) + "1" + reportValue.Substring(div + 1);
+ }
+ else
+ {
+ this.reportValue = reportValue.Substring(0, div) + "0" + reportValue.Substring(div + 1);
+ }
};
}
#endregion
+
+ #region 鈻� 璇诲彇绌鸿皟鑷畾涔夋ā寮廮________________
+
+ /// <summary>
+ /// 璇诲彇绌鸿皟鑷畾涔夋ā寮�
+ /// </summary>
+ private void ReadAirConditionerModeSupport()
+ {
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(deviceAc);
+ HdlDeviceAttributeLogic.Current.AddAttributeEvent("ReadAirConditionerModeSupport", "DeviceStatusReport", (report) =>
+ {
+ string checkKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (checkKeys != mainkeys || report.DeviceStatusReport.CluterID != 513)
+ {
+ return;
+ }
+ for (int i = 0; i < report.DeviceStatusReport.AttriBute.Count; i++)
+ {
+ var data = report.DeviceStatusReport.AttriBute[i];
+ if (data.AttributeId == 4099)
+ {
+ HdlDeviceAttributeLogic.Current.RemoveEvent("ReadAirConditionerModeSupport");
+ //杞崲涓轰簩杩涘埗
+ var value = Convert.ToString(data.AttriButeData, 2).PadLeft(16, '0');
+ //杩欎簲涓缃槸鏀惧湪鍚庨潰鐨�
+ this.fixValue = value.Substring(0, value.Length - 5);
+ this.reportValue = value.Substring(this.fixValue.Length);
+ oldReportValue = reportValue;
+ }
+ }
+ });
+ //鍙戦�佽鍙栫┖璋冭嚜瀹氫箟妯″紡
+ deviceAc.ReadModeSupport();
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseForm()
+ {
+ HdlDeviceAttributeLogic.Current.RemoveEvent("ReadAirConditionerModeSupport");
+
+ base.CloseForm();
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
index ad4b485..fb7754d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
@@ -206,7 +206,7 @@
if (i != 0 && i % 5 == 0)
{
//璇诲彇5涓悗锛岄棿闅斾竴娈垫椂闂�
- System.Threading.Thread.Sleep(500);
+ System.Threading.Thread.Sleep(200);
if (this.Parent == null)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
index 215a333..f39ebc4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
@@ -389,6 +389,7 @@
});
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
}
}
catch { }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index 71cf137..2cb58a4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -121,30 +121,33 @@
//鏇存柊鐘舵�佸彉鍖栫殑浜嬩欢
updateLogic.UpdateStatuChangedEvent += (div, msg) =>
{
- if (div == -1)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //寮傚父
- this.ShowMassage(ShowMsgType.Tip, msg);
- this.CloseForm();
- }
- else if (div == 0)
- {
- //涓�鑸俊鎭�
- btnText.Text = msg;
- }
- else if (div == 1)
- {
- //鍗囩骇瀹屾垚
- this.ShowMassage(ShowMsgType.Tip, msg);
- //璋冪敤鍥炶皟鍑芥暟
- this.FinishUpdateEvent?.Invoke();
- this.CloseForm();
- }
- else if (div == 2)
- {
- //涓诲姩缁堟鍗囩骇
- this.CloseForm();
- }
+ if (div == -1)
+ {
+ //寮傚父
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ this.CloseForm();
+ }
+ else if (div == 0)
+ {
+ //涓�鑸俊鎭�
+ btnText.Text = msg;
+ }
+ else if (div == 1)
+ {
+ //鍗囩骇瀹屾垚
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ //璋冪敤鍥炶皟鍑芥暟
+ this.FinishUpdateEvent?.Invoke();
+ this.CloseForm();
+ }
+ else if (div == 2)
+ {
+ //涓诲姩缁堟鍗囩骇
+ this.CloseForm();
+ }
+ });
};
//杩涘害鍊兼敼鍙樹簨浠�
updateLogic.ProgressEvent += (value) =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index ad78427..a17a61c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -216,7 +216,6 @@
//鍚戝彸鍥炬爣
var btnRight = rowMenu.frameTable.AddMostRightEmptyIcon(58, 58);
rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);
- btnRight.UseClickStatu = false;
btnRight.UnSelectedImagePath = "Item/Next.png";
btnRight.SelectedImagePath = "Item/Down.png";
@@ -1016,6 +1015,10 @@
{
//鑾峰彇鏈湴缃戝叧瀵硅薄
ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId);
+ if (zbway == null)
+ {
+ return;
+ }
btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index aca18a0..3a76b64 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -31,7 +31,11 @@
/// <summary>
/// 涓婚闂寸殑瓒呮椂鏃堕棿 -100:涓柇绾跨▼(鍗曚綅锛氱)
/// </summary>
- private int topTimeOut = 60;
+ private int topTimeOut = 120;
+ /// <summary>
+ /// 瓒呮椂鏈�澶ф椂闂�
+ /// </summary>
+ private int topMaxTime = 120;
/// <summary>
/// 鐢婚潰ID,鏍囪瀹冪敱鍝釜鐣岄潰璋冪敤骞舵墦寮�鐨�
/// </summary>
@@ -366,7 +370,7 @@
{
if (topic == gatewayId + "/Device/DeviceAnnounce_Respon")
{
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//缃戝叧鍛婄煡瀹㈡埛绔湁璁惧澹版槑
this.SetDeviceProgressValue(1);
return 2;
@@ -383,7 +387,7 @@
HdlLogLogic.Current.WriteLog(-1, resultData);
return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(2);
return 2;
@@ -400,7 +404,7 @@
HdlLogLogic.Current.WriteLog(-1, resultData);
return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(3);
return 2;
@@ -417,7 +421,7 @@
//HdlLogLogic.Current.WriteLog(-1, resultData);
return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(4);
return 2;
@@ -434,7 +438,7 @@
HdlLogLogic.Current.WriteLog(-1, resultData);
return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(5);
return 2;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
index 5d915c2..93a48b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -145,7 +145,7 @@
//绗笁鏂硅澶�
objectText = Language.StringByID(R.MyInternationalizationString.uThirdPartyDevice);
- unSelectPic = "Item/ThirdPartyDevice.png";
+ unSelectPic = "Device/ThirdPartyDevice.png";
var rowThrid = this.AddMenuRow(objectText, unSelectPic, string.Empty, false);
rowThrid.ButtonClickEvent += (sender, e) =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
index 4392984..046fa30 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 绌鸿皟鐨勬坊鍔犳楠ょ晫闈�
/// </summary>
- public class AirConditionerZbGatewayDirectionForm : EditorCommonForm
+ public class AirConditionerZbGatewayDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(893);
@@ -95,37 +92,6 @@
msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
msg3.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg3);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs
index a250189..2c2f206 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 绌烘皵寮�鍏崇殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class AirSwitchCloudContrDirectionForm : EditorCommonForm
+ public class AirSwitchCloudContrDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(858);
@@ -108,37 +105,6 @@
msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
msg3.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg3);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs
new file mode 100755
index 0000000..590f42d
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CommonForm/DirectionCommonForm.cs
@@ -0,0 +1,52 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.DeviceDirection
+{
+ /// <summary>
+ /// 璁惧鍏ョ綉鐣岄潰鐨勫叡閫氱晫闈�
+ /// </summary>
+ public class DirectionCommonForm : EditorCommonForm
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鍒濆鍖�
+ /// </summary>
+ public override void InitForm()
+ {
+ base.InitForm();
+
+ //鍒濆鍖栧府鍔╂帶浠�
+ this.InitHelpControl();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栧府鍔╂帶浠�
+ /// </summary>
+ private void InitHelpControl()
+ {
+ //鏌ョ湅甯姪
+ var btnHelp = this.AddHelpControl();
+ btnHelp.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceDirectionHelpForm();
+ form.AddForm("Device");
+ };
+ bodyFrameLayout.AddChidren(btnHelp);
+
+ //涓嬩竴姝�
+ var btnNext = new BottomClickButton();
+ btnNext.TextID = R.MyInternationalizationString.uNextway;
+ bodyFrameLayout.AddChidren(btnNext);
+ btnNext.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new Device.DeviceSearchForm();
+ form.AddForm(this.FormID);
+ };
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs
index 2751f57..5dae3ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鐨勬坊鍔犳楠ょ晫闈�
/// </summary>
- public class CurtainAutoOpenDirectionForm : EditorCommonForm
+ public class CurtainAutoOpenDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(873);
@@ -95,36 +92,6 @@
msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
msg3.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg3);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainSiphonateDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainSiphonateDirectionForm.cs
index 462d413..6187bf4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainSiphonateDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainSiphonateDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// Zigbee鏅鸿兘绠＄姸鐢垫満鐨勬坊鍔犳楠ょ晫闈�
/// </summary>
- public class CurtainSiphonateDirectionForm : EditorCommonForm
+ public class CurtainSiphonateDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(887);
@@ -95,36 +92,6 @@
msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
msg3.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg3);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs
index 2a8ee07..adb0a07 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 1璺皟鍏夊櫒灏忔ā鍧楃殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class DimmableLightOneLoadDirectionForm : EditorCommonForm
+ public class DimmableLightOneLoadDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(873);
@@ -93,37 +90,7 @@
}
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
index 899a984..8ed318f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
@@ -33,15 +33,15 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- if (i_deviceDiv == "Gateway")
- {
- //鍒濆鍖栫綉鍏冲府鍔╂帶浠�
- this.InitGatewayHelpControl();
- }
- else
+ if (i_deviceDiv == "Device")
{
//鍒濆鍖栬澶囧府鍔╂帶浠�
this.InitDeviceHelpControl();
+ }
+ else
+ {
+ //鍒濆鍖栫綉鍏冲府鍔╂帶浠�
+ this.InitGatewayHelpControl();
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs
index 07e3351..6384c9a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鏅鸿兘闂ㄩ攣鐨勬坊鍔犳楠ょ晫闈�
/// </summary>
- public class IntelligentLocksH06cDirectionForm : EditorCommonForm
+ public class IntelligentLocksH06cDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var btnPic = new PicViewControl(524, 619, true);
btnPic.UnSelectedImagePath = "Instruct/IntelligentLocksH06C.png";
@@ -66,37 +63,7 @@
}
msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
msg3.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg3);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
+ bodyFrameLayout.AddChidren(msg3);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs
index 0879f87..5bcf6e8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鍥涙寜閿潰鏉跨殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class PanelFourButtonDirectionForm : EditorCommonForm
+ public class PanelFourButtonDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(835);
@@ -84,37 +81,7 @@
}
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
index eaaa08f..ab7c507 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 涓夋寜閿潰鏉跨殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class PanelThreeButtonDirectionForm : EditorCommonForm
+ public class PanelThreeButtonDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(835);
@@ -84,37 +81,7 @@
}
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
index 12bf833..dcd81d1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 浜屾寜閿潰鏉跨殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class PanelTwoButtonDirectionForm : EditorCommonForm
+ public class PanelTwoButtonDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(835);
@@ -84,37 +81,7 @@
}
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs
index 54b0504..355df9c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 3璺户鐢靛櫒灏忔ā鍧楃殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class RelayThreeLoadDirectionForm : EditorCommonForm
+ public class RelayThreeLoadDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(873);
@@ -93,37 +90,7 @@
}
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RepeaterZigbeeDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RepeaterZigbeeDirectionForm.cs
index c8d7ee9..dad0545 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RepeaterZigbeeDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RepeaterZigbeeDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 绌烘皵寮�鍏崇殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class RepeaterZigbeeDirectionForm : EditorCommonForm
+ public class RepeaterZigbeeDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(878);
@@ -85,37 +82,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs
index 8b499fe..a66f80b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鐕冩皵浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorCarbonMonoxideDirectionForm : EditorCommonForm
+ public class SensorCarbonMonoxideDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(861);
@@ -86,37 +83,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorDoorWindowDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorDoorWindowDirectionForm.cs
index 272cf22..cd71d66 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorDoorWindowDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorDoorWindowDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 闂ㄧ獥浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorDoorWindowDirectionForm : EditorCommonForm
+ public class SensorDoorWindowDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(877);
@@ -99,37 +96,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorFireDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorFireDirectionForm.cs
index 04c4bd9..f579a2c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorFireDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorFireDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鐑熼浘浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorFireDirectionForm : EditorCommonForm
+ public class SensorFireDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(861);
@@ -85,37 +82,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
index f121f5b..9063711 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 绾㈠浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorInfraredDirectionForm : EditorCommonForm
+ public class SensorInfraredDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(988);
@@ -104,37 +101,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs
index 5a2f99f..060a400 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// PIR浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorPirDirectionForm : EditorCommonForm
+ public class SensorPirDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
////鍥剧墖
//var framePic = new FrameLayout();
//framePic.Width = Application.GetMinRealAverage(873);
@@ -94,36 +91,6 @@
//msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
//msg2.TextAlignment = TextAlignment.Center;
//bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorWaterDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorWaterDirectionForm.cs
index 41f3bd3..d681c51 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorWaterDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorWaterDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 姘存蹈浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorWaterDirectionForm : EditorCommonForm
+ public class SensorWaterDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,9 +28,6 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(861);
@@ -71,37 +68,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
-
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- btnHelp.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceDirectionHelpForm();
- form.AddForm(string.Empty);
- };
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- //涓嬩竴姝�
- var btnNext = new BottomClickButton();
- btnNext.TextID = R.MyInternationalizationString.uNextway;
- bodyFrameLayout.AddChidren(btnNext);
- btnNext.ButtonClickEvent += (sender, e) =>
- {
- var form = new Device.DeviceSearchForm();
- form.AddForm(this.FormID);
- };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
index 084d98a..910f6da 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
@@ -40,7 +40,7 @@
{
currentTitle = Language.StringByID(R.MyInternationalizationString.AddFingerprint);
}
- else
+ else if (currentType == "proximity")
{
currentTitle = Language.StringByID(R.MyInternationalizationString.AddIcCard);
}
@@ -178,7 +178,7 @@
btnPicTip1.X = Application.GetRealWidth(450);
btnPicTip5.Text = Language.StringByID(R.MyInternationalizationString.EntryTip);
}
- else
+ else if (currentType == "proximity")
{
topMidFrameLayout.BackgroundImagePath = "DoorLock/AddIcCardTipPic.png";
btnPicTip3.Width = Application.GetRealWidth(495);
@@ -214,21 +214,48 @@
var ProgrammingEventNotificationData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockProgrammingEventNotificationCommand>(jObjectdata["Data"].ToString());
if (ProgrammingEventNotificationData != null)
{
- doorLock.doorLockProgrammingEventNotificationCommand = ProgrammingEventNotificationData;
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = ProgrammingEventNotificationData.UserID;
- localDoorLockObj.UnlockType = ProgrammingEventNotificationData.ProgramEventSoure;
- //var entryTime = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime);
- localDoorLockObj.EntryTime = System.DateTime.Now; //entryTime;
- if (!doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj.UserID))
+ int curMethod = -1;
+ if (currentType == "password")
{
- doorLock.localDoorLockUserList.Add(ProgrammingEventNotificationData.UserID, localDoorLockObj);
+ curMethod = 0;
}
- Application.RunOnMainThread(() =>
+ else if (currentType == "fingerprint")
{
- nextBtn.Enable = true;
- nextBtn.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- });
+ curMethod = 15;
+ }
+ else if (currentType == "proximity")
+ {
+ curMethod = 3;
+ }
+ else
+ {
+ return;
+ }
+ if (ProgrammingEventNotificationData.ProgramEventSoure == curMethod)
+ {
+ doorLock.doorLockProgrammingEventNotificationCommand = ProgrammingEventNotificationData;
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = ProgrammingEventNotificationData.UserID;
+ localDoorLockObj.UnlockType = ProgrammingEventNotificationData.ProgramEventSoure;
+ localDoorLockObj.EntryTime = System.DateTime.Now;
+ //鍏堟殏鏃跺姞鍏ワ紝绛変簯绔坊鍔犲拰鑾峰彇鐪熸鎴愬姛鍚庢墠鐪熺殑鍔犲叆
+ if (!doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj.UserID))
+ {
+ doorLock.localDoorLockUserList.Add(ProgrammingEventNotificationData.UserID, localDoorLockObj);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ nextBtn.Enable = true;
+ nextBtn.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ });
+ }
+ else
+ {
+ //Application.RunOnMainThread(() =>
+ //{
+ //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.EntryCurrentUnlockMethod), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ //});
+ }
}
}
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index ca94064..9fa27b6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -24,6 +24,29 @@
public static int InValidDateSecond = 0;
#endregion
+ public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> LocalAccountList()
+ {
+ return await System.Threading.Tasks.Task.Run(async () =>
+ {
+ List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ {
+ SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
+ }
+
+ // 娉ㄦ剰锛歋ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤,鈥滄坊鍔犻棬閿佲�濆埌浜戠淇℃伅涓紝CloudAccountId濡傛灉鏄瓙璐︽埛锛屽垯鏄疭ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤锛屽鏋滄槸绠＄悊鍛樻垨鑰呬富浜哄垯鏄櫥褰曞埌G
+ var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
+ masterAccount.Account = Shared.Common.Config.Instance.Account;
+ masterAccount.AccountType = Shared.Common.Config.Instance.AccountType;
+ masterAccount.SubAccountDistributedMark = Shared.Common.Config.Instance.Guid;
+ masterAccount.UserName = UserCenterResourse.UserInfo.UserName;
+ localAccountList.Add(masterAccount);
+ localAccountList.AddRange(SubAccounList);
+ return localAccountList;
+ });
+ }
+
/// <summary>
/// 鑾峰彇闂ㄩ攣鍖呭惈璁惧淇℃伅鍜岃处鎴蜂俊鎭�
/// </summary>
@@ -34,6 +57,14 @@
// 璇诲彇璁惧涓殑淇℃伅
doorLock.localDoorLockUserList.Clear();
var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
+ if (getDoorLockInfo == null)
+ {
+ doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
+ }
+ else
+ {
+ doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
+ }
if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
{
var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
@@ -53,24 +84,15 @@
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
-
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- localDoorLockObj.IsOtherAccountCtrl = true;
- }
-
- localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
-
- {
- localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
-
+ var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, curAccountObj.SubAccountDistributedMark);
if (getDoorLockInfoList != null)
{
foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
{
+ if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ {
+ continue;
+ }
if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
{
var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
@@ -82,28 +104,215 @@
doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
}
- else
- {
- //闂ㄩ攣涓笉瀛樺湪鐢ㄦ埛ID锛屼簯绔瓨鍦紝闇�瑕佸湪杩欓噷鍒犻櫎浜戠瀛樺湪鐨勬暟鎹�
- var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- deleteDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
- deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
- deleteDoorLockData.DelDoorLockDelType = 2;
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- }
}
+
+ //鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭�
+ //foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
+ //{
+ // var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj();
+ // if (curDoorLockUser.DoorLockLocalUserId != null)
+ // {
+ // doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
+ // doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
+ // doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
+ // }
+ // doorLockObj.PrimaryId = curDoorLockUser.Id;
+ // doorLockObj.EntryTime = curDoorLockUser.EntryTime;
+ // doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
+ // if (doorLock.localDoorLockAccountList.ContainsKey(curDoorLockUser.CloudAccountId) == false)
+ // {
+ // doorLock.localDoorLockAccountList.Add(doorLockObj.ConnectedAccount, doorLockObj);
+ // }
+ // else
+ // {
+ // doorLock.localDoorLockAccountList[doorLockObj.ConnectedAccount] = doorLockObj;
+ // }
+
+ //}
+ doorLock.ReSave();
}
return doorLock.localDoorLockUserList;
}));
+ }
+
+ /// <summary>
+ /// 鑾峰彇浜戠瀛樺偍鐨勯棬閿佷俊鎭�
+ /// </summary>
+ public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetCloudLocalDoorLocklist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
+ {
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
+ {
+ // 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
+ var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
+
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.IsOtherAccountCtrl = true;
+ }
+
+ localDoorLockObj.CloudAccountId = subAccountDistributedMark;
+ if (doorLock.DeviceAddr != null)
+ {
+ localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+
+ var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
+
+ if (getDoorLockInfoList != null)
+ {
+ foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
+ {
+ if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ {
+ continue;
+ }
+ if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
+ {
+ var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
+ doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
+ doorLockObj.PrimaryId = curDoorLockUser.Id;
+ doorLockObj.EntryTime = curDoorLockUser.EntryTime;
+ doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
+ doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
+ doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
+ }
+ }
+
+ doorLock.ReSave();
+ }
+ return doorLock.localDoorLockUserList;
+ }));
+ }
+
+ /// <summary>
+ /// 鑾峰彇浜戠瀛樺偍鐨勬垚鍛樹俊鎭�
+ /// </summary>
+ public static async System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.CloudDoorLockObj>> GetAccountDoorLockUserList(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
+ {
+ List<ZigBee.Device.DoorLock.CloudDoorLockObj> curAccountDoorLockUserList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.CloudDoorLockObj>>>)(async () =>
+ {
+ // 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
+ var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, subAccountDistributedMark);
+ if (getDoorLockInfoList != null)
+ {
+ //鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭�
+ foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
+ {
+ if (curDoorLockUser.CloudAccountId == "" || curDoorLockUser.CloudAccountId != subAccountDistributedMark)
+ {
+ continue;
+ }
+ else
+ {
+ curAccountDoorLockUserList.Add(curDoorLockUser);
+ }
+ }
+ }
+ return curAccountDoorLockUserList;
+ }));
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠璐︽埛闂ㄩ攣鐨勬墍鏈変俊鎭�
+ /// </summary>
+ public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllInfolist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
+ {
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
+ {
+ // 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
+ var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
+
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.IsOtherAccountCtrl = true;
+ }
+
+ localDoorLockObj.CloudAccountId = subAccountDistributedMark;
+ if (doorLock.DeviceAddr != null)
+ {
+ localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+
+ var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
+ return getDoorLockInfoList;
+ }));
+ }
+
+ /// <summary>
+ /// 鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭�
+ /// </summary>
+ public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
+ {
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
+ {
+ // 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
+ var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.IsOtherAccountCtrl = true;
+ }
+ localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+ {
+ localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
+ if (getDoorLockInfoList != null)
+ {
+ foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
+ {
+ var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ if (curDoorLockUser.DoorLockLocalUserId != null)
+ {
+ doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
+ doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
+ doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
+ }
+ doorLockObj.PrimaryId = curDoorLockUser.Id;
+ doorLockObj.EntryTime = curDoorLockUser.EntryTime;
+ doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
+ if (doorLock.localDoorLockAccountList.ContainsKey(curDoorLockUser.CloudAccountId) == false)
+ {
+ doorLock.localDoorLockAccountList.Add(doorLockObj.ConnectedAccount, doorLockObj);
+ }
+ else
+ {
+ doorLock.localDoorLockAccountList[curDoorLockUser.DoorLockLocalUserId] = doorLockObj;
+ }
+
+ }
+ }
+ return doorLock.localDoorLockUserList;
+ }));
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏈湴鍖归厤鎴愬憳鐨勯棬閿佺敤鎴蜂俊鎭垪琛�
+ /// </summary>
+ public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
+ {
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
+ {
+ var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();
+ foreach (var curUserId in doorLock.localDoorLockAccountList.Keys)
+ {
+ var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];
+
+ if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
+ {
+ continue;
+ }
+ else
+ {
+ curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
+ }
+ }
+ return curAccountDoorLockUserList;
+ }));
}
/// <summary>
@@ -156,7 +365,7 @@
/// <para>绠＄悊鍛�10涓紝0~9锛�</para>
///<para>鏅�氱敤鎴�220涓紝10~234</para>
///<para>涓�娆℃�х敤鎴�10涓紝235~245</para>
///<para>涓存椂瀵嗙爜瀵嗙爜10涓紝245~255锛�</para>
///<para>鍏朵腑鎸囩汗100锛屽瘑鐮�100锛屽崱56</para>
///<para>闂ㄩ攣鏈湴褰曞叆鐨勫瘑鐮併�佹寚绾广�佹劅搴斿崱閮芥湁鍞竴瀵瑰簲鐨勭敤鎴稩d</para>
/// </summary>
- public int UserID;
+ public int UserID = -1;
/// <summary>
/// 寮�閿佺被鍨�
/// <para>甯哥敤锛�</para>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index c79064c..a78b742 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -96,6 +96,14 @@
};
/// <summary>
+ /// 鏍囬杩斿洖鎸夐敭
+ /// </summary>
+ public Button btnTip = new Button
+ {
+ Gravity = Gravity.Center,
+ };
+
+ /// <summary>
/// 鏍囬涓嬬嚎
/// </summary>
public Button btnTitleLine = new Button
@@ -143,6 +151,7 @@
titleFrameLayout.AddChidren(title);
titleFrameLayout.AddChidren(btnBackFrameLayout);
btnBackFrameLayout.AddChidren(btnBack);
+ this.midFrameLayout.AddChidren(this.btnTip);
}
/// <summary>
/// 闂ㄩ攣涓儴甯冨眬
@@ -353,11 +362,23 @@
};
doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
{
- var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
- dialog.Close();
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ {
+ var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
+ dialog.Close();
+ }
+ else
+ {
+ var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
+ dialog.Close();
+ }
+
};
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index 0204744..54e6830 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -26,7 +26,6 @@
Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
string currentType = string.Empty;
FrameLayout bottomFrameLayout;
-
#endregion
/// <summary>
@@ -169,7 +168,6 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
- Text = curAccountObj.UserName,
};
personRemarkRemarkFrameLayout.AddChidren(btnMatchPersonContent);
@@ -203,6 +201,14 @@
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.ProximityRemark);
btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.ProximityCard) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
}
+ if (curAccountObj.UserName != "" && curAccountObj.UserName != null)
+ {
+ btnMatchPersonContent.Text = curAccountObj.UserName;
+ }
+ else
+ {
+ btnMatchPersonContent.Text = curAccountObj.Account;
+ }
completeBtn.MouseDownEventHandler += async (sender, e) =>
{
@@ -232,47 +238,65 @@
}
try
{
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(doorLock.doorLockProgrammingEventNotificationCommand.UserID);
-
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = doorLock.doorLockProgrammingEventNotificationCommand.UserID;
- localDoorLockObj.UnlockType = addLockInfo.OpenLockMode;
- localDoorLockObj.EntryTime = addLockInfo.EntryTime;
- localDoorLockObj.UserName = addLockInfo.UserIdRemarks;
- localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
- doorLock.localDoorLockUserList.Add(doorLock.doorLockProgrammingEventNotificationCommand.UserID, localDoorLockObj);
-
- completeBtn.Enable = true;
- this.RemoveFromParent();
-
- for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
+ if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
{
- var form = UserView.HomePage.Instance.GetChildren(i);
+ //瀛樿处鎴蜂俊鎭�
+ // var resultList1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountObj.SubAccountDistributedMark);
+ //瀛橀棬閿佷俊鎭�
+ var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountObj.SubAccountDistributedMark);
+ if (resultList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID) == true)
+ {
+ var a = resultList[doorLock.doorLockProgrammingEventNotificationCommand.UserID];
+ if (a?.ConnectedAccount == curAccountObj.SubAccountDistributedMark)
+ {
+ completeBtn.Enable = true;
+ this.RemoveFromParent();
+ for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
+ {
+ var form = UserView.HomePage.Instance.GetChildren(i);
- if (form is UnLockMethod)
- {
- ((UnLockMethod)form).RefreshList();
- break;
- }
- else
- {
- form.RemoveFromParent();
+ if (form is UnLockMethod)
+ {
+ ((UnLockMethod)form).RefreshList();
+ break;
+ }
+ else
+ {
+ form.RemoveFromParent();
+ }
+ }
+ }
+ else
+ {
+ completeBtn.Enable = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
+ }
}
}
+ }
+ else
+ {
+ completeBtn.Enable = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
}
}
else
{
completeBtn.Enable = true;
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
}
}
catch { }
+ finally
+ {
+ CommonPage.Loading.Hide();
+ }
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index b7eea61..7e1b6b2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using Shared.Common;
using ZigBee.Device;
@@ -125,13 +126,14 @@
{
Width = Application.GetRealWidth(58),
Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(46)
};
btnNextFrameLayout.AddChidren(btnNext);
var btnLine = new FrameLayout()
{
Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(5),
+ Height = Application.GetRealHeight(2),
X = Application.GetRealWidth(58),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
Visible = false,
@@ -140,49 +142,50 @@
if (i == 0)
{
- bottomRowLayout.Y = Application.GetRealHeight(204);
+ bottomRowLayout.Y = Application.GetRealHeight(220);
btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = btnName.Right;
+ btnNextFrameLayout.X = Application.GetRealWidth(233);
btnNext.TextAlignment = TextAlignment.CenterLeft;
- btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
btnNext.Text = doorLock.DeviceName;
btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(308);
+ btnLine.Y = Application.GetRealHeight(303);
}
else if (i == 1)
{
- bottomRowLayout.Y = Application.GetRealHeight(343);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongZone) + ":";
- var btnArea = new Button()
+ bottomRowLayout.Y = Application.GetRealHeight(312);
+ bottomRowLayout.Height = Application.GetRealHeight(127);
+ btnName.Width = Application.GetRealWidth(0);
+ btnNextFrameLayout.Width = Application.GetRealWidth(0);
+ //鎵�灞炲尯鍩�
+ var rowBeloneArea = new BelongAreaControl(0);
+ bottomRowLayout.AddChidren(rowBeloneArea);
+
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), doorLock);
+ //搴曠嚎
+ rowBeloneArea.AddBottomLine();
+ rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
- Width = Application.GetRealWidth(789 - 109 - 58),
- Height = Application.GetRealHeight(58),
- X = btnName.Right,
- Y = btnName.Y,
- TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
- Text = "涓�妤硷紝瀹㈠巺",
- TextAlignment = TextAlignment.CenterLeft,
+ //鍙樻洿鎴块棿
+ Common.Room.CurrentRoom.ChangedRoom(doorLock, roomKeys);
};
- bottomRowLayout.AddChidren(btnArea);
- btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
- btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(446);
+ btnLine.Visible = false;
}
else if (i == 2)
{
bottomRowLayout.Y = Application.GetRealHeight(481);
btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = btnName.Right;
+ btnNextFrameLayout.X = Application.GetRealWidth(233);
btnNext.TextAlignment = TextAlignment.CenterLeft;
btnNext.Height = Application.GetRealHeight(58);
- btnNext.Text = "HDL-Doorlock";
- btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnNext.Text = doorLock.DeviceName;
+ btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(1025 - 449);
+ btnLine.Y = Application.GetRealHeight(575);
}
else if (i == 3)
{
@@ -192,18 +195,19 @@
btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(619 + 58 + 35);
+ btnLine.Y = Application.GetRealHeight(714);
}
else if (i == 4)
{
bottomRowLayout.Y = Application.GetRealHeight(723 + 35);
+ btnNext.X = Application.GetRealWidth(0);
btnName.Text = Language.StringByID(R.MyInternationalizationString.RemotelyUnlock);
btnNext.Width = Application.GetRealWidth(104);
btnNext.Height = Application.GetRealHeight(63);
btnNext.UnSelectedImagePath = "DoorLock/Switch.png";
btnNext.SelectedImagePath = "DoorLock/SwitchOn.png";
btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(723 + 127);
+ btnLine.Y = Application.GetRealHeight(853);
if (ZigBee.Device.DoorLock.RemoteUnlockPassword == "")
{
btnNext.IsSelected = false;
@@ -220,21 +224,32 @@
btnNextFrameLayout.Y = btnName.Y;
btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(861 + 127);
+ btnLine.Y = Application.GetRealHeight(992);
}
else if (i == 6)
{
bottomRowLayout.Y = Application.GetRealHeight(999 + 35);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.Shared);
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DoorLockShare);
btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
btnLine.Visible = true;
- btnLine.Y = Application.GetRealHeight(999 + 127);
+ btnLine.Y = Application.GetRealHeight(1131);
}
int currentIndex = i;
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
if (currentIndex == 1)
{
+ //鑾峰彇璁惧鎵�灞炴埧闂�
+ var aa = Common.Room.CurrentRoom.GetRoomByDevice(doorLock);
+ //鑾峰彇璁惧鎵�鍦ㄦゼ灞�
+ var bb = aa.FloorId;
+ //鑾峰彇璁惧鎵�鍦ㄦゼ灞�
+ var cc = aa.FloorId;
+ //鑾峰彇妤煎眰鐨勫悕瀛�
+ var dd = Common.Config.Instance.Home.GetFloorNameById(cc);
+ //if (Common.Config.Instance.Home.FloorDics.Count == 0)//杩欎釜鏄棤妤煎眰妯″紡
+
+ var listCheck = new List<string>();
}
else if (currentIndex == 3)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
new file mode 100755
index 0000000..5198645
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
@@ -0,0 +1,279 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.DoorLock
+{
+ public class FunctionSettingSub : DoorLockCommonLayout, ZigBee.Common.IStatus
+ {
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
+ /// <param name="doorLock"></param>
+ public FunctionSettingSub(ZigBee.Device.DoorLock doorLock)
+ {
+ this.doorLock = doorLock;
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
+ ZigBee.Device.ZbGateway.StatusList.Add(this);
+ }
+
+ #region 鈼� 鍙橀噺鐢虫槑__________________________
+ ZigBee.Device.DoorLock doorLock;
+ #endregion
+
+ /// <summary>
+ /// UI鏄剧ず
+ /// </summary>
+ public void Show()
+ {
+ this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.FunctionSetting));
+
+ EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+ this.btnBack.MouseUpEventHandler += eHandlerBack;
+ this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
+ this.MidFrameLayout(this);
+
+ MidFrameLayoutContent();
+ }
+
+ public void MidFrameLayoutContent()
+ {
+
+ var MidTopFrameLayout = new FrameLayout()
+ {
+ X = Application.GetRealWidth(449),
+ Y = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(184),
+ Height = Application.GetRealHeight(184),
+ BackgroundImagePath = "DoorLock/DoorlockPicture.png",
+ };
+ this.midFrameLayout.AddChidren(MidTopFrameLayout);
+ BottomFrameLayout();
+ }
+
+ public void BottomFrameLayout()
+ {
+ #region UI
+ var bottomFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(418),
+ Radius = 17,
+ BackgroundColor = ZigbeeColor.Current.XMWhite,
+ };
+ this.midFrameLayout.AddChidren(bottomFrameLayout);
+
+ var bottomFrameLayout1 = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(1319 - 50),
+ Y = Application.GetRealHeight(418 + 48),
+ BackgroundColor = ZigbeeColor.Current.XMWhite,
+ };
+ this.midFrameLayout.AddChidren(bottomFrameLayout1);
+
+ var bottomFrameLayout2 = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(1319),
+ Y = Application.GetRealHeight(418),
+ };
+ this.midFrameLayout.AddChidren(bottomFrameLayout2);
+
+ var informationEdit = new Button()
+ {
+ Height = Application.GetRealHeight(60),
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(81),
+ Text = Language.StringByID(R.MyInternationalizationString.InformationEdit),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 12,
+ };
+ bottomFrameLayout2.AddChidren(informationEdit);
+
+ for (int i = 0; i < 4; i++)
+ {
+ var bottomRowLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(58),
+ };
+ bottomFrameLayout2.AddChidren(bottomRowLayout);
+
+ var btnName = new Button()
+ {
+ Width = Application.GetRealWidth(233),
+ Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(58),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 12,
+ };
+ bottomRowLayout.AddChidren(btnName);
+
+ var btnNextFrameLayout = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(104),
+ Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(861 + 58),
+ };
+ bottomRowLayout.AddChidren(btnNextFrameLayout);
+
+ var btnNext = new Button()
+ {
+ Width = Application.GetRealWidth(58),
+ Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(46)
+ };
+ btnNextFrameLayout.AddChidren(btnNext);
+
+ var btnLine = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(965),
+ Height = Application.GetRealHeight(2),
+ X = Application.GetRealWidth(58),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ Visible = false,
+ };
+ bottomFrameLayout2.AddChidren(btnLine);
+
+ if (i == 0)
+ {
+ bottomRowLayout.Y = Application.GetRealHeight(220);
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
+ btnNextFrameLayout.X = Application.GetRealWidth(233);
+ btnNext.TextAlignment = TextAlignment.CenterLeft;
+ btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+ btnNext.Text = doorLock.DeviceName;
+ btnLine.Visible = true;
+ btnLine.Y = Application.GetRealHeight(303);
+ }
+ else if (i == 1)
+ {
+ bottomRowLayout.Y = Application.GetRealHeight(312);
+ bottomRowLayout.Height = Application.GetRealHeight(127);
+ btnName.Width = Application.GetRealWidth(0);
+ btnNextFrameLayout.Width = Application.GetRealWidth(0);
+ //鎵�灞炲尯鍩�
+ var rowBeloneArea = new BelongAreaControl(0);
+ bottomRowLayout.AddChidren(rowBeloneArea);
+
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), doorLock);
+ //搴曠嚎
+ rowBeloneArea.AddBottomLine();
+ rowBeloneArea.SelectRoomEvent += (roomKeys) =>
+ {
+ //鍙樻洿鎴块棿
+ //Common.Room.CurrentRoom.ChangedRoom(doorLock, roomKeys);
+ };
+ btnLine.Visible = false;
+ }
+ else if (i == 2)
+ {
+ bottomRowLayout.Y = Application.GetRealHeight(481);
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
+ btnNextFrameLayout.X = Application.GetRealWidth(233);
+
+ btnNext.TextAlignment = TextAlignment.CenterLeft;
+ btnNext.Height = Application.GetRealHeight(58);
+ btnNext.Text = doorLock.DeviceName;
+ btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+
+ btnLine.Visible = true;
+ btnLine.Y = Application.GetRealHeight(575);
+ }
+ else if (i == 3)
+ {
+ bottomRowLayout.Y = Application.GetRealHeight(723 + 35);
+ btnNext.X = Application.GetRealWidth(0);
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.RemotelyUnlock);
+ btnNext.Width = Application.GetRealWidth(104);
+ btnNext.Height = Application.GetRealHeight(63);
+ btnNext.UnSelectedImagePath = "DoorLock/Switch.png";
+ btnNext.SelectedImagePath = "DoorLock/SwitchOn.png";
+ btnLine.Visible = true;
+ btnLine.Y = Application.GetRealHeight(853);
+ if (ZigBee.Device.DoorLock.RemoteUnlockPassword == "")
+ {
+ btnNext.IsSelected = false;
+ }
+ else
+ {
+ btnNext.IsSelected = true;
+ }
+ }
+
+ int currentIndex = i;
+ EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+ {
+ if (currentIndex == 3)
+ {
+ //if (doorLock.HasRemoteUnlockAccess[acc.SubAccountDistributedMark] == true)
+ //{
+
+ //}
+ //else
+ //{
+
+ //}
+ btnNext.IsSelected = !btnNext.IsSelected;
+ if (btnNext.IsSelected)
+ {
+ if (ZigBee.Device.DoorLock.RemoteUnlockPassword == "")
+ {
+ RemotePasswordDialog(doorLock, btnNext);
+ }
+ }
+ else
+ {
+ ZigBee.Device.DoorLock.RemoteUnlockPassword = "";
+ }
+ }
+ };
+ bottomRowLayout.MouseDownEventHandler += eHandler;
+ btnNext.MouseDownEventHandler += eHandler;
+ btnName.MouseDownEventHandler += eHandler;
+ btnNextFrameLayout.MouseDownEventHandler += eHandler;
+ #endregion
+ }
+ }
+
+ #region 鈼� 鎺ュ彛瀹炵幇__________________________
+ /// <summary>
+ /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
+ /// </summary>
+ /// <returns>The changed.</returns>
+ /// <param name="common">Common.</param>
+ public void Changed(CommonDevice common)
+ {
+
+ }
+ /// <summary>
+ /// 澶勭悊鍙樺寲浜嬩欢
+ /// </summary>
+ /// <param name="common"></param>
+ /// <param name="typeTag"></param>
+ public void DeviceInfoChange(CommonDevice common, string typeTag)
+ {
+ }
+ /// <summary>
+ /// Changeds the IL ogic status.
+ /// </summary>
+ /// <param name="logic">Logic.</param>
+ public void ChangedILogicStatus(ZigBee.Device.Logic logic)
+ {
+ }
+ /// <summary>
+ /// Changeds the IS cene status.
+ /// </summary>
+ /// <param name="scene">Scene.</param>
+ public void ChangedISceneStatus(Scene scene)
+ {
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 82b875f..49fb50e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -28,7 +28,9 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
try
{
+ CommonDevice.DebugPrintLog($"11111111111111F");
await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
+ CommonDevice.DebugPrintLog($"11111111111111G");
}
catch { }
finally
@@ -36,6 +38,7 @@
Application.RunOnMainThread(() =>
{
MidFrameLayoutContent();
+ CommonDevice.DebugPrintLog($"11111111111111E");
CommonPage.Loading.Hide();
});
}
@@ -47,6 +50,7 @@
/// </summary>
public void Show()
{
+ CommonDevice.DebugPrintLog($"11111111111111A");
this.TopFrameLayout(this, accountObj.Account);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -56,13 +60,14 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
+ CommonDevice.DebugPrintLog($"11111111111111B");
ReadDoorLockUserInfo();
-
+ CommonDevice.DebugPrintLog($"11111111111111C");
}
public void MidFrameLayoutContent()
{
+ CommonDevice.DebugPrintLog($"11111111111111D");
var bodyView = new VerticalScrolViewLayout()
{
};
@@ -129,31 +134,11 @@
unLockMethod.Show();
}
else
- {
- ///澶囨敞锛歐JC鐨�
- ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
- Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
- if (accountObj == null)
- {
- ///闃叉鎶涘紓甯�
- Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
- }
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
- }
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList();
- UserView.HomePage.Instance.AddChidren(doorLockLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- doorLockLogicList.Show();
+ {
+ var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
}
};
btnRight.MouseUpEventHandler += eHandler;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 6248e90..fb955b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -14,13 +14,14 @@
public MemberFrozenPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
{
this.doorLock = doorLock;
- this.accountObj = accountObj;
+ this.curAccountObj = accountObj;
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;
- Shared.Phone.UserCenter.MemberInfoRes accountObj;
+ Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ VerticalScrolViewLayout bodyView;
#endregion
/// <summary>
@@ -29,13 +30,13 @@
public void Show()
{
string accountTitle = "";
- if (accountObj.UserName != null)
+ if (curAccountObj.UserName != null)
{
- accountTitle = accountObj.UserName;
+ accountTitle = curAccountObj.UserName;
}
else
{
- accountTitle = accountObj.Account;
+ accountTitle = curAccountObj.Account;
}
this.TopFrameLayout(this, accountTitle);
@@ -46,16 +47,24 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
- MidFrameLayoutContent();
- }
-
- public void MidFrameLayoutContent()
- {
- var bodyView = new VerticalScrolViewLayout()
+ this.titleFrameLayout.MouseUpEventHandler += (sender, e) =>
+ {
+ var userDoorLockPage = new UserDoorLockPage(doorLock, curAccountObj);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
+ };
+ bodyView = new VerticalScrolViewLayout()
{
};
this.midFrameLayout.AddChidren(bodyView);
+
+ ReadDoorLockUserInfo();
+ }
+
+ public void MidRefresh()
+ {
+ bodyView.RemoveAll();
for (int i = 0; i < 3; i++)
{
@@ -112,28 +121,51 @@
else if (i == 1)
{
btnText.Text = Language.StringByID(R.MyInternationalizationString.FrozenUser);
- btnRight.Height = Application.GetRealHeight(0);
- var btnSwitch = new Button()
- {
- X = Application.GetRealWidth(50),
- Y = Application.GetRealHeight(32),
- Height = Application.GetRealHeight(60),
- Width = Application.GetRealWidth(60),
- UnSelectedImagePath = "DoorLock/Switch.png",
- SelectedImagePath = "DoorLock/SwitchOn.png",
- };
- btnRightFrameLayout.AddChidren(btnSwitch);
- }
- else if (i == 2)
- {
- btnText.Text = Language.StringByID(R.MyInternationalizationString.TempUnlockPermission);
btnRight.X = Application.GetRealWidth(50);
btnRight.Y = Application.GetRealHeight(32);
btnRight.Height = Application.GetRealHeight(63);
btnRight.Width = Application.GetRealWidth(104);
btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
- line2.Visible = false;
+
+ if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ btnRight.IsSelected = true;
+ }
+ else
+ {
+ btnRight.IsSelected = false;
+ }
+ }
+ else if (i == 2)
+ {
+ if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == false)
+ {
+ btnText.Text = Language.StringByID(R.MyInternationalizationString.TempUnlockPermission);
+ btnRight.X = Application.GetRealWidth(50);
+ btnRight.Y = Application.GetRealHeight(32);
+ btnRight.Height = Application.GetRealHeight(63);
+ btnRight.Width = Application.GetRealWidth(104);
+ btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
+ btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
+ line2.Visible = false;
+
+ if (doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ btnRight.IsSelected = true;
+ }
+ else
+ {
+ btnRight.IsSelected = false;
+ }
+ }
+ else
+ {
+ btnText.Width = 0;
+ btnRight.Width = 0;
+ line2.Width = 0;
+ RowView.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
+ }
}
int currentIndex = i;
@@ -141,7 +173,7 @@
{
if (currentIndex == 0)
{
- var unLockMethod = new Shared.Phone.UserCenter.DoorLock.UnLockMethod(doorLock, accountObj);
+ var unLockMethod = new Shared.Phone.UserCenter.DoorLock.UnLockMethod(doorLock, curAccountObj);
Shared.Phone.UserView.HomePage.Instance.AddChidren(unLockMethod);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
unLockMethod.Show();
@@ -149,10 +181,26 @@
else if (currentIndex == 1)
{
btnRight.IsSelected = !btnRight.IsSelected;
+
+ if (btnRight.IsSelected)
+ {
+ FreezeUser(true);
+ }
+ else
+ {
+ FreezeUser(false);
+ }
}
else if (currentIndex == 2)
{
-
+ if (btnRight.IsSelected)
+ {
+ HasRemoteUnlockAccess(true);
+ }
+ else
+ {
+ HasRemoteUnlockAccess(false);
+ }
}
};
btnRightFrameLayout.MouseUpEventHandler += eHandler;
@@ -160,7 +208,525 @@
RowView.MouseUpEventHandler += eHandler;
btnText.MouseUpEventHandler += eHandler;
}
+ }
+
+ //鍐荤粨璐︽埛
+ void FreezeUser(bool isFreeze)
+ {
+ var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureToFreezeAccount),
+ Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
+ alert.Show();
+ alert.ResultEventHandler += (sender1, e1) =>
+ {
+ if (e1)
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ int successConunt = 0;
+ int operateConunt = -1;
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ try
+ {
+ var doorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ var curAccountDoorLockUserList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
+
+ if (curAccountDoorLockUserList.Count != 0)
+ {
+ //淇敼浜戠瀛樺偍淇℃伅
+ operateConunt = curAccountDoorLockUserList.Count;
+ foreach (var curDoorLockUser in curAccountDoorLockUserList)
+ {
+ // 璐︽埛涓病鏈夐棬閿佺敤鎴�
+ if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ {
+ if (isFreeze)
+ {
+ var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ refreshDoorLockData.IsFreezeUser = true;
+ //鍐荤粨浜戠
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ successConunt++;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (isFreeze)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ return;
+ });
+ }
+ }
+ }
+ else
+ {
+ var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ refreshDoorLockData.IsFreezeUser = false;
+ //瑙ｅ喕浜戠
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ successConunt++;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ });
+ }
+ }
+ }
+ }
+ else
+ {
+ ZigBee.Device.DoorLock.AccessType accessType;
+ if (isFreeze)
+ {
+ accessType = ZigBee.Device.DoorLock.AccessType.DisEnable;
+ }
+ else
+ {
+ accessType = ZigBee.Device.DoorLock.AccessType.Enable;
+ }
+ //鍐荤粨/瑙ｅ喕鐢ㄦ埛
+ var passData = doorLock.SetUserAccessData(int.Parse(curDoorLockUser.DoorLockLocalUserId), accessType);
+ var resultData = await doorLock.DefaultControlAsync(passData);
+ if (resultData != null && resultData.defaultControlResponseData != null)
+ {
+ if (resultData.defaultControlResponseData.status == 32)
+ {
+ var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+
+ refreshDoorLockData.OpenLockMode = curDoorLockUser.OpenLockMode;
+ refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
+ refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ refreshDoorLockData.IsFreezeUser = true;
+ //鍐荤粨浜戠
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ successConunt++;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (isFreeze)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ return;
+ });
+ }
+ }
+ }
+ else if (resultData.defaultControlResponseData.status == 33)
+ {
+ var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+
+ refreshDoorLockData.OpenLockMode = curDoorLockUser.OpenLockMode;
+ refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
+ refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ refreshDoorLockData.IsFreezeUser = false;
+ //瑙ｅ喕浜戠
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ successConunt++;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ });
+ }
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (isFreeze)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed) + ".", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(this.btnTip);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed) + ".", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(this.btnTip);
+ }
+ return;
+ });
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(this.btnTip);
+ });
+ }
+ }
+ }
+ }
+ else
+ {
+ //娣诲姞浜戠瀛樺偍淇℃伅
+ //鍐荤粨/瑙ｅ喕浜戠
+ var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ addLockInfo.IsOtherAccountCtrl = true;
+ }
+ addLockInfo.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+ if (doorLock.DeviceAddr != null)
+ {
+ addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ addLockInfo.EntryTime = System.DateTime.Now;
+ if (isFreeze)
+ {
+ addLockInfo.IsFreezeUser = true;
+ }
+ else
+ {
+ addLockInfo.IsFreezeUser = false;
+ }
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
+ if (result != null && result.StateCode == "Success")
+ {
+ operateConunt = 0;
+ // 娣诲姞鍒颁簯绔垚鍔燂紝闇�瑕侀噸鏂拌幏鍙栦繚瀛樺埌鏈湴
+ //var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountObj.SubAccountDistributedMark);
+ //if (resultList.ContainsKey(curAccountObj.SubAccountDistributedMark) == true)
+ //{
+ // var a = resultList[curAccountObj.SubAccountDistributedMark];
+ // if (a?.ConnectedAccount == curAccountObj.SubAccountDistributedMark)
+ // {
+ // operateConunt = 0;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (isFreeze)
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ // }
+ // return;
+ // });
+ // }
+ //}
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (isFreeze)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ return;
+ });
+ }
+ }
+ }
+ catch { }
+ finally
+ {
+ if (operateConunt == successConunt)
+ {
+ if (isFreeze)
+ {
+ doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = true;
+ }
+ else
+ {
+ doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = false;
+ }
+ doorLock.ReSave();
+ }
+ Application.RunOnMainThread(() =>
+ {
+ MidRefresh();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+ };
+ }
+
+ //鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
+ void HasRemoteUnlockAccess(bool hasAccess)
+ {
+ var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureGiveAccessToSubaccount),
+ Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
+ alert.Show();
+ alert.ResultEventHandler += (sender1, e1) =>
+ {
+ if (e1)
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ int successConunt = 0;
+ int operateConunt = -1;
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ try
+ {
+ var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
+ var uList = new List<string> { };
+ if (resultList != null)
+ {
+ foreach (var a in resultList)
+ {
+ uList.Add(a.CloudAccountId);
+ }
+ }
+ var d = uList.Find((value) => { return value == curAccountObj.SubAccountDistributedMark; });
+ if (d != null)
+ {
+ //淇敼浜戠瀛樺偍淇℃伅
+ var curAccountDoorLockUserList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetMatchDoorlockAccountList(doorLock, curAccountObj);
+ operateConunt = curAccountDoorLockUserList.Count;
+ foreach (var curUserId in curAccountDoorLockUserList.Keys)
+ {
+ var curDoorLockUser = curAccountDoorLockUserList[curUserId];
+ if (hasAccess)
+ {
+ var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
+ refreshDoorLockData.IsFreezeUser = false;
+ refreshDoorLockData.IsTempUnlockAuthority = true;
+ //鍐荤粨浜戠
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ successConunt++;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (hasAccess)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountSuccess), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ return;
+ });
+ }
+ }
+ }
+ else
+ {
+ var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
+ refreshDoorLockData.IsFreezeUser = false;
+ refreshDoorLockData.IsTempUnlockAuthority = false;
+ //瑙ｅ喕浜戠
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ successConunt++;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ });
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ //鏂板锛屼笖涓嶅喕缁�
+ var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ addLockInfo.IsOtherAccountCtrl = true;
+ }
+ addLockInfo.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+ if (doorLock.DeviceAddr != null)
+ {
+ addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ addLockInfo.EntryTime = System.DateTime.Now;
+ addLockInfo.IsFreezeUser = false;
+ if (hasAccess)
+ {
+ addLockInfo.IsTempUnlockAuthority = true;
+ }
+ else
+ {
+ addLockInfo.IsTempUnlockAuthority = false;
+ }
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
+ if (result != null && result.StateCode == "Success")
+ {
+ operateConunt = 0;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (hasAccess)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountSuccess), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ return;
+ });
+ }
+ }
+
+ }
+ catch { }
+ finally
+ {
+ if (operateConunt == successConunt)
+ {
+ if (hasAccess)
+ {
+ doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = true;
+ }
+ else
+ {
+ doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = false;
+ }
+ doorLock.ReSave();
+ }
+ Application.RunOnMainThread(() =>
+ {
+ MidRefresh();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+ };
+ }
+
+ void ReadDoorLockUserInfo()
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ try
+ {
+ await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ MidRefresh();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
}
#region 鈼� 鎺ュ彛瀹炵幇__________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 53eec42..6bd28b7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -28,13 +28,32 @@
bool isSecondDel;
#endregion
+ void ReadDoorLockUserInfo()
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ try
+ {
+ await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ RefreshList();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
/// <summary>
/// UI鏄剧ず
/// </summary>
public void Show()
{
- //ReadDoorLockUserInfo();
this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.LockMethod));
this.btnTitleLine.Visible = false;
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -62,12 +81,18 @@
btnAddFrameLayout.AddChidren(btnAdd);
btnAdd.MouseDownEventHandler += (sender, e) =>
{
- var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addUnLockMethod.Show();
+ if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
+ else
+ {
+ var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addUnLockMethod.Show();
+ }
};
-
MidFrameLayoutContent();
}
//涓儴甯冨眬
@@ -157,8 +182,14 @@
{
SideslipFramelayout();
};
-
- RefreshList();
+ if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ ReadDoorLockUserInfo();
+ }
+ else
+ {
+ RefreshList();
+ }
}
/// <summary>
@@ -168,6 +199,11 @@
/// <param name="key"></param>
public void RefreshList()
{
+ if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ return;
+ }
bodyView.RemoveAll();
var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();
@@ -271,7 +307,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -281,7 +317,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -291,7 +327,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -302,7 +338,7 @@
break;
}
- if (curAccountObj.UserName == "")
+ if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
{
btnMember.Text = curAccountObj.Account;
}
@@ -319,7 +355,6 @@
refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
refreshDoorLockData.IsOtherAccountCtrl = true;
}
- refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark;
if (doorLock.DeviceAddr != null)
{
refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -329,24 +364,31 @@
refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
refreshDoorLockData.UserIdRemarks = btnDoorlockUser.Text;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
- localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
- localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
- localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
- doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
- RefreshList();
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
+ localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
+ localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
+ localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
+ doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
+ RefreshList();
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
};
btnDoorlockUser.EditorEnterAction += action;
@@ -380,22 +422,30 @@
deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
deleteDoorLockData.DelDoorLockDelType = 2;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- isSecondDel = false;
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- doorLock.localDoorLockUserList.Remove(curUserId);
- RefreshList();
+ isSecondDel = false;
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ doorLock.localDoorLockUserList.Remove(curUserId);
+ doorLock.ReSave();
+ RefreshList();
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
{
isSecondDel = true;
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
@@ -416,22 +466,29 @@
deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
deleteDoorLockData.DelDoorLockDelType = 2;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- isSecondDel = false;
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- doorLock.localDoorLockUserList.Remove(curUserId);
- RefreshList();
+ isSecondDel = false;
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ doorLock.localDoorLockUserList.Remove(curUserId);
+ RefreshList();
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
{
isSecondDel = true;
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
@@ -449,7 +506,7 @@
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
}
}
};
@@ -729,7 +786,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -739,7 +796,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -749,7 +806,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -760,7 +817,7 @@
break;
}
- if (curAccountObj.UserName == "")
+ if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
{
btnMember.Text = curAccountObj.Account;
}
@@ -777,7 +834,6 @@
refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
refreshDoorLockData.IsOtherAccountCtrl = true;
}
- refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark;
if (doorLock.DeviceAddr != null)
{
refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -787,24 +843,31 @@
refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
refreshDoorLockData.UserIdRemarks = btnDoorlockUser.Text;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
- localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
- localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
- localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
- doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
- RefreshList();
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
+ localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
+ localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
+ localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
+ doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
+ RefreshList();
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
};
btnDoorlockUser.EditorEnterAction += action;
@@ -838,29 +901,34 @@
deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
deleteDoorLockData.DelDoorLockDelType = 2;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
-
- //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveSuccess), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
- doorLock.localDoorLockUserList.Remove(curUserId);
- RefreshList();
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ doorLock.localDoorLockUserList.Remove(curUserId);
+ RefreshList();
+ }
+ }
+ else
+ {
+ if (curDoorLockUser.UserID < 10)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
}
}
else
{
- if (curDoorLockUser.UserID < 10)
- {
-
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
@@ -871,7 +939,7 @@
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
}
}
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index a2400e0..7b5c669 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -64,7 +64,6 @@
{
localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
}
-
var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
if (getDoorLockInfoList != null)
{
@@ -84,11 +83,21 @@
doorLock.localDoorLockUserList.Add(int.Parse(curDoorLockUser.DoorLockLocalUserId), doorLockObj);
}
}
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ });
+ }
}
}
else
{
-
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ });
}
}
catch { }
@@ -96,7 +105,7 @@
{
Application.RunOnMainThread(() =>
{
- RefreshList();
+ MidFrameLayoutContent();
CommonPage.Loading.Hide();
});
}
@@ -113,16 +122,62 @@
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
RemoveFromParent();
+ this.btnTip.Visible = false;
};
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
- MidFrameLayoutContent();
ReadDoorLockUserInfo();
}
- public void RefreshList()
+ public void MidFrameLayoutContent()
+ {
+ var midTopFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(115),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTopFrameLayout,
+ };
+ this.midFrameLayout.AddChidren(midTopFrameLayout);
+
+ var btnAllMethod = new Button()
+ {
+ Height = Application.GetRealHeight(49),
+ Width = Application.GetRealWidth(141 + 100),
+ Y = Application.GetRealHeight(35),
+ X = Application.GetRealWidth(812 - 100),
+ TextAlignment = TextAlignment.Center,
+ Text = Language.StringByID(R.MyInternationalizationString.LockMethod),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
+ TextSize = 12,
+ };
+ midTopFrameLayout.AddChidren(btnAllMethod);
+
+ var btnNext = new Button()
+ {
+ X = Application.GetRealWidth(953),
+ Y = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(69),
+ Width = Application.GetRealWidth(69),
+ UnSelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
+ SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
+ };
+ midTopFrameLayout.AddChidren(btnNext);
+ btnNext.MouseUpEventHandler += (sender, e) =>
+ {
+ SideslipFramelayout();
+ };
+
+ bodyView = new VerticalScrolViewLayout()
+ {
+ Y = midTopFrameLayout.Bottom,
+ };
+ this.midFrameLayout.AddChidren(bodyView);
+
+ RefreshList();
+ }
+
+ void RefreshList()
{
bodyView.RemoveAll();
foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
@@ -185,7 +240,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnText.Text = curDoorLockUser.UserName;
}
@@ -195,7 +250,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnText.Text = curDoorLockUser.UserName;
}
@@ -205,7 +260,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
btnText.Text = curDoorLockUser.UserName;
}
@@ -228,54 +283,8 @@
}
}
- public void MidFrameLayoutContent()
- {
- var midTopFrameLayout = new FrameLayout()
- {
- Height = Application.GetRealHeight(115),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTopFrameLayout,
- };
- this.midFrameLayout.AddChidren(midTopFrameLayout);
-
- var btnAllMethod = new Button()
- {
- Height = Application.GetRealHeight(49),
- Width = Application.GetRealWidth(141 + 100),
- Y = Application.GetRealHeight(35),
- X = Application.GetRealWidth(812 - 100),
- TextAlignment = TextAlignment.Center,
- Text = Language.StringByID(R.MyInternationalizationString.LockMethod),
- TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
- TextSize = 12,
- };
- midTopFrameLayout.AddChidren(btnAllMethod);
-
- var btnNext = new Button()
- {
- X = Application.GetRealWidth(953),
- Y = Application.GetRealHeight(20),
- Height = Application.GetRealHeight(69),
- Width = Application.GetRealWidth(69),
- UnSelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
- SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
- };
- midTopFrameLayout.AddChidren(btnNext);
- btnNext.MouseUpEventHandler += (sender, e) =>
- {
- SideslipFramelayout();
- };
-
- bodyView = new VerticalScrolViewLayout()
- {
- Y = midTopFrameLayout.Bottom,
- };
- this.midFrameLayout.AddChidren(bodyView);
-
- RefreshList();
- }
-
//鏈湴璐︽埛
- public void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
+ void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
{
#region UI
FrameLayout flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
@@ -429,6 +438,13 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
+ if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
+ {
+
+ new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ return;
+ }
+
if (!btnChoose.IsSelected)
{
if (oldbuttonChoose != null)
@@ -488,7 +504,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
}
@@ -498,7 +514,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
}
@@ -508,7 +524,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "")
+ if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
{
addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
}
@@ -523,20 +539,29 @@
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
if (result != null && result.StateCode == "Success")
{
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ //瀛樿处鎴蜂俊鎭�
+ //var resultList1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountId);
+ //瀛橀棬閿佷俊鎭�
+ var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);
+ var uList = new List<int> { };
+ if (resultList != null)
{
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
- localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
- localDoorLockObj.UserName = curDoorLockUser.UserName;
- localDoorLockObj.ConnectedAccount = curAccountId;
- doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
+ foreach (var a in resultList.Keys)
+ {
+ uList.Add(a);
+ }
+ }
+ var d = uList.Find((value) => { return value == doorLock.doorLockProgrammingEventNotificationCommand.UserID; });
+ if (d != null)
+ {
RefreshList();
flMain.RemoveFromParent();
bottomFrameLayout.RemoveAll();
}
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ }
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 3754458..b964c76 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -53,10 +53,20 @@
this.titleFrameLayout.AddChidren(btnFuncSet);
btnFuncSet.MouseDownEventHandler += (sender, e) =>
{
- var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ {
+ var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
+ }
+ else
+ {
+ var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
+ }
};
btnShare.MouseDownEventHandler += (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 331c95f..191071a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -27,8 +27,6 @@
//var dev = common as Panel;
});
}
-
-
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
@@ -39,8 +37,58 @@
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;
- List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ VerticalScrolViewLayout midVerticalScrolViewLayout;
#endregion
+
+ void ReadAccountList()
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ try
+ {
+ var localAccountListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LocalAccountList();
+ if (localAccountListTemp != null)
+ {
+ doorLock.localAllAccountList.Clear();
+ doorLock.localAllAccountList = localAccountListTemp;
+ foreach (var sub in localAccountListTemp)
+ {
+ //鍒濆鍖栨潈闄愪俊鎭�
+ if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
+ {
+ doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
+ }
+ if (doorLock.HasRemoteUnlockAccess.ContainsKey(sub.SubAccountDistributedMark) == false)
+ {
+ doorLock.HasRemoteUnlockAccess.Add(sub.SubAccountDistributedMark, false);
+ }
+ if (doorLock.IsFailedToGetDoorLockInfo.ContainsKey(sub.SubAccountDistributedMark) == false)
+ {
+ doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
+ }
+ }
+ doorLock.ReSave();
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+ });
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ MidFrameLayoutContent();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
public void Show()
{
@@ -83,7 +131,7 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- var undistributeDoorlockUserPage = new Shared.Phone.UserCenter.DoorLock.UndistributeDoorlockUserPage(doorLock, localAccountList);
+ var undistributeDoorlockUserPage = new Shared.Phone.UserCenter.DoorLock.UndistributeDoorlockUserPage(doorLock, doorLock.localAllAccountList);
Shared.Phone.UserView.HomePage.Instance.AddChidren(undistributeDoorlockUserPage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
undistributeDoorlockUserPage.Show();
@@ -91,41 +139,26 @@
btnAddFrameLayout.MouseDownEventHandler += eHandler;
btnUndistributeText.MouseDownEventHandler += eHandler;
btnUndistributeIcon.MouseDownEventHandler += eHandler;
-
- MidFrameLayoutContent();
+ midVerticalScrolViewLayout = new VerticalScrolViewLayout()
+ {
+ };
+ this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
+ ReadAccountList();
+ // MidFrameLayoutContent();
}
async void MidFrameLayoutContent()
{
- List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = null;
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ midVerticalScrolViewLayout.RemoveAll();
+ for (int i = 0; i < doorLock.localAllAccountList.Count; i++)
{
- SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
- }
-
- var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
- masterAccount.Account = Shared.Common.Config.Instance.Account;
- masterAccount.AccountType = Shared.Common.Config.Instance.AccountType;
- masterAccount.SubAccountDistributedMark = Shared.Common.Config.Instance.Guid;
- masterAccount.UserName = UserCenterResourse.UserInfo.UserName;
- localAccountList.Add(masterAccount);
- localAccountList.AddRange(SubAccounList);
-
- var bodyView = new VerticalScrolViewLayout()
- {
- };
- this.midFrameLayout.AddChidren(bodyView);
-
- doorLock.localAllAccountList = localAccountList;
- for (int i = 0; i < localAccountList.Count; i++)
- {
- var currentAccount = localAccountList[i];
+ var currentAccount = doorLock.localAllAccountList[i];
var RowView = new FrameLayout()
{
Height = Application.GetRealHeight(161),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTopFrameLayout,
};
- bodyView.AddChidren(RowView);
+ midVerticalScrolViewLayout.AddChidren(RowView);
var btnText = new Button()
{
@@ -166,7 +199,7 @@
};
RowView.AddChidren(line2);
int currentIndex = i;
- if (currentIndex == localAccountList.Count - 1)
+ if (currentIndex == doorLock.localAllAccountList.Count - 1)
{
line2.Visible = false;
}
@@ -190,7 +223,7 @@
masterManagementPage.Show();
}
else
- {
+ {
var memberFrozenPage = new Shared.Phone.UserCenter.DoorLock.MemberFrozenPage(doorLock, currentAccount);
Shared.Phone.UserView.HomePage.Instance.AddChidren(memberFrozenPage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayAddSuccessForm.cs
new file mode 100755
index 0000000..27ac27e
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayAddSuccessForm.cs
@@ -0,0 +1,109 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.GatewayAdd
+{
+ /// <summary>
+ /// 缃戝叧娣诲姞鎴愬姛鐨勬樉绀虹晫闈�
+ /// </summary>
+ public class GatewayAddSuccessForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ if (UserCenterResourse.DicActionForm.ContainsKey("WiredGatewayListForm") == true)
+ {
+ //璁剧疆澶撮儴淇℃伅 娣诲姞鏈夌嚎缃戝叧
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddWiredGateway));
+ }
+ else
+ {
+ //璁剧疆澶撮儴淇℃伅 娣诲姞鏃犵嚎缃戝叧
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddWirelessGateway));
+ }
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ var btnPic = new PicViewControl(452, 377);
+ btnPic.UnSelectedImagePath = "Gateway/AddGatewaySuccess.png";
+ btnPic.Gravity = Gravity.CenterHorizontal;
+ btnPic.Y = Application.GetRealHeight(369);
+ bodyFrameLayout.AddChidren(btnPic);
+
+ //娣诲姞鏅鸿兘缃戝叧鎴愬姛
+ var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(85), false);
+ btnMsg.Y = Application.GetRealHeight(732);
+ btnMsg.TextAlignment = TextAlignment.Center;
+ btnMsg.TextSize = 20;
+ btnMsg.TextID = R.MyInternationalizationString.uAddgatewaySuccess;
+ bodyFrameLayout.AddChidren(btnMsg);
+
+ //缁х画娣诲姞缃戝叧
+ var frameAdd = new FrameLayoutControl();
+ frameAdd.UseClickStatu = false;
+ frameAdd.Y = Application.GetRealHeight(1224);
+ frameAdd.Gravity = Gravity.CenterHorizontal;
+ frameAdd.Width = Application.GetRealWidth(746);
+ frameAdd.Height = Application.GetRealHeight(184);
+ frameAdd.BackgroundImagePath = "Item/BottomButtonGround.png";
+ bodyFrameLayout.AddChidren(frameAdd);
+ var btnAdd = new NormalViewControl(300, 65, true);
+ btnAdd.TextColor = UserCenterColor.Current.White;
+ btnAdd.TextSize = 16;
+ btnAdd.Y = Application.GetRealHeight(49);
+ btnAdd.Gravity = Gravity.CenterHorizontal;
+ btnAdd.TextAlignment = TextAlignment.Center;
+ btnAdd.TextID = R.MyInternationalizationString.uContinuteToAddGateway;
+ frameAdd.AddChidren(btnAdd, ChidrenBindMode.BindEventOnly);
+ frameAdd.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ //鍏抽棴鍒楄〃鐣岄潰
+ this.CloseFormByFormName("WiredGatewayListForm");
+ //璁╁畠閫�鍒拌彍鍗曢�夋嫨鐣岄潰
+ };
+
+ //杩斿洖涓婚〉
+ var btnGoback = new BottomClickButton(688);
+ btnGoback.TextID = R.MyInternationalizationString.uGobackToHomePage;
+ btnGoback.Y = Application.GetRealHeight(1460);
+ bodyFrameLayout.AddChidren(btnGoback);
+ btnGoback.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ //鍏抽棴鍒楄〃鐣岄潰
+ this.CloseFormByFormName("WiredGatewayListForm");
+ //鍏抽棴鑿滃崟閫夋嫨鐣岄潰
+ this.CloseFormByFormName("NewGateWayMenuSelectForm");
+ //璁╁畠閫�鍒颁富椤�
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
index 31c7aa8..1eca0ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
@@ -171,13 +171,6 @@
this.ShowMassage(ShowMsgType.Error, msg);
return;
}
- string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
- if (nameValue == gwName)
- {
- //鍚屽悕涓嶉渶瑕佸鐞�
- this.CloseForm();
- return;
- }
HdlThreadLogic.Current.RunThread(() =>
{
//淇敼鍚嶅瓧
@@ -212,8 +205,14 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- //鐣岄潰鍏抽棴
+ //鍏抽棴鑷韩
this.CloseForm();
+ //鏄惁鏄富椤垫坊鍔�
+ if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
+ {
+ var form = new GatewayAddSuccessForm();
+ form.AddForm();
+ }
});
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
index b923c44..88dbcba 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
@@ -56,9 +56,90 @@
row2.AddRightArrow();
row2.ButtonClickEvent += (sender, e) =>
{
- var form = new WirelessGwAddDirectionForm();
+ var form = new SearchWirelessMenuControl();
form.AddForm();
};
+ }
+
+ /// <summary>
+ /// 鑿滃崟鎺т欢
+ /// </summary>
+ private class SearchWirelessMenuControl : DialogCommonForm
+ {
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ var frameBack1 = new FrameLayoutControl();
+ frameBack1.UseClickStatu = false;
+ frameBack1.Y = Application.GetRealHeight(1420);
+ frameBack1.Gravity = Gravity.CenterHorizontal;
+ frameBack1.RadiusEx = 12;
+ frameBack1.Width = Application.GetRealWidth(1034);
+ frameBack1.Height = Application.GetRealHeight(300);
+ frameBack1.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack1);
+
+ //UDP妯″紡(鎺ㄨ崘)
+ var btnUdp = new NormalViewControl(900, 156, true);
+ btnUdp.Gravity = Gravity.CenterHorizontal;
+ btnUdp.TextAlignment = TextAlignment.Center;
+ btnUdp.TextColor = 0xff0075ff;
+ btnUdp.TextSize = 17;
+ btnUdp.TextID = R.MyInternationalizationString.uUdpModeRecommend;
+ frameBack1.AddChidren(btnUdp, ChidrenBindMode.NotBind);
+ btnUdp.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ var form = new WirelessUdpDirectionForm();
+ form.AddForm();
+ };
+
+ //绾�
+ var btnLine = new NormalViewControl(frameBack1.Width, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ btnLine.Y = btnUdp.Bottom;
+ frameBack1.AddChidren(btnLine, ChidrenBindMode.NotBind);
+ //AP妯″紡
+ var btnAp = new NormalViewControl(900, 144, true);
+ btnAp.Y = btnLine.Bottom;
+ btnAp.Gravity = Gravity.CenterHorizontal;
+ btnAp.TextAlignment = TextAlignment.Center;
+ btnAp.TextColor = 0xff0075ff;
+ btnAp.TextSize = 17;
+ btnAp.TextID = R.MyInternationalizationString.uApMode;
+ frameBack1.AddChidren(btnAp, ChidrenBindMode.NotBind);
+ btnAp.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ };
+
+ var frameBack2 = new FrameLayoutControl();
+ frameBack2.UseClickStatu = false;
+ frameBack2.Y = frameBack1.Bottom + Application.GetRealHeight(23);
+ frameBack2.Gravity = Gravity.CenterHorizontal;
+ frameBack2.RadiusEx = 12;
+ frameBack2.Width = Application.GetRealWidth(1034);
+ frameBack2.Height = Application.GetRealHeight(156);
+ frameBack2.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack2);
+ //鍙栨秷
+ var btnCancel = new NormalViewControl(900, 156, true);
+ btnCancel.Gravity = Gravity.CenterHorizontal;
+ btnCancel.TextAlignment = TextAlignment.Center;
+ btnCancel.TextColor = 0xff0075ff;
+ btnCancel.TextSize = 17;
+ btnCancel.TextID = R.MyInternationalizationString.uCancel;
+ frameBack2.AddChidren(btnCancel, ChidrenBindMode.NotBind);
+ btnCancel.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ };
+ }
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 29ece02..d7d27e5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -347,31 +347,21 @@
//缃戝叧缁戝畾妯″紡
GatewayBindMode mode = GatewayBindMode.BindAgain;
- if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true)
+ //濡傛灉鏄涓�娆＄粦瀹�,鎴栬�呮槸浠ュ墠宸茬粡缁戝畾杩囦簡鐨�
+ if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true
+ || way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
{
- //绗竴娆＄粦瀹�,涔熷氨鏄綉鍏充綇瀹匢D涓虹┖
- mode = GatewayBindMode.First;
- this.dicZbGatewayDiv[listId[i]] = 0;
- //鑾峰彇鍒颁簡鏂扮綉鍏�
- this.newGatewayGetting = true;
- }
- else if (way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
- {
- //宸茬粡缁戝畾杩囦簡
- this.dicZbGatewayDiv[listId[i]] = 1;
- mode = GatewayBindMode.Binded;
- }
- else
- {
- //闇�瑕佹崲缁�
- this.dicZbGatewayDiv[listId[i]] = 2;
- mode = GatewayBindMode.BindAgain;
- }
- //鏈湴鏄惁鏈夎繖涓綉鍏�
- bool isExist = HdlGatewayLogic.Current.IsGatewayExist(way);
- //濡傛灉
- if (mode != GatewayBindMode.BindAgain)
- {
+ if (way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
+ {
+ //绗竴娆＄粦瀹�,涔熷氨鏄綉鍏充綇瀹匢D涓虹┖
+ mode = GatewayBindMode.First;
+ }
+ else
+ {
+ //宸茬粡缁戝畾杩囦簡
+ mode = GatewayBindMode.Binded;
+ }
+
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
ShowErrorMode showMode = this.dicIdCheckCount[listId[i]] == 0 ? ShowErrorMode.YES : ShowErrorMode.NO;
var result = await this.DoSaveGateway(way, showMode);
@@ -380,14 +370,29 @@
continue;
}
}
+
//濡傛灉瀹冨凡缁忓畬鍏ㄦ垚鍔熶簡鐨勮瘽锛屽垯灏嗗畠鐨勫墿浣欐鏁扮疆闆�
this.dicIdCheckCount[listId[i]] = 0;
- if (isExist == true)
+ //鍏ㄩ儴澶勭悊OK鍚庯紝鎵嶈兘璁剧疆flage
+ if (mode == GatewayBindMode.First)
{
- //宸茬粡缁戝畾杩囦簡鐨勶紝鍒欎笉鍐嶆樉绀�
- continue;
+ //绗竴娆＄粦瀹�
+ this.dicZbGatewayDiv[listId[i]] = 0;
+ //鑾峰彇鍒颁簡鏂扮綉鍏�
+ this.newGatewayGetting = true;
}
- if (mode != GatewayBindMode.BindAgain)
+ else if (mode == GatewayBindMode.Binded)
+ {
+ //宸茬粡缁戝畾杩�
+ this.dicZbGatewayDiv[listId[i]] = 1;
+ }
+ else
+ {
+ //闇�瑕侀噸鏂扮粦瀹�
+ this.dicZbGatewayDiv[listId[i]] = 2;
+ }
+
+ if (mode == GatewayBindMode.First)
{
//鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs
index 4329325..6c358e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs
@@ -52,19 +52,19 @@
{
ssiD = ssiD.Substring(1, ssiD.Length - 2);
}
- var btnName = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uNameHadSpace), ssiD);
+ var btnName = new FrameCaptionViewControl("", ssiD);
frame.AddChidren(btnName);
btnName.InitControl();
btnName.AddBottomLine();
//瀵嗙爜
- var btnPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPasswordHadSpace), string.Empty);
+ var btnPsw = new FrameCaptionInputControl("", string.Empty);
btnPsw.Y = btnName.Bottom;
frame.AddChidren(btnPsw);
btnPsw.InitControl();
btnPsw.Height = btnPsw.Height;
btnPsw.txtInput.SecureTextEntry = true;
- btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputNetworkPassword);
+ btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
btnMsg.X = btnPsw.txtInput.X;
@@ -85,7 +85,7 @@
if (btnPsw.Text == string.Empty)
{
//璇疯緭鍏ョ綉缁滃瘑鐮�
- btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputNetworkPassword);
+ btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
new file mode 100755
index 0000000..6b8ee67
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
@@ -0,0 +1,99 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.GatewayAdd
+{
+ /// <summary>
+ /// 鏃犵嚎缃戝叧UPD妯″紡鐨勮鏄庢寚绀虹晫闈�
+ /// </summary>
+ public class WirelessUdpDirectionForm : EditorCommonForm
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddWirelessGateway));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Width = Application.GetMinRealAverage(852);
+ framePic.Height = Application.GetMinRealAverage(478);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(251);
+ 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);
+
+ //鍘昏缃�
+ var btnSettion = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+ btnSettion.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
+ btnSettion.TextSize = 12;
+ btnSettion.TextAlignment = TextAlignment.Center;
+ btnSettion.TextColor = 0xff0075ff;
+ btnSettion.Text = Language.StringByID(R.MyInternationalizationString.uGotoSettion);
+ btnSettion.ButtonClickEvent += (sender, e) =>
+ {
+ };
+ bodyFrameLayout.AddChidren(btnSettion);
+ //搴曠嚎
+ int lineWidth = btnSettion.GetRealWidthByText(12);
+ var btnLine1 = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ btnLine1.BackgroundColor = 0xff0075ff;
+ btnLine1.Gravity = Gravity.CenterHorizontal;
+ btnLine1.Y = btnSettion.Bottom - Application.GetRealHeight(8);
+ bodyFrameLayout.AddChidren(btnLine1);
+
+ //鏌ョ湅甯姪
+ var btnHelp = this.AddHelpControl();
+ btnHelp.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceDirection.DeviceDirectionHelpForm();
+ form.AddForm("WirelessUdp");
+ };
+ bodyFrameLayout.AddChidren(btnHelp);
+
+ //涓嬩竴姝�
+ var btnNext = new BottomClickButton();
+ btnNext.TextID = R.MyInternationalizationString.uNextway;
+ bodyFrameLayout.AddChidren(btnNext);
+ btnNext.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new Device.DeviceSearchForm();
+ form.AddForm(this.FormID);
+ };
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
new file mode 100755
index 0000000..18edbfc
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -0,0 +1,115 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.GatewayAdd
+{
+ /// <summary>
+ /// 鏃犵嚎缃戝叧UDP妯″紡鐨勯�夋嫨缃戠粶鐣岄潰
+ /// </summary>
+ public class WirelessUdpSelectNetworkForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddWirelessGateway));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ bodyFrameLayout.RemoveAll();
+
+ var frameBack = new FrameLayout();
+ frameBack.Height = Application.GetRealHeight(409);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack);
+
+ //璇烽�夋嫨缃戠粶
+ var btnTitle = new NormalViewControl(600, 64, true);
+ btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.Y = Application.GetRealHeight(30);
+ btnTitle.TextSize = 15;
+ btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;
+ frameBack.AddChidren(btnTitle);
+
+ //WIFI
+ string ssiD = Shared.WiimuUPnP.SSID;
+ if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
+ {
+ ssiD = ssiD.Substring(1, ssiD.Length - 2);
+ }
+ var rowWifi = new FrameCaptionViewControl("WiFi", ssiD);
+ rowWifi.UseClickStatu = false;
+ rowWifi.Y = Application.GetRealHeight(124);
+ frameBack.AddChidren(rowWifi);
+ rowWifi.InitControl();
+ rowWifi.AddBottomLine();
+
+ //瀵嗙爜
+ var btnPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPassword), string.Empty);
+ btnPsw.Y = rowWifi.Bottom + Application.GetRealHeight(9);
+ frameBack.AddChidren(btnPsw);
+ btnPsw.InitControl();
+ btnPsw.txtInput.SecureTextEntry = true;
+ btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
+ var btnView = btnPsw.AddMostRightEmptyIcon(81, 81);
+ btnView.UnSelectedImagePath = "Item/HidenPWD.png";
+ btnView.SelectedImagePath = "Item/UnHidenPWD.png";
+ btnPsw.ChangedChidrenBindMode(btnView, ChidrenBindMode.NotBind);
+ btnView.ButtonClickEvent += (sender, e) =>
+ {
+ btnView.IsSelected = !btnView.IsSelected;
+ btnPsw.txtInput.SecureTextEntry = !btnPsw.txtInput.SecureTextEntry;
+ };
+
+ var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
+ btnMsg.X = btnPsw.txtInput.X;
+ btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
+ btnMsg.TextSize = 12;
+ btnMsg.Height = Application.GetRealHeight(40);
+ btnMsg.TextColor = UserCenterColor.Current.Red;
+ bodyFrameLayout.AddChidren(btnMsg);
+
+ //涓嬩竴姝�
+ var btnNext = new BottomClickButton();
+ btnNext.TextID = R.MyInternationalizationString.uNextway;
+ bodyFrameLayout.AddChidren(btnNext);
+
+ btnNext.MouseUpEventHandler += (sender, e) =>
+ {
+ btnMsg.Text = string.Empty;
+ if (btnPsw.Text == string.Empty)
+ {
+ //璇疯緭鍏ョ綉缁滃瘑鐮�
+ btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
+ return;
+ }
+
+ //鍒濆鍖朩i-Fi杩炴帴
+ //var hdlWifi = new Com.Hdl.Hdlelianzigbee.ElianNative();
+ //hdlWifi.InitSmartConnection(null, 1, 1);
+ ////寮�濮媁i-Fi杩炴帴
+ //var result = hdlWifi.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");
+ //var form = new WirelessGwClickButtonForm();
+ //this.AddFromAndRemoveNowForm(form);
+ };
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayCoordinatorInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayCoordinatorInfoForm.cs
deleted file mode 100755
index c6711e5..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayCoordinatorInfoForm.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter.GatewayManage
-{
- /// <summary>
- /// 缃戝叧鍗忚皟鍣ㄥ浐浠剁増鏈俊鎭晫闈�
- /// </summary>
- public class GatewayCoordinatorInfoForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalScrolViewLayout listView = null;
- /// <summary>
- /// 褰撳墠閫夋嫨鐨勭綉鍏�
- /// </summary>
- private ZbGateway zbGateway = null;
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_zbGateway">褰撳墠閫夋嫨鐨勭綉鍏�</param>
- public void ShowForm(ZbGateway i_zbGateway)
- {
- this.zbGateway = i_zbGateway;
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCoordinator));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- listView = new VerticalScrolViewLayout();
- listView.Height = bodyFrameLayout.Height;
- bodyFrameLayout.AddChidren(listView);
-
- //娣诲姞闀滃儚ID琛�
- this.AddImageIdRow();
- //娣诲姞鍥轰欢鐗堟湰琛�
- this.AddFirmwareVersionRow();
- //娣诲姞纭欢鐗堟湰琛�
- this.AddHardwareVersionRow();
- }
-
- #endregion
-
- #region 鈻� 娣诲姞闀滃儚ID琛宊______________________
-
- /// <summary>
- /// 娣诲姞闀滃儚ID琛�
- /// </summary>
- private void AddImageIdRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //鍗忚皟鍣ㄩ暅鍍廔D
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uCoordinatorImageId;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var zbImageType = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "ZbImageType");
- btnVersion.Text = zbImageType.ToString();
- row1.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞鍥轰欢鐗堟湰琛宊____________________
-
- /// <summary>
- /// 娣诲姞鍥轰欢鐗堟湰琛�
- /// </summary>
- private void AddFirmwareVersionRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //鍗忚皟鍣ㄥ浐浠剁増鏈�
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uCoordinatorFirmwareVersion;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var zbVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "ZbFWVersion");
- btnVersion.Text = Common.LocalDevice.Current.AppendVersion(Convert.ToInt32(zbVersion));
- row1.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞纭欢鐗堟湰琛宊____________________
-
- /// <summary>
- /// 娣诲姞纭欢鐗堟湰琛�
- /// </summary>
- private void AddHardwareVersionRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //鍗忚皟鍣ㄧ‖浠剁増鏈�
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uCoordinatorHardwareVersion;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var zbVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "ZbHWVersion");
- btnVersion.Text = zbVersion.ToString();
- row1.AddChidren(btnVersion);
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayLinuxInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayLinuxInfoForm.cs
deleted file mode 100755
index 228a372..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayLinuxInfoForm.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter.GatewayManage
-{
- /// <summary>
- /// 缃戝叧Linux鍥轰欢淇℃伅鐣岄潰
- /// </summary>
- public class GatewayLinuxInfoForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalScrolViewLayout listView = null;
- /// <summary>
- /// 褰撳墠閫夋嫨鐨勭綉鍏�
- /// </summary>
- private ZbGateway zbGateway = null;
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_zbGateway">褰撳墠閫夋嫨鐨勭綉鍏�</param>
- public void ShowForm(ZbGateway i_zbGateway)
- {
- this.zbGateway = i_zbGateway;
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGateWay));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- listView = new VerticalScrolViewLayout();
- listView.Height = bodyFrameLayout.Height;
- bodyFrameLayout.AddChidren(listView);
- //娣诲姞闀滃儚ID琛�
- this.AddImageIdRow();
- //娣诲姞鍥轰欢鐗堟湰琛�
- this.AddFirmwareVersionRow();
- //娣诲姞纭欢鐗堟湰琛�
- this.AddHardwareVersionRow();
- //娣诲姞鍥轰欢鏃ユ湡琛�
- this.AddHardwareDateRow();
- }
-
- #endregion
-
- #region 鈻� 娣诲姞闀滃儚ID琛宊______________________
-
- /// <summary>
- /// 娣诲姞闀滃儚ID琛�
- /// </summary>
- private void AddImageIdRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //缃戝叧闀滃儚ID
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uGatewayImageId;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var linImageType = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "LinuxImageType");
- btnVersion.Text = linImageType.ToString();
- row1.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞鍥轰欢鐗堟湰琛宊____________________
-
- /// <summary>
- /// 娣诲姞鍥轰欢鐗堟湰琛�
- /// </summary>
- private void AddFirmwareVersionRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //缃戝叧鍥轰欢鐗堟湰
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uGatewayFirmwareVersion;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var linVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "LinuxFWVersion");
- btnVersion.Text = Common.LocalDevice.Current.AppendVersion(Convert.ToInt32(linVersion));
- row1.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞纭欢鐗堟湰琛宊____________________
-
- /// <summary>
- /// 娣诲姞纭欢鐗堟湰琛�
- /// </summary>
- private void AddHardwareVersionRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //缃戝叧纭欢鐗堟湰
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uGatewayHardwareVersion;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var linVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "LinuxHWVersion");
- btnVersion.Text = linVersion.ToString();
- row1.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞鍥轰欢鏃ユ湡琛宊____________________
-
- /// <summary>
- /// 娣诲姞鍥轰欢鏃ユ湡琛�
- /// </summary>
- private void AddHardwareDateRow()
- {
- var row1 = new RowLayout();
- row1.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row1);
-
- //鍥轰欢鏃ユ湡
- //var btnView = new RowCenterView(false);
- //btnView.TextID = R.MyInternationalizationString.uGatewayHardwareDate;
- //row1.AddChidren(btnView);
-
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- var appVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(zbGateway, "AppVersion");
- btnVersion.Text = appVersion.ToString();
- row1.AddChidren(btnVersion);
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveInfoForm.cs
deleted file mode 100755
index 991053d..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveInfoForm.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter.GatewayManage
-{
- /// <summary>
- /// 缃戝叧鎸囧畾铏氭嫙椹卞姩鐨勪俊鎭晫闈�
- /// </summary>
- public class GatewayVirtualDriveInfoForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalScrolViewLayout listView = null;
- /// <summary>
- /// 铏氭嫙椹卞姩鍙�
- /// </summary>
- private ZbGatewayData.DriveCodeObj driveCode = null;
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_driveCode">铏氭嫙椹卞姩鍙�</param>
- public void ShowForm(ZbGatewayData.DriveCodeObj i_driveCode)
- {
- this.driveCode = i_driveCode;
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVirtualDrive));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- listView = new VerticalScrolViewLayout();
- listView.Height = bodyFrameLayout.Height;
- bodyFrameLayout.AddChidren(listView);
-
- //娣诲姞闀滃儚ID琛�
- this.AddImageIdRow();
-
- //娣诲姞鍥轰欢鐗堟湰琛�
- this.AddFirmwareVersionRow();
-
- //娣诲姞纭欢鐗堟湰琛�
- this.AddHardwareVersionRow();
- }
-
- #endregion
-
- #region 鈻� 娣诲姞闀滃儚ID琛宊______________________
-
- /// <summary>
- /// 娣诲姞闀滃儚ID琛�
- /// </summary>
- private void AddImageIdRow()
- {
- var row = new RowLayout();
- row.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row);
-
- //铏氭嫙椹卞姩闀滃儚ID
- //var btnUpview = new RowCenterView(false);
- //btnUpview.TextID = R.MyInternationalizationString.uVirtualDriveImageId;
- //row.AddChidren(btnUpview);
- //闀滃儚ID
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- btnVersion.Text = this.driveCode.DriveImageType.ToString();
- row.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞鍥轰欢鐗堟湰琛宊____________________
-
- /// <summary>
- /// 娣诲姞鍥轰欢鐗堟湰琛�
- /// </summary>
- private void AddFirmwareVersionRow()
- {
- var row = new RowLayout();
- row.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row);
-
- //铏氭嫙椹卞姩鍥轰欢鐗堟湰
- //var btnUpview = new RowCenterView(false);
- //btnUpview.TextID = R.MyInternationalizationString.uVirtualDriveFirmwareVersion;
- //row.AddChidren(btnUpview);
- //鐗堟湰鍙�
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- btnVersion.Text = Common.LocalDevice.Current.AppendVersion(this.driveCode.DriveFwVersion);
- row.AddChidren(btnVersion);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞纭欢鐗堟湰琛宊____________________
-
- /// <summary>
- /// 娣诲姞纭欢鐗堟湰琛�
- /// </summary>
- private void AddHardwareVersionRow()
- {
- var row = new RowLayout();
- row.Height = ControlCommonResourse.ListViewRowHeight;
- listView.AddChidren(row);
-
- //铏氭嫙椹卞姩纭欢鐗堟湰
- //var btnUpview = new RowCenterView(false);
- //btnUpview.TextID = R.MyInternationalizationString.uVirtualDriveHardwareVersion;
- //row.AddChidren(btnUpview);
- //鐗堟湰鍙�
- var btnVersion = new RowMostRightTextView();
- btnVersion.TextColor = UserCenterColor.Current.TextGrayColor;
- btnVersion.Text = this.driveCode.DriveHwVersion.ToString();
- row.AddChidren(btnVersion);
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveListForm.cs
deleted file mode 100755
index 361c45a..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveListForm.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter.GatewayManage
-{
- /// <summary>
- /// 缃戝叧铏氭嫙椹卞姩鍒楄〃鐣岄潰
- /// </summary>
- public class GatewayVirtualDriveListForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalScrolViewLayout listView = null;
- /// <summary>
- /// 铏氭嫙椹卞姩鍙峰垪琛ㄤ俊鎭�
- /// </summary>
- private List<ZbGatewayData.DriveCodeObj> listCode = null;
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_listCode">铏氭嫙椹卞姩鍙峰垪琛ㄤ俊鎭�</param>
- public void ShowForm(List<ZbGatewayData.DriveCodeObj> i_listCode)
- {
- this.listCode = i_listCode;
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVirtualDrive));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- //this.InitMiddleFrame();
- }
-
- ///// <summary>
- ///// 鍒濆鍖栦腑閮ㄦ帶浠�
- ///// </summary>
- //private void InitMiddleFrame()
- //{
- // //娓呯┖bodyFrame
- // this.ClearBodyFrame();
-
- // listView = new VerticalScrolViewLayout();
- // listView.Height = bodyFrameLayout.Height;
- // bodyFrameLayout.AddChidren(listView);
-
- // for (int i = 0; i < listCode.Count; i++)
- // {
- // var data = listCode[i];
-
- // var row = new StatuRowLayout(listView);
-
- // //椹卞姩浠ｅ彿
- // var btnDown = new RowTopBlackView(false);
- // btnDown.TextID = R.MyInternationalizationString.uVirtualDriveCode;
- // row.AddChidren(btnDown);
-
- // //椹卞姩浠ｅ彿鐨勫��
- // var btnId = new RowBottomGrayView(false);
- // btnId.Text = data.DriveCode.ToString();
- // row.AddChidren(btnId);
-
- // row.AddRightArrow();
-
- // row.MouseUpEvent += (sender, e) =>
- // {
- // var form = new GatewayVirtualDriveInfoForm();
- // form.AddForm(data);
- // };
- // }
- //}
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayCoordinatorInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayCoordinatorInfoForm.cs
new file mode 100755
index 0000000..033ca0a
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayCoordinatorInfoForm.cs
@@ -0,0 +1,151 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.GatewayUpdate
+{
+ /// <summary>
+ /// 缃戝叧鍗忚皟鍣ㄥ浐浠剁増鏈俊鎭晫闈�
+ /// </summary>
+ public class GatewayCoordinatorInfoForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listView = null;
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勭綉鍏�
+ /// </summary>
+ private ZbGateway zbGateway = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="gateid">缃戝叧ID</param>
+ public void ShowForm(string gateid)
+ {
+ this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(gateid);
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCoordinator));
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ var frameBack = new FrameLayout();
+ frameBack.Height = Application.GetRealHeight(3);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack);
+
+ listView = new VerticalListControl(23);
+ listView.Y = frameBack.Bottom;
+ listView.Height = bodyFrameLayout.Height;
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(listView);
+
+ //娣诲姞闀滃儚ID琛�
+ this.AddImageIdRow();
+ //娣诲姞鍥轰欢鐗堟湰琛�
+ this.AddFirmwareVersionRow();
+ //娣诲姞鍥轰欢鏃ユ湡琛�
+ this.AddHardwareDateRow();
+ //娣诲姞纭欢鐗堟湰琛�
+ this.AddHardwareVersionRow();
+
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞闀滃儚ID琛宊______________________
+
+ /// <summary>
+ /// 娣诲姞闀滃儚ID琛�
+ /// </summary>
+ private void AddImageIdRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //闀滃儚ID
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uImageId), 300);
+ row1.AddMostRightView(zbGateway.getGwInfo.ZbImageType.ToString(), 400);
+ row1.AddBottomLine();
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞鍥轰欢鐗堟湰琛宊____________________
+
+ /// <summary>
+ /// 娣诲姞鍥轰欢鐗堟湰琛�
+ /// </summary>
+ private void AddFirmwareVersionRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //鍥轰欢鐗堟湰
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFirmwareVersion), 300);
+ row1.AddMostRightView(Common.LocalDevice.Current.AppendVersion(zbGateway.getGwInfo.ZbFWVersion), 400);
+ row1.AddBottomLine();
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞鍥轰欢鏃ユ湡琛宊____________________
+
+ /// <summary>
+ /// 娣诲姞鍥轰欢鏃ユ湡琛�
+ /// </summary>
+ private void AddHardwareDateRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //鍥轰欢鏃ユ湡
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareDate), 300);
+ //row1.AddMostRightView(zbGateway.getGwInfo.AppVersion.ToString(), 400);
+ row1.AddBottomLine();
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞纭欢鐗堟湰琛宊____________________
+
+ /// <summary>
+ /// 娣诲姞纭欢鐗堟湰琛�
+ /// </summary>
+ private void AddHardwareVersionRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //纭欢鐗堟湰
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareVersion), 300);
+ row1.AddMostRightView(zbGateway.getGwInfo.ZbHWVersion.ToString(), 400);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs
index 24e23fb..dca0b5e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs
@@ -40,6 +40,9 @@
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate));
+ //鍒濆鍖栧彸涓婅鑿滃崟
+ this.InitTopRightMenu();
+
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
}
@@ -88,6 +91,8 @@
/// </summary>
private int InitNowVersionControl()
{
+ bodyFrameLayout.RemoveAll();
+
var frameBack = new FrameLayout();
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Height = Application.GetMinReal(800);
@@ -113,6 +118,8 @@
rowLinux.AddRightArrow();
rowLinux.ButtonClickEvent += (sender, e) =>
{
+ var form = new GatewayLinuxInfoForm();
+ form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
};
//鍗忚皟鍣�
@@ -122,6 +129,8 @@
rowCoordinator.AddRightArrow();
rowCoordinator.ButtonClickEvent += (sender, e) =>
{
+ var form = new GatewayCoordinatorInfoForm();
+ form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
};
if (this.listVode != null)
@@ -133,6 +142,8 @@
rowVirtual.AddRightArrow();
rowVirtual.ButtonClickEvent += (sender, e) =>
{
+ var form = new GatewayVirtualDriveInfoForm();
+ form.AddForm(listVode);
};
}
//娌℃湁鏂扮増鏈�
@@ -250,6 +261,56 @@
#endregion
+ #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+
+ /// <summary>
+ /// 鍒濆鍖栧彸涓婅鑿滃崟
+ /// </summary>
+ private void InitTopRightMenu()
+ {
+ var btnIcon = new MostRightIconControl(69, 69);
+ btnIcon.UnSelectedImagePath = "Item/More.png";
+ topFrameLayout.AddChidren(btnIcon);
+ btnIcon.InitControl();
+ btnIcon.ButtonClickEvent += ((sender, e) =>
+ {
+ //鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+ this.ShowTopRightMenu();
+ });
+ }
+
+ /// <summary>
+ /// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+ /// </summary>
+ private void ShowTopRightMenu()
+ {
+ var frame = new TopRightMenuControl(1);
+ //鍘嗗彶鐗堟湰
+ var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
+ frame.AddRowMenu(deviceMenu, "", "", () =>
+ {
+ var form = new GatewayHistoryFirmwareVersionForm();
+ form.AddForm(zbGateway, listVersionInfo[2], listVersionInfo[1], listVersionInfo[0], listVode);
+ form.SelectFirmwareInfoEvent += (info1,info2,info3,listCode) =>
+ {
+ listVersionInfo[2] = info1;
+ listVersionInfo[1] = info2;
+ listVersionInfo[0] = info3;
+ listVode = listCode;
+
+ //鍒濆鍖栧綋鍓嶇増鏈殑鎺т欢
+ var yy = this.InitNowVersionControl();
+ if (listVersionInfo[0] != null || listVersionInfo[1] != null || listVersionInfo[2] != null)
+ {
+ //鍒濆鍖栨柊鐗堟湰鐨勬帶浠�
+ this.InitNewVersionControl(yy);
+ }
+ };
+ });
+ }
+
+ #endregion
+
#region 鈻� 娣诲姞鍥轰欢浠嬬粛琛宊____________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 4f3dfb9..2649cd1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -141,30 +141,29 @@
//鏇存柊鐘舵�佸彉鍖栫殑浜嬩欢
updateLogic.UpdateStatuChangedEvent += (div, msg) =>
{
- if (div == -1)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //寮傚父
- this.ShowMassage(ShowMsgType.Tip, msg);
- this.CloseForm();
- }
- else if (div == 0)
- {
- //涓�鑸俊鎭�
- btnText.Text = msg;
- }
- else if (div == 1)
- {
- //鍗囩骇瀹屾垚
- this.ShowMassage(ShowMsgType.Tip, msg);
- //璋冪敤鍥炶皟鍑芥暟
- this.FinishUpdateEvent?.Invoke();
- this.CloseForm();
- }
- else if (div == 2)
- {
- //涓诲姩缁堟鍗囩骇
- this.CloseForm();
- }
+ if (div == -1)
+ {
+ //寮傚父
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ this.CloseForm();
+ }
+ else if (div == 0)
+ {
+ //涓�鑸俊鎭�
+ btnText.Text = msg;
+ }
+ else if (div == 1)
+ {
+ //鍗囩骇瀹屾垚
+ btnText.Text = msg;
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ //璋冪敤鍥炶皟鍑芥暟
+ this.FinishUpdateEvent?.Invoke();
+ this.CloseForm();
+ }
+ });
};
//杩涘害鍊兼敼鍙樹簨浠�
updateLogic.ProgressEvent += (value) =>
@@ -172,12 +171,12 @@
Application.RunOnMainThread(() =>
{
//杩涘害鏉�
- decimal result = value / 100;
- int width = (int)(result * ProRowWidth);
+ int width = (int)(value * ProRowWidth);
btnProgressBar.Width = width;
//鏂囨湰鏄剧ず
- btnProgressView.Text = value + "%";
+ int persent = (int)(value * 100);
+ btnProgressView.Text = persent + "%";
//鏂囨湰鏄剧ず鐨勯偅涓浘鐗囨绉诲姩
frameProgress.X = ControlCommonResourse.XXLeft + btnProgressBar.Right - frameProgress.Width / 2;
});
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index cf020f3..c55d2ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -29,7 +29,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalScrolViewLayout listView = null;
+ private VerticalListControl listView = null;
/// <summary>
/// 铏氭嫙椹卞姩鍙�
/// </summary>
@@ -37,7 +37,7 @@
/// <summary>
/// 鐣岄潰鍏抽棴鐨凙ction(铏氭嫙璁惧,鍗忚皟鍣�,缃戝叧)
/// </summary>
- public Action<FirmwareVersionInfo, FirmwareVersionInfo, FirmwareVersionInfo, List<ZbGatewayData.DriveCodeObj>> FormCloseAction = null;
+ public Action<FirmwareVersionInfo, FirmwareVersionInfo, FirmwareVersionInfo, List<ZbGatewayData.DriveCodeObj>> SelectFirmwareInfoEvent = null;
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
@@ -60,144 +60,146 @@
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion) + "(娴嬭瘯鐗�,鍚庨潰浼拌浼氬垹闄�)");
//鍒濆鍖栦腑閮ㄦ帶浠�
- //this.InitMiddleFrame();
+ this.InitMiddleFrame();
}
- ///// <summary>
- ///// 鍒濆鍖栦腑閮ㄦ帶浠�
- ///// </summary>
- //private void InitMiddleFrame()
- //{
- // //娓呯┖bodyFrame
- // this.ClearBodyFrame();
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
- // listView = new VerticalScrolViewLayout();
- // listView.Height = bodyFrameLayout.Height;
- // bodyFrameLayout.AddChidren(listView);
+ listView = new VerticalListControl();
+ listView.Height = bodyFrameLayout.Height;
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(listView);
- // //缃戝叧
- // var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
- // Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxHWVersion").ToString(),
- // Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxImageType").ToString());
+ //缃戝叧
+ var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
+ upDatezbGateway.getGwInfo.LinuxHWVersion.ToString(),
+ upDatezbGateway.getGwInfo.LinuxImageType.ToString());
- // //鍗忚皟鍣�
- // var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
- // Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbHWVersion").ToString(),
- // Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbImageType").ToString());
+ //鍗忚皟鍣�
+ var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
+ upDatezbGateway.getGwInfo.ZbHWVersion.ToString(),
+ upDatezbGateway.getGwInfo.ZbImageType.ToString());
- // //铏氭嫙椹卞姩
- // var listData3 = new List<FirmwareVersionInfo>();
- // if (this.listVode != null && this.listVode.Count > 0)
- // {
- // //濡傛灉杩欎釜缃戝叧瑕佹湁铏氭嫙椹卞姩杩欎釜涓滆タ鐨勬椂鍊欐墠鑰冭檻
- // listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.VirtualDevice,
- // this.listVode[0].DriveHwVersion.ToString(),
- // this.listVode[0].DriveImageType.ToString());
- // }
+ //铏氭嫙椹卞姩
+ var listData3 = new List<FirmwareVersionInfo>();
+ if (this.listVode != null && this.listVode.Count > 0)
+ {
+ //濡傛灉杩欎釜缃戝叧瑕佹湁铏氭嫙椹卞姩杩欎釜涓滆タ鐨勬椂鍊欐墠鑰冭檻
+ listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.VirtualDevice,
+ this.listVode[0].DriveHwVersion.ToString(),
+ this.listVode[0].DriveImageType.ToString());
+ }
- // HdlThreadLogic.Current.Run(() =>
- // {
- // string fVersion = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxFWVersion").ToString();
- // string imageType = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxImageType").ToString();
- // foreach (var data in listData1)
- // {
- // //if (data.ImagType == imageType && fVersion == data.FirmwareVersion)
- // //{
- // // //鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
- // // continue;
- // //}
- // Application.RunOnMainThread(() =>
- // {
- // this.AddRowlayout(data, FirmwareLevelType.Linux);
- // });
- // }
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;
+ string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();
+ foreach (var data in listData1)
+ {
+ if (data.ImagType == imageType1 && fVersion1 == data.FirmwareVersion)
+ {
+ //鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
+ continue;
+ }
+ this.AddRowlayout(data, FirmwareLevelType.Linux);
+ }
- // fVersion = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbFWVersion").ToString();
- // imageType = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbImageType").ToString();
- // foreach (var data in listData2)
- // {
- // if (data.ImagType == imageType && Convert.ToInt32(fVersion) == data.FirmwareVersion)
- // {
- // //鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
- // continue;
- // }
- // Application.RunOnMainThread(() =>
- // {
- // this.AddRowlayout(data, FirmwareLevelType.Coordinator);
- // });
- // }
+ int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;
+ string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();
+ foreach (var data in listData2)
+ {
+ if (data.ImagType == imageType2 && fVersion2 == data.FirmwareVersion)
+ {
+ //鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
+ continue;
+ }
+ this.AddRowlayout(data, FirmwareLevelType.Coordinator);
+ }
- // imageType = this.listVode[0].DriveImageType.ToString();
- // foreach (var data in listData3)
- // {
- // if (data.ImagType == imageType && this.listVode[0].DriveFwVersion == data.FirmwareVersion)
- // {
- // //鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
- // continue;
- // }
- // Application.RunOnMainThread(() =>
- // {
- // this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
- // });
- // }
- // });
- //}
+ string imageType3 = this.listVode[0].DriveImageType.ToString();
+ foreach (var data in listData3)
+ {
+ if (data.ImagType == imageType3 && this.listVode[0].DriveFwVersion == data.FirmwareVersion)
+ {
+ //鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
+ continue;
+ }
+ this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
+ }
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ });
+ }
- ///// <summary>
- ///// 娣诲姞琛�
- ///// </summary>
- ///// <param name="info"></param>
- ///// <param name="levelType"></param>
- //private void AddRowlayout(FirmwareVersionInfo info, FirmwareLevelType levelType)
- //{
- // var rowlayout = new StatuRowLayout(listView);
+ /// <summary>
+ /// 娣诲姞琛�
+ /// </summary>
+ /// <param name="info"></param>
+ /// <param name="levelType"></param>
+ private void AddRowlayout(FirmwareVersionInfo info, FirmwareLevelType levelType)
+ {
+ var rowlayout = new FrameRowControl();
+ this.listView.AddChidren(rowlayout);
- // //鍥炬爣
- // var btnIcon = new RowLeftIconView();
- // Common.LocalGateway.Current.SetGatewayIcon(btnIcon, this.upDatezbGateway);
- // rowlayout.AddChidren(btnIcon);
+ //鍥炬爣
+ var btnIcon = rowlayout.AddLeftIcon(81);
+ HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, this.upDatezbGateway);
+ rowlayout.AddChidren(btnIcon);
- // //鎸囧畾鐨勭綉鍏�
- // var btnGateway = new RowTopBlackView();
- // btnGateway.BackgroundColor = UserCenterColor.Current.Transparent;
- // btnGateway.Text = info.ShowName;
- // rowlayout.AddChidren(btnGateway);
+ //鎸囧畾鐨勭綉鍏�
+ var btnGateway = rowlayout.AddLeftCaption(info.ShowName, Application.GetRealWidth(800), rowlayout.Height / 2, false);
+ rowlayout.AddChidren(btnGateway);
- // //鍥轰欢淇℃伅
- // var btnVersion = new RowBottomBlackView();
- // btnVersion.Text = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);
- // rowlayout.AddChidren(btnVersion);
+ //鍥轰欢淇℃伅
+ var btnVersion = rowlayout.AddLeftCaption(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), Application.GetRealWidth(800), rowlayout.Height / 2, false);
+ btnVersion.Y = btnGateway.Bottom;
+ rowlayout.AddChidren(btnVersion);
- // //鍚戝彸鐨勫浘鏍�
- // rowlayout.AddRightArrow();
+ //鍚戝彸鐨勫浘鏍�
+ rowlayout.AddRightArrow();
+ rowlayout.AddBottomLine();
- // rowlayout.MouseUpEvent += (sender, e) =>
- // {
- // string gwID = Common.LocalGateway.Current.GetGatewayId(upDatezbGateway);
- // if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)
- // {
- // this.CloseForm();
- // return;
- // }
- // if (levelType == FirmwareLevelType.Linux)
- // {
- // this.gatewayFirmware = info;
- // }
- // else if (levelType == FirmwareLevelType.Coordinator)
- // {
- // this.coordinatorFirmware = info;
- // }
- // else if (levelType == FirmwareLevelType.VirtualDevice)
- // {
- // this.virtualFirmware = info;
- // this.virtualFirmware.VirtualCode = this.listVode[0].DriveCode;
- // }
+ rowlayout.ButtonClickEvent += (sender, e) =>
+ {
+ string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);
+ if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)
+ {
+ this.CloseForm();
+ return;
+ }
+ if (levelType == FirmwareLevelType.Linux)
+ {
+ this.gatewayFirmware = info;
+ }
+ else if (levelType == FirmwareLevelType.Coordinator)
+ {
+ this.coordinatorFirmware = info;
+ }
+ else if (levelType == FirmwareLevelType.VirtualDevice)
+ {
+ this.virtualFirmware = info;
+ this.virtualFirmware.VirtualCode = this.listVode[0].DriveCode;
+ }
- // FormCloseAction?.Invoke(this.virtualFirmware, this.coordinatorFirmware, this.gatewayFirmware, this.listVode);
- // FormCloseAction = null;
+ SelectFirmwareInfoEvent?.Invoke(this.virtualFirmware, this.coordinatorFirmware, this.gatewayFirmware, this.listVode);
- // this.CloseForm();
- // };
- //}
+ this.CloseForm();
+ };
+ }
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseForm()
+ {
+ SelectFirmwareInfoEvent = null;
+
+ base.CloseForm();
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs
new file mode 100755
index 0000000..40787ed
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs
@@ -0,0 +1,151 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.GatewayUpdate
+{
+ /// <summary>
+ /// 缃戝叧Linux鍥轰欢淇℃伅鐣岄潰
+ /// </summary>
+ public class GatewayLinuxInfoForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listView = null;
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勭綉鍏�
+ /// </summary>
+ private ZbGateway zbGateway = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="gateid">缃戝叧ID</param>
+ public void ShowForm(string gateid)
+ {
+ this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(gateid);
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText("Linux");
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ var frameBack = new FrameLayout();
+ frameBack.Height = Application.GetRealHeight(3);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack);
+
+ listView = new VerticalListControl(23);
+ listView.Y = frameBack.Bottom;
+ listView.Height = bodyFrameLayout.Height;
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(listView);
+
+ //娣诲姞闀滃儚ID琛�
+ this.AddImageIdRow();
+ //娣诲姞鍥轰欢鐗堟湰琛�
+ this.AddFirmwareVersionRow();
+ //娣诲姞鍥轰欢鏃ユ湡琛�
+ this.AddHardwareDateRow();
+ //娣诲姞纭欢鐗堟湰琛�
+ this.AddHardwareVersionRow();
+
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞闀滃儚ID琛宊______________________
+
+ /// <summary>
+ /// 娣诲姞闀滃儚ID琛�
+ /// </summary>
+ private void AddImageIdRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //闀滃儚ID
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uImageId), 300);
+ row1.AddMostRightView(zbGateway.getGwInfo.LinuxImageType.ToString(), 400);
+ row1.AddBottomLine();
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞鍥轰欢鐗堟湰琛宊____________________
+
+ /// <summary>
+ /// 娣诲姞鍥轰欢鐗堟湰琛�
+ /// </summary>
+ private void AddFirmwareVersionRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //鍥轰欢鐗堟湰
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFirmwareVersion), 300);
+ row1.AddMostRightView(Common.LocalDevice.Current.AppendVersion(zbGateway.getGwInfo.LinuxFWVersion), 400);
+ row1.AddBottomLine();
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞鍥轰欢鏃ユ湡琛宊____________________
+
+ /// <summary>
+ /// 娣诲姞鍥轰欢鏃ユ湡琛�
+ /// </summary>
+ private void AddHardwareDateRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //鍥轰欢鏃ユ湡
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareDate), 300);
+ row1.AddMostRightView(zbGateway.getGwInfo.AppVersion.ToString(), 400);
+ row1.AddBottomLine();
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞纭欢鐗堟湰琛宊____________________
+
+ /// <summary>
+ /// 娣诲姞纭欢鐗堟湰琛�
+ /// </summary>
+ private void AddHardwareVersionRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+
+ //纭欢鐗堟湰
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareVersion), 300);
+ row1.AddMostRightView(zbGateway.getGwInfo.LinuxHWVersion.ToString(), 400);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayVirtualDriveInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayVirtualDriveInfoForm.cs
new file mode 100755
index 0000000..5de6624
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayVirtualDriveInfoForm.cs
@@ -0,0 +1,138 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.GatewayUpdate
+{
+ /// <summary>
+ /// 缃戝叧铏氭嫙椹卞姩鍒楄〃鐣岄潰
+ /// </summary>
+ public class GatewayVirtualDriveInfoForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 铏氭嫙椹卞姩鍙峰垪琛ㄤ俊鎭�
+ /// </summary>
+ private List<ZbGatewayData.DriveCodeObj> listCode = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_listCode">铏氭嫙椹卞姩鍙峰垪琛ㄤ俊鎭�</param>
+ public void ShowForm(List<ZbGatewayData.DriveCodeObj> i_listCode)
+ {
+ this.listCode = i_listCode;
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVirtualDrive));
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ var listView = new VerticalListControl(23);
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ listView.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listView);
+
+ for (int i = 0; i < listCode.Count; i++)
+ {
+ //鍒涘缓涓�涓彲浠ュ睍寮�鍜屾敹缂╃殑FrameLayout,鐩稿綋浜庤彍鍗曟爮
+ var frameTable = new FrameListControl(12);
+ frameTable.Height = ControlCommonResourse.ListViewRowHeight + listView.rowSpace;
+ listView.AddChidren(frameTable);
+
+ //椹卞姩鍙疯彍鍗�
+ var rowMenu = new FrameRowControl(frameTable.rowSpace / 2);
+ frameTable.AddChidren(rowMenu);
+ rowMenu.AddLeftCaption(listCode[i].DriveCode.ToString(), 400);
+ rowMenu.AddBottomLine();
+
+ var btnRight = rowMenu.AddMostRightEmptyIcon(58, 58);
+ btnRight.UnSelectedImagePath = "Item/Next.png";
+ btnRight.SelectedImagePath = "Item/Down.png";
+ rowMenu.ButtonClickEvent += (sender, e) =>
+ {
+ btnRight.IsSelected = !btnRight.IsSelected;
+ //鍙樻洿鐨勯珮搴�,榛樿涓哄垪琛ㄩ殣钘�
+ int heightValue = ControlCommonResourse.ListViewRowHeight + listView.rowSpace;
+ if (btnRight.IsSelected == true)
+ {
+ //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+ heightValue = frameTable.ChildrenCount * (ControlCommonResourse.ListViewRowHeight + frameTable.rowSpace);
+ }
+ //鑷韩楂樺害鍙樻洿
+ frameTable.Height = heightValue;
+
+ //鍙樻洿鍒楄〃楂樺害
+ int realHeight = 0;
+ for (int j = 0; j < listView.ChildrenCount; j++)
+ {
+ realHeight += listView.GetChildren(j).Height;
+ }
+ //搴曢儴绌虹櫧
+ realHeight += Application.GetRealHeight(23);
+ if (realHeight > bodyFrameLayout.Height)
+ {
+ realHeight = bodyFrameLayout.Height;
+ }
+ listView.Height = realHeight;
+ };
+
+ //闀滃儚ID
+ var row1 = new FrameRowControl(frameTable.rowSpace / 2);
+ row1.LeftOffset = Application.GetRealWidth(167) - ControlCommonResourse.XXLeft;
+ row1.UseClickStatu = false;
+ frameTable.AddChidren(row1);
+ row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uImageId), 300);
+ row1.AddMostRightView(listCode[i].DriveImageType.ToString(), 400);
+ row1.AddBottomLine();
+
+ //鍥轰欢鐗堟湰
+ var row2 = new FrameRowControl(frameTable.rowSpace / 2);
+ row2.LeftOffset = Application.GetRealWidth(167) - ControlCommonResourse.XXLeft;
+ row2.UseClickStatu = false;
+ frameTable.AddChidren(row2);
+ row2.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFirmwareVersion), 300);
+ row2.AddMostRightView(Common.LocalDevice.Current.AppendVersion(listCode[i].DriveFwVersion), 400);
+ row2.AddBottomLine();
+
+ //鍥轰欢鏃ユ湡
+ var row3 = new FrameRowControl(frameTable.rowSpace / 2);
+ row3.LeftOffset = Application.GetRealWidth(167) - ControlCommonResourse.XXLeft;
+ row3.UseClickStatu = false;
+ frameTable.AddChidren(row3);
+ row3.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareDate), 300);
+ row3.AddMostRightView("XXXXXXX", 400);
+ row3.AddBottomLine();
+
+ //纭欢鐗堟湰
+ var row4 = new FrameRowControl(frameTable.rowSpace / 2);
+ row4.LeftOffset = Application.GetRealWidth(167) - ControlCommonResourse.XXLeft;
+ row4.UseClickStatu = false;
+ frameTable.AddChidren(row4);
+ row4.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareVersion), 300);
+ row4.AddMostRightView(listCode[i].DriveHwVersion.ToString(), 400);
+ row4.AddBottomLine();
+ }
+
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
index 57e9242..5e39b80 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
@@ -199,7 +199,7 @@
frameTemp.Height = bodyFrameLayout.Height - btnShard.Y;
listView.AddChidren(frameTemp);
}
- if (listView.ChildrenCount == 0)
+ if (listDataRoom.Count == 0)
{
//濡傛灉娌℃湁鑳藉鍏变韩鐨勬埧闂�
bodyFrameLayout.RemoveAll();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
index 18168ad..c4a6ace 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
@@ -77,8 +77,6 @@
this.ShowReLoadView();
return;
}
- //浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
- HdlShardLogic.Current.GetMemberShardContentListFromLocal(memberShardInfo);
//鍒濆鍖栧尯鍩熷垪琛�
this.InitAreaListRow();
@@ -266,19 +264,14 @@
{
//鑾峰彇鍏ㄩ儴璁惧
var listDevice = new List<CommonDevice>();
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceFile in room.DeviceUIFilePathList)
{
- var device = deviceUi.CommonDevice;
- if (device == null)
+ var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
+ if (byteData == null)
{
- string deviceFile = deviceUi.FileName;
- var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
- if (byteData == null)
- {
- continue;
- }
- device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
+ continue;
}
+ var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
listDevice.Add(device);
}
//鑾峰彇鍏ㄩ儴鍦烘櫙
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index b069cce..e248dfa 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -143,10 +143,9 @@
}
onOffOutputLight.OnOffStatus = onOffOutputLight.DeviceStatusReport.AttriBute[0].AttriButeData;
(rowFL.GetChildren(0) as FunctionMainView).IsSelected = onOffOutputLight.OnOffStatus == 1;
- (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = CommonFormResouce.GetSwitchStatu(onOffOutputLight.OnOffStatus == 1);
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
//璁板綍鍥炲鏃堕棿
onOffOutputLight.LastDateTime = DateTime.Now;
-
}
break;
@@ -171,7 +170,8 @@
return;
}
airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
- (tempView as Button).IsSelected = airSwitch.OnOffStatus == 1;
+ (rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
//璁板綍鍥炲鏃堕棿
airSwitch.LastDateTime = DateTime.Now;
}
@@ -180,22 +180,8 @@
//褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
if (common.DeviceStatusReport.CluterID == 3)
{
- var airSwitch = deviceUI.CommonDevice as AirSwitch;
- airSwitch.IsOnline = 1;
- for (int j = 0; j < frameLayout.ChildrenCount; j++)
- {
- var tempView = frameLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = airSwitch.IsOnline == 1;
- //璁板綍鍥炲鏃堕棿
- airSwitch.LastDateTime = DateTime.Now;
- }
- }
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
}
break;
@@ -209,26 +195,14 @@
rollerShade.DeviceStatusReport = common.DeviceStatusReport;
rollerShade.WcdType = common.DeviceStatusReport.AttriBute[0].AttriButeData;
rollerShade.LastDateTime = DateTime.Now;
+ (rowFL.GetChildren(0) as FunctionMainView).IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100;
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
}
}
if (common.DeviceStatusReport.CluterID == 3)
{
- var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
- rollershade.IsOnline = 1;
- for (int j = 0; j < frameLayout.ChildrenCount; j++)
- {
- var tempView = frameLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = rollershade.IsOnline == 1;
- //璁板綍鍥炲鏃堕棿
- rollershade.LastDateTime = DateTime.Now;
- }
- }
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
}
break;
@@ -271,54 +245,19 @@
case 28:
//姝ゅ睘鎬ф弿杩版亽娓╄澶囨澶勪簬鍝妯″紡
- //Off = 0 Auto = 1 Cool = 3 Heat = 4 FanOnly = 7 Dry = 8
ac.currentSystemMode = attriButeList[0].AttriButeData;
ac.LastDateTime = DateTime.Now;
-
- for (int j = 0; j < frameLayout.ChildrenCount; j++)
- {
- var tempView = frameLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == "Temparetrue")
- {
-
- (tempView as Button).Text = $"{ACControlBase.GetCurrentModeTemperature(ac)} 鈩�";
- }
-
- if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
- {
- (tempView as Button).IsSelected = ac.currentSystemMode != 0;
- }
- }
break;
-
-
}
-
+ (rowFL.GetChildren(0) as FunctionMainView).IsSelected = ac.currentSystemMode != 0;
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
}
//褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
if (common.DeviceStatusReport.CluterID == 3)
{
var ac = deviceUI.CommonDevice as AC;
ac.IsOnline = 1;
- for (int j = 0; j < frameLayout.ChildrenCount; j++)
- {
- var tempView = frameLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = ac.IsOnline == 1;
- //璁板綍鍥炲鏃堕棿
- ac.LastDateTime = DateTime.Now;
- }
- }
-
+ ac.LastDateTime = DateTime.Now;
}
break;
@@ -336,7 +275,7 @@
}
dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
(rowFL.GetChildren(0) as FunctionMainView).IsSelected = dimmableLight.OnOffStatus == 1;
- (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = CommonFormResouce.GetSwitchStatu(dimmableLight.OnOffStatus == 1);
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
//璁板綍鍥炲鏃堕棿
dimmableLight.LastDateTime = DateTime.Now;
}
@@ -344,7 +283,7 @@
//浜害
if (common.DeviceStatusReport.CluterID == 8)
{
- var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
+ var dimmableLight = deviceUI.CommonDevice as DimmableLight;
dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
var attriButeList = dimmableLight.DeviceStatusReport.AttriBute;
if (attriButeList == null || attriButeList.Count == 0)
@@ -357,23 +296,12 @@
//姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴�
dimmableLight.Level = attriButeList[0].AttriButeData ;
dimmableLight.LastDateTime = DateTime.Now;
- for (int j = 0; j < frameLayout.ChildrenCount; j++)
- {
- var tempView = frameLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == "LevelSeekBar")
- {
- (tempView as HorizontalSeekBar).Progress = dimmableLight.Level;
- }
- }
+ (rowFL.GetChildren(0) as FunctionMainView).IsSelected = true;
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
break;
}
}
break;
-
}
}
}
@@ -740,6 +668,7 @@
}
else
{
+ Room.CurrentRoom = Room.Lists[0];
var roomBackView = new FrameLayout()
{
BackgroundImagePath = "Room/r0.png"
@@ -783,26 +712,12 @@
};
AddChidren(functionSceneView);
- //鍔熻兘
- functionBtn = new Button()
- {
- X = Application.GetRealWidth(30),
- Y=Application.GetRealHeight(12),
- Width = Application.GetRealWidth(350),
- Height = Application.GetRealHeight(100),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
- SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextID = R.MyInternationalizationString.Function,
- IsSelected = true
- };
- functionSceneView.AddChidren(functionBtn);
-
//鍦烘櫙
var sceneBtn = new Button()
{
- X = Application.GetRealWidth(430),
+ X = Application.GetRealWidth(30),
Y = Application.GetRealHeight(12),
- Width = Application.GetRealWidth(360),
+ Width = Application.GetRealWidth(350),
Height = Application.GetRealHeight(100),
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
@@ -810,6 +725,20 @@
IsSelected = false
};
functionSceneView.AddChidren(sceneBtn);
+
+ //鍦烘櫙
+ functionBtn = new Button()
+ {
+ X = Application.GetRealWidth(430),
+ Y = Application.GetRealHeight(12),
+ Width = Application.GetRealWidth(360),
+ Height = Application.GetRealHeight(100),
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
+ SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ TextID = R.MyInternationalizationString.Function,
+ IsSelected = false
+ };
+ functionSceneView.AddChidren(functionBtn);
//鍔熻兘鍜屽満鏅痓odyView
functionSceneBodyView = new FrameLayout()
@@ -1105,17 +1034,6 @@
//////鍒ゆ柇璁惧鏄惁鏀寔鐨勫睘鎬� 濡傚紑鍏崇瓑鎺у埗
if (device.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
{
- var lightView = new FunctionMainView(xx, yy);
- itemView.AddChidren(lightView);
- lightView.Init();
- lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
- lightView.SetStatuText("寮�");
- lightView.SetDeviceName("lightee");
- //lightView.SetStatu(true);
- lightView.IsSelected = true;
- lightView.SetCollect(true);
-
- continue;
//绐楀笜 鍗峰笜
var rollerShade = (ZigBee.Device.Rollershade)device.CommonDevice;
//涓嶄笂闈炶繙绋�
@@ -1138,327 +1056,84 @@
rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
}
}
+ var lightView = new FunctionMainView(xx, yy);
+ itemView.AddChidren(lightView);
+ lightView.Init();
+ lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
+ lightView.SetStatuText(device.GetDeviceStatu());
+ lightView.SetDeviceName(rollerShade.DeviceEpointName);
+ //lightView.SetStatu(true);
+ lightView.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100;
+ lightView.SetCollect(true);
- var deviceFL = new FrameLayout
+ lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
{
- Height = Application.GetRealHeight(deviceFL_Height),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Tag = device
- };
- deviceVerticalScrolViewLayout.AddChidren(deviceFL);
- var deviceRowLayout = new RowLayout
- {
- Y = Application.GetRealHeight(25),
- Height = Application.GetRealHeight(deviceFL_Height - 25) - 1,
- LineColor = ZigbeeColor.Current.GXCBackgroundColor,
- BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
- Radius = CommonPage.BigFormRadius,
- Tag = device
- };
- deviceFL.AddChidren(deviceRowLayout);
- var deviceItemFL = new FrameLayout()
- {
- BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
- Radius = CommonPage.BigFormRadius
- };
- deviceRowLayout.AddChidren(deviceItemFL);
- var deviceIMG = new Button()
- {
- X = Application.GetRealWidth(50),
- Y = Application.GetRealHeight(30),
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- UnSelectedImagePath = device.IconPath,
- SelectedImagePath = device.OnlineIconPath,
- IsSelected = rollerShade.IsOnline == 1,
- Tag = deviceStatus_Online
- };
- deviceItemFL.AddChidren(deviceIMG);
- var deviceName = new Button()
- {
- X = Application.GetRealWidth(10),
- Y = deviceIMG.Bottom,
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(80),
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextAlignment = TextAlignment.Center,
- Text = device.CommonDevice.DeviceEpointName,
- TextSize = 10,
- IsMoreLines = true
- };
- deviceItemFL.AddChidren(deviceName);
-
- var closeBtnBG = new Device.CommonForm.SelectedStatuButton()
- {
- X = deviceName.Right,
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical,
- };
- deviceItemFL.AddChidren(closeBtnBG);
-
- var closeBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(50) + deviceName.Right,
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "WindowCovering/RollerShadeClose.png",
- SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png",
- //Visible=false
- };
- deviceItemFL.AddChidren(closeBtn);
-
- var stopBtnBG = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(120) + closeBtn.Right,
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical,
- };
- deviceItemFL.AddChidren(stopBtnBG);
- var stopBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(120) + closeBtn.Right,
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "WindowCovering/RollerShadeStop.png",
- SelectedImagePath = "WindowCovering/RollerShadeStopSelected.png",
- //Visible=false
- };
- deviceItemFL.AddChidren(stopBtn);
-
- var openBtnBG = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(20) + stopBtn.Right,
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical,
- };
- deviceItemFL.AddChidren(openBtnBG);
- var openBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(120) + stopBtn.Right,
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png",
- SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png",
- //Visible=false
- };
- deviceItemFL.AddChidren(openBtn);
- var collectionBtn = new Button()
- {
- X = deviceItemFL.Right - Application.GetRealWidth(150),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(80),
- Height = Application.GetMinRealAverage(80),
- UnSelectedImagePath = "Item/Collection.png",
- SelectedImagePath = "Item/CollectionSelected.png",
- Tag = device
- };
- //*****鍏堥殣钘�*****
- //deviceItemFL.AddChidren(collectionBtn);
- var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton
- {
- Tag = device,
- IsMoreLines = true
- };
-
- if (Room.CurrentRoom.IsLove)
- {
- deleteBtn.TextID = R.MyInternationalizationString.CancelCollect;
- deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor;
- deleteBtn.MouseUpEventHandler += collectionEvent;
- deviceRowLayout.AddRightView(deleteBtn);
- }
- else if (Room.CurrentRoom.IsSharedRoom)
- {
- //涓嶅鐞�
- }
- else
- {
- deleteBtn.MouseUpEventHandler += delEvent;
- deviceRowLayout.AddRightView(deleteBtn);
- }
-
- if (rollerShade.WcdType == -1)
- {
- CommonPage.Loading.Start();
- new System.Threading.Thread(() =>
+ (sender as Button).IsSelected = !(sender as Button).IsSelected;
+ if ((sender as Button).IsSelected)
{
- ZigBee.Device.Rollershade.ReadWcdTypeAction(rollerShade, () =>
+ zbGateway = device.CommonDevice.Gateway;
+ sendedControlCommand = false;
+ zbGateway.ReportAction += UpdateDeviceControllStatu;
+ AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
+
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
+
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
+ ((sender as Button).Parent as FunctionMainView).IsSelected = true;
+
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
{
- Application.RunOnMainThread(() =>
+ if (Parent == null)
{
- if (rollerShade.WcdType == 0)
- {
- closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png";
- closeBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png";
- openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png";
- openBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png";
- }
- else
- {
- closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png";
- closeBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png";
- openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png";
- openBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png";
- }
- CommonPage.Loading.Hide();
- });
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction(zbGateway);
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
});
- })
- { IsBackground = true }.Start();
- }
- else if (rollerShade.WcdType == 0)
- {
- closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png";
- closeBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png";
- openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png";
- openBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png";
- }
- else
- {
- closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png";
- closeBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png";
- openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png";
- openBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png";
- }
+ }
+ else
+ {
+ zbGateway = device.CommonDevice.Gateway;
+ sendedControlCommand = false;
+ zbGateway.ReportAction += UpdateDeviceControllStatu;
+ AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
- EventHandler<MouseEventArgs> curtainHandler = (sender, e) =>
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
+ ((sender as Button).Parent as FunctionMainView).IsSelected = false;
+
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction(zbGateway);
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
+ });
+ }
+ };
+
+ lightView.CardBG.MouseUpEventHandler += (sender, e) =>
{
- var curtain = new Phone.Device.Curtain.RollerShadeControl();
- UserView.HomePage.Instance.ScrollEnabled = false;
- UserView.HomePage.Instance.AddChidren(curtain);
+ var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
+ UserView.HomePage.Instance.AddChidren(rollerShadeControl);
UserView.HomePage.Instance.PageIndex += 1;
- curtain.action = RefreshBodyView;
- curtain.Show(device, Room.CurrentRoom);
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ //rollerShadeControl.action = RefreshBodyView;
+ rollerShadeControl.Show(device, Room.CurrentRoom);
};
- deviceItemFL.MouseUpEventHandler += curtainHandler;
- //deviceItemFL.MouseLongEventHandler += curtainHandler;
- deviceIMG.MouseUpEventHandler += curtainHandler;
- deviceName.MouseUpEventHandler += curtainHandler;
- //绐楀笜鍏�
- closeBtn.MouseUpEventHandler += (sender, e) =>
- {
- zbGateway = device.CommonDevice.Gateway;
- sendedControlCommand = false;
- zbGateway.ReportAction += UpdateDeviceControllStatu;
- AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
-
- rollerShade.CurtainUpDownStopControl(1);
-
- //鎺у埗寤舵椂鍥炶皟
- DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
- {
- if (Parent == null)
- {
- return;
- }
- RemoveUpdateControlDeviceStatuAction(zbGateway);
- if (sendedControlCommand == false)
- {
- DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
- }
- });
- };
- //绐楀笜鍋�
- stopBtn.MouseUpEventHandler += (sender, e) =>
- {
- zbGateway = device.CommonDevice.Gateway;
- sendedControlCommand = false;
- zbGateway.ReportAction += UpdateDeviceControllStatu;
- AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
-
- rollerShade.CurtainUpDownStopControl(2);
-
- //鎺у埗寤舵椂鍥炶皟
- DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
- {
- if (Parent == null)
- {
- return;
- }
- RemoveUpdateControlDeviceStatuAction(zbGateway);
- if (sendedControlCommand == false)
- {
- DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
- }
- });
- };
- //绐楀笜寮�
- openBtn.MouseUpEventHandler += (sender, e) =>
- {
- zbGateway = device.CommonDevice.Gateway;
- sendedControlCommand = false;
- zbGateway.ReportAction += UpdateDeviceControllStatu;
- AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
-
- rollerShade.CurtainUpDownStopControl(0);
-
- //鎺у埗寤舵椂鍥炶皟
- DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
- {
- if (Parent == null)
- {
- return;
- }
- RemoveUpdateControlDeviceStatuAction(zbGateway);
- if (sendedControlCommand == false)
- {
- DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
- }
- });
- };
- //collectionBtn.MouseUpEventHandler += (sender, e) =>
- //{
- // if (collectionBtn.IsSelected)
- // {
- // Room.Lists[0].DeleteDevice(device.FilePath);
- // collectionBtn.IsSelected = false;
- // }
- // else
- // {
- // Room.Lists[0].AddDevice(device.FilePath);
- // collectionBtn.IsSelected = true;
- // }
- // //RefreshBodyView();
- //};
- collectionBtn.MouseUpEventHandler += collectionEvent;
- //var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj==device.FilePath);
- //if(dev==null)
- //{
- // collectionBtn.IsSelected = false;
- //}
- //else
- //{
- // collectionBtn.IsSelected = true;
- //}
-
- ////寮�鍏冲仠鎸夐挳鏄惁鏄剧ず
- //foreach(var command in commandList)
- //{
- // if (command == null)
- // {
- // continue;
- // }
- // if (command.commandId==0)
- // {
- // openBtn.Visible = true;
- // }
- // else if(command.commandId==1)
- // {
- // openBtn.Visible = true;
- // }
- // else if(command.commandId==2)
- // {
- // stopBtn.Visible = true;
- // }
- //}
+ lightView.CollectButton.MouseUpEventHandler += collectionEvent;
}
else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput)
{
@@ -1492,7 +1167,7 @@
itemView.AddChidren(lightView);
lightView.Init();
lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
- lightView.SetStatuText(CommonFormResouce.GetSwitchStatu(light.OnOffStatus==1));
+ lightView.SetStatuText(device.GetDeviceStatu());
lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
lightView.IsSelected = light.OnOffStatus==1;
lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom,device.FileName));
@@ -1519,7 +1194,7 @@
light.SwitchControl(1);
- ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
((sender as Button).Parent as FunctionMainView).IsSelected = true;
//鎺у埗寤舵椂鍥炶皟
@@ -1545,7 +1220,7 @@
light.SwitchControl(0);
- ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
((sender as Button).Parent as FunctionMainView).IsSelected = false;
//鎺у埗寤舵椂鍥炶皟
@@ -1566,11 +1241,30 @@
lightView.CardBG.MouseUpEventHandler += (sender, e) =>
{
- var lightControl = new Phone.Device.Light.LightControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.action = RefreshBodyView;
- lightControl.Show(device, Room.CurrentRoom);
+ if (device.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ var lightControl = new Phone.Device.Light.OnOffControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(device, Room.CurrentRoom);
+ }
+ else if (device.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ var lightControl = new Phone.Device.Light.PlugControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(device, Room.CurrentRoom);
+ }
+ else
+ {
+ var lightControl = new Phone.Device.Light.LightControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(device, Room.CurrentRoom);
+ }
};
lightView.CollectButton.MouseUpEventHandler += collectionEvent;
@@ -1578,22 +1272,8 @@
}
else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
{
-
- var lightView = new FunctionMainView(xx, yy);
- itemView.AddChidren(lightView);
- lightView.Init();
- lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
- lightView.SetStatuText("寮�");
- lightView.SetDeviceName("airSwitch");
- //lightView.SetStatu(true);
- lightView.IsSelected = true;
- lightView.SetCollect(true);
-
- continue;
-
//绌烘皵寮�鍏�
var airSwitch = device.CommonDevice as AirSwitch;
-
//琛ヤ笂闈炶繙绋�
if (airSwitch.Gateway == null)
{
@@ -1613,99 +1293,25 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- airSwitch.ReadOnOffStatus();
airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ airSwitch.ReadOnOffStatus();
}
}
- var deviceFL = new FrameLayout
- {
- Height = Application.GetRealHeight(deviceFL_Height),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Tag = device
- };
- deviceVerticalScrolViewLayout.AddChidren(deviceFL);
- var deviceRowLayout = new RowLayout
- {
- Y = Application.GetRealHeight(25),
- Height = Application.GetRealHeight(deviceFL_Height - 25) - 1,
- LineColor = ZigbeeColor.Current.GXCBackgroundColor,
- BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
- Radius = CommonPage.BigFormRadius,
- Tag = device
- };
- deviceFL.AddChidren(deviceRowLayout);
+ var lightView = new FunctionMainView(xx, yy);
+ itemView.AddChidren(lightView);
+ lightView.Init();
+ lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
+ lightView.SetStatuText(device.GetDeviceStatu());
+ lightView.SetDeviceName(airSwitch.DeviceEpointName);
+ //lightView.SetStatu(true);
+ lightView.IsSelected = airSwitch.OnOffStatus == 1;
+ lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
- var deviceItemFL = new FrameLayout()
+ lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
{
- BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
- Radius = CommonPage.BigFormRadius
- };
- deviceRowLayout.AddChidren(deviceItemFL);
- var deviceIMG = new Button()
- {
- X = Application.GetRealWidth(50),
- Y = Application.GetRealHeight(30),
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- UnSelectedImagePath = device.IconPath,
- SelectedImagePath = device.OnlineIconPath,
- IsSelected = airSwitch.IsOnline == 1,
- Tag = deviceStatus_Online
- };
- deviceItemFL.AddChidren(deviceIMG);
- var deviceName = new Button()
- {
- X = Application.GetRealWidth(10),
- Y = deviceIMG.Bottom,
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(80),
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextAlignment = TextAlignment.Center,
- Text = device.CommonDevice.DeviceEpointName,
- TextSize = 10,
- IsMoreLines = true
- };
- deviceItemFL.AddChidren(deviceName);
-
- var collectionBtn = new Button()
- {
- X = deviceItemFL.Right - Application.GetRealWidth(150),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(80),
- Height = Application.GetMinRealAverage(80),
- UnSelectedImagePath = "Item/Collection.png",
- SelectedImagePath = "Item/CollectionSelected.png",
- Tag = device
- };
- //***鍏堥殣钘�******
- //deviceItemFL.AddChidren(collectionBtn);
- var switchBtnBG = new Button
- {
- X = deviceItemFL.Right - Application.GetRealWidth(250),
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical
- };
- deviceItemFL.AddChidren(switchBtnBG);
- var switchBtn = new Button
- {
- X = deviceItemFL.Right - Application.GetRealWidth(200),
- //Y = deviceItemFL.Bottom - Application.GetRealHeight(120),
- Width = Application.GetMinRealAverage(183),
- Height = Application.GetMinRealAverage(123),
- UnSelectedImagePath = "Item/Switch.png",
- SelectedImagePath = "Item/SwitchSelected.png",
- IsSelected = airSwitch.OnOffStatus == 1,
- Tag = deviceStatus_OnOffStatus,
- //Visible=false
- Gravity = Gravity.CenterVertical
- };
- deviceItemFL.AddChidren(switchBtn);
- switchBtn.MouseUpEventHandler += (send2, e2) =>
- {
- switchBtn.IsSelected = !switchBtn.IsSelected;
- if (switchBtn.IsSelected == true)
+ (sender as Button).IsSelected = !(sender as Button).IsSelected;
+ if ((sender as Button).IsSelected)
{
zbGateway = device.CommonDevice.Gateway;
sendedControlCommand = false;
@@ -1714,8 +1320,11 @@
airSwitch.SwitchControl(1);
- //鎺у埗寤舵椂鍥炶皟
- DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
+ ((sender as Button).Parent as FunctionMainView).IsSelected = true;
+
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
{
if (Parent == null)
{
@@ -1737,8 +1346,11 @@
airSwitch.SwitchControl(0);
- //鎺у埗寤舵椂鍥炶皟
- DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
+ ((sender as Button).Parent as FunctionMainView).IsSelected = false;
+
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
{
if (Parent == null)
{
@@ -1753,86 +1365,19 @@
}
};
- var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton
+ lightView.CardBG.MouseUpEventHandler += (sender, e) =>
{
- Tag = device,
- IsMoreLines = true
- };
- if (Room.CurrentRoom.IsLove)
- {
- deleteBtn.TextID = R.MyInternationalizationString.CancelCollect;
- deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor;
- deleteBtn.MouseUpEventHandler += collectionEvent;
- deviceRowLayout.AddRightView(deleteBtn);
- }
- else if (Room.CurrentRoom.IsSharedRoom)
- {
- //涓嶅鐞�
- }
- else
- {
- deleteBtn.MouseUpEventHandler += delEvent;
- deviceRowLayout.AddRightView(deleteBtn);
- }
-
-
- EventHandler<MouseEventArgs> airSwitchHandler = (sender, e) =>
- {
- var airSwitchControl = new Phone.Device.AirSwitch.AirSwitchControl();
- UserView.HomePage.Instance.AddChidren(airSwitchControl);
+ var lightControl = new Phone.Device.Light.AirSwitchControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
- airSwitchControl.action = RefreshBodyView;
- airSwitchControl.Show(device, Room.CurrentRoom);
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(device, Room.CurrentRoom);
};
- //deviceItemFL.MouseLongEventHandler += airSwitchHandler;
- deviceItemFL.MouseUpEventHandler += airSwitchHandler;
- deviceName.MouseUpEventHandler += airSwitchHandler;
- deviceIMG.MouseUpEventHandler += airSwitchHandler;
- //collectionBtn.MouseUpEventHandler += (sender, e) =>
- //{
- // if (collectionBtn.IsSelected)
- // {
- // Room.Lists[0].DeleteDevice(device.FilePath);
- // collectionBtn.IsSelected = false;
- // if(Room.CurrentRoom==Room.Lists[0])
- // {
- // RefreshBodyView();
- // }
- // }
- // else
- // {
- // Room.Lists[0].AddDevice(device.FilePath);
- // collectionBtn.IsSelected = true;
- // }
- // //RefreshBodyView();
- //};
- collectionBtn.MouseUpEventHandler += collectionEvent;
-
- //var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FilePath);
- //if (dev == null)
- //{
- // collectionBtn.IsSelected = false;
- //}
- //else
- //{
- // collectionBtn.IsSelected = true;
- //}
+ lightView.CollectButton.MouseUpEventHandler += collectionEvent;
}
else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
{
-
- var lightView = new FunctionMainView(xx, yy);
- itemView.AddChidren(lightView);
- lightView.Init();
- lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
- lightView.SetStatuText("寮�");
- lightView.SetDeviceName("绌鸿皟");
- //lightView.SetStatu(true);
- lightView.IsSelected = true;
- lightView.SetCollect(true);
-
- continue;
//鎭掓俯鍣�-AC-绌鸿皟
var ac = device.CommonDevice as AC;
@@ -1869,237 +1414,19 @@
ac.ReadSystemMode();
}
}
+ var lightView = new FunctionMainView(xx, yy);
+ itemView.AddChidren(lightView);
+ lightView.Init();
+ lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
+ lightView.SetStatuText(device.GetDeviceStatu());
+ lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+ lightView.IsSelected = ac.currentSystemMode != 0;
+ lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
- var deviceFL = new FrameLayout
+ lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
{
- Height = Application.GetRealHeight(deviceFL_Height),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Tag = device
- };
- deviceVerticalScrolViewLayout.AddChidren(deviceFL);
- var deviceRowLayout = new RowLayout
- {
- Y = Application.GetRealHeight(25),
- Height = Application.GetRealHeight(deviceFL_Height - 25) - 1,
- LineColor = ZigbeeColor.Current.GXCBackgroundColor,
- BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
- Radius = CommonPage.BigFormRadius,
- Tag = device
- };
- deviceFL.AddChidren(deviceRowLayout);
-
- var deviceItemFL = new FrameLayout()
- {
- BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
- Radius = CommonPage.BigFormRadius
- };
- deviceRowLayout.AddChidren(deviceItemFL);
- var deviceIMG = new Button()
- {
- X = Application.GetRealWidth(50),
- Y = Application.GetRealHeight(30),
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- UnSelectedImagePath = device.IconPath,
- SelectedImagePath = device.OnlineIconPath,
- IsSelected = ac.IsOnline == 1,
- Tag = deviceStatus_Online
- };
- deviceItemFL.AddChidren(deviceIMG);
- var deviceName = new Button()
- {
- X = Application.GetRealWidth(10),
- Y = deviceIMG.Bottom,
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(80),
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextAlignment = TextAlignment.Center,
- Text = device.CommonDevice.DeviceEpointName,
- TextSize = 10,
- IsMoreLines = true
- };
- deviceItemFL.AddChidren(deviceName);
-
- var collectionBtn = new Button()
- {
- X = deviceItemFL.Right - Application.GetRealWidth(150),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(80),
- Height = Application.GetMinRealAverage(80),
- UnSelectedImagePath = "Item/Collection.png",
- SelectedImagePath = "Item/CollectionSelected.png",
- Tag = device
- };
- //***鍏堥殣钘�******
- //deviceItemFL.AddChidren(collectionBtn);
-
- //鍑�
- var reduceBtnBG = new Device.CommonForm.SelectedStatuButton()
- {
- X = deviceName.Right,
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical,
- };
- deviceItemFL.AddChidren(reduceBtnBG);
-
- var reduceBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(30) + deviceName.Right,
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Item/Reduce.png",
- SelectedImagePath = "Item/ReduceSelected.png",
- };
- deviceItemFL.AddChidren(reduceBtn);
- //褰撳墠娓╁害
- var currentTemperatureBtn = new Button()
- {
- X = Application.GetRealWidth(50) + reduceBtn.Right,
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(110),
- Gravity = Gravity.CenterVertical,
- TextColor = ZigbeeColor.Current.TextBlack,
- TextSize = 16,
- Text = $"{Device.AC.ACControlBase.GetCurrentModeTemperature(ac)} 掳C",
- Tag = "Temparetrue"
- };
- deviceItemFL.AddChidren(currentTemperatureBtn);
- reduceBtn.MouseUpEventHandler += (send2, e2) =>
- {
- if (Device.AC.ACControlBase.IsOpen(ac) == false)
- {
- Device.AC.ACControlBase.ShowACIsCloseTip();
- return;
- }
- //cool
- if (ac.currentSystemMode == 3 || ac.currentSystemMode == 8)
- {
- if (ac.currentCoolingSetpoint <= ACControlBase.Temperature_Low)
- {
- return;
- }
- ac.currentCoolingSetpoint -= 1;
- ac.SetCoolingTemperatureAsync(ac.currentCoolingSetpoint * 100);
- currentTemperatureBtn.Text = $"{ac.currentCoolingSetpoint} 掳C";
- }
- //heat
- else if (ac.currentSystemMode == 4)
- {
- if (ac.currentHeatingSetpoint <= ACControlBase.Temperature_Low)
- {
- return;
- }
- ac.currentHeatingSetpoint -= 1;
- ac.SetHeatingTemperatureAsync(ac.currentHeatingSetpoint * 100);
- currentTemperatureBtn.Text = $"{ac.currentHeatingSetpoint} 掳C";
- }
- else if (ac.currentSystemMode == 1)
- {
- if (ac.currentAutoSetpoint <= ACControlBase.Temperature_Low)
- {
- return;
- }
- ac.currentAutoSetpoint -= 1;
- ac.SetAutoTemperatureAsync(ac.currentAutoSetpoint * 100);
- currentTemperatureBtn.Text = $"{ac.currentAutoSetpoint} 掳C";
- }
- //auto
- //dry
- //currentTemperatureBtn.Text = $"{Device.AC.ACControlBase.GetCurrentModeTemperature(ac)} 掳C";
- };
-
- var addBtnBG = new Device.CommonForm.SelectedStatuButton()
- {
- X = currentTemperatureBtn.Right,
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical
- };
- deviceItemFL.AddChidren(addBtnBG);
-
- var addBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = Application.GetRealWidth(30) + currentTemperatureBtn.Right,
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Item/Add.png",
- SelectedImagePath = "Item/AddSelected.png",
- };
- deviceItemFL.AddChidren(addBtn);
-
- addBtn.MouseUpEventHandler += (send2, e2) =>
- {
- if (Device.AC.ACControlBase.IsOpen(ac) == false)
- {
- Device.AC.ACControlBase.ShowACIsCloseTip();
- return;
- }
- //cool
- if (ac.currentSystemMode == 3 || ac.currentSystemMode == 8)
- {
- if (ac.currentCoolingSetpoint >= ACControlBase.Temperature_High)
- {
- return;
- }
- ac.currentCoolingSetpoint += 1;
- ac.SetCoolingTemperatureAsync(ac.currentCoolingSetpoint * 100);
-
- currentTemperatureBtn.Text = $"{ac.currentCoolingSetpoint} 掳C";
- }
- //heat
- else if (ac.currentSystemMode == 4)
- {
- if (ac.currentHeatingSetpoint >= ACControlBase.Temperature_High)
- {
- return;
- }
- ac.currentHeatingSetpoint += 1;
- ac.SetHeatingTemperatureAsync(ac.currentHeatingSetpoint * 100);
-
- currentTemperatureBtn.Text = $"{ac.currentHeatingSetpoint} 掳C";
- }
- else if (ac.currentSystemMode == 1)
- {
- if (ac.currentAutoSetpoint >= ACControlBase.Temperature_High)
- {
- return;
- }
- ac.currentAutoSetpoint += 1;
- ac.SetAutoTemperatureAsync(ac.currentAutoSetpoint * 100);
- currentTemperatureBtn.Text = $"{ac.currentAutoSetpoint} 掳C";
- }
-
- };
-
- var switchBtnBG = new Button
- {
- X = deviceItemFL.Right - Application.GetRealWidth(250),
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(250),
- Gravity = Gravity.CenterVertical
- };
- deviceItemFL.AddChidren(switchBtnBG);
- var switchBtn = new Button
- {
- X = deviceItemFL.Right - Application.GetRealWidth(200),
- //Y = deviceItemFL.Bottom - Application.GetRealHeight(120),
- Width = Application.GetMinRealAverage(183),
- Height = Application.GetMinRealAverage(123),
- UnSelectedImagePath = "Item/Switch.png",
- SelectedImagePath = "Item/SwitchSelected.png",
- IsSelected = ac.currentSystemMode != 0,
- Tag = deviceStatus_OnOffStatus,
- //Visible=false
- Gravity = Gravity.CenterVertical
- };
- deviceItemFL.AddChidren(switchBtn);
- switchBtn.MouseUpEventHandler += (send2, e2) =>
- {
- switchBtn.IsSelected = !switchBtn.IsSelected;
- if (switchBtn.IsSelected == true)
+ (sender as Button).IsSelected = !(sender as Button).IsSelected;
+ if ((sender as Button).IsSelected)
{
zbGateway = device.CommonDevice.Gateway;
sendedControlCommand = false;
@@ -2108,20 +1435,23 @@
ac.Open();
- //鎺у埗寤舵椂鍥炶皟
- //DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
- //{
- // if (Parent == null)
- // {
- // return;
- // }
- // RemoveUpdateControlDeviceStatuAction(zbGateway);
- // if (sendedControlCommand == false)
- // {
- // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
- // }
- //});
- }
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
+ ((sender as Button).Parent as FunctionMainView).IsSelected = true;
+
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction(zbGateway);
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
+ });
+ }
else
{
zbGateway = device.CommonDevice.Gateway;
@@ -2131,57 +1461,35 @@
ac.Close();
- //鎺у埗寤舵椂鍥炶皟
- //DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
- //{
- // if (Parent == null)
- // {
- // return;
- // }
- // RemoveUpdateControlDeviceStatuAction(zbGateway);
- // if (sendedControlCommand == false)
- // {
- // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
- // }
- //});
- }
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
+ ((sender as Button).Parent as FunctionMainView).IsSelected = false;
+
+ //鎺у埗寤舵椂鍥炶皟
+ DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
+ {
+ if (Parent == null)
+ {
+ return;
+ }
+ RemoveUpdateControlDeviceStatuAction(zbGateway);
+ if (sendedControlCommand == false)
+ {
+ DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+ }
+ });
+ }
};
- var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton
+ lightView.CardBG.MouseUpEventHandler += (sender, e) =>
{
- Tag = device,
- IsMoreLines = true
- };
- if (Room.CurrentRoom.IsLove)
- {
- deleteBtn.TextID = R.MyInternationalizationString.CancelCollect;
- deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor;
- deleteBtn.MouseUpEventHandler += collectionEvent;
- deviceRowLayout.AddRightView(deleteBtn);
- }
- else if (Room.CurrentRoom.IsSharedRoom)
- {
- //涓嶅鐞�
- }
- else
- {
- deleteBtn.MouseUpEventHandler += delEvent;
- deviceRowLayout.AddRightView(deleteBtn);
- }
-
-
- EventHandler<MouseEventArgs> acHandler = (sender, e) =>
- {
- var acControl = new Phone.Device.AC.ACControl { };
- UserView.HomePage.Instance.AddChidren(acControl);
+ var lightControl = new Phone.Device.AC.ACControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
- acControl.action = RefreshBodyView;
- acControl.Show(device, Room.CurrentRoom);
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(device, Room.CurrentRoom);
};
- //deviceItemFL.MouseLongEventHandler += acHandler;
- deviceItemFL.MouseUpEventHandler += acHandler;
- deviceName.MouseUpEventHandler += acHandler;
- deviceIMG.MouseUpEventHandler += acHandler;
+
+ lightView.CollectButton.MouseUpEventHandler += collectionEvent;
}
else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
{
@@ -2215,7 +1523,7 @@
itemView.AddChidren(lightView);
lightView.Init();
lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
- lightView.SetStatuText(CommonFormResouce.GetSwitchStatu(dimmableLight.OnOffStatus == 1));
+ lightView.SetStatuText(device.GetDeviceStatu());
lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
lightView.IsSelected = dimmableLight.OnOffStatus == 1;
lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
@@ -2242,7 +1550,7 @@
dimmableLight.SwitchControl(1);
- ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
((sender as Button).Parent as FunctionMainView).IsSelected = true;
//鎺у埗寤舵椂鍥炶皟
@@ -2268,7 +1576,7 @@
dimmableLight.SwitchControl(0);
- ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
+ ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu());
((sender as Button).Parent as FunctionMainView).IsSelected = false;
//鎺у埗寤舵椂鍥炶皟
@@ -2293,7 +1601,7 @@
UserView.HomePage.Instance.AddChidren(dimmableLightControl);
UserView.HomePage.Instance.PageIndex += 1;
UserView.HomePage.Instance.ScrollEnabled = false;
- dimmableLightControl.action = RefreshBodyView;
+ //dimmableLightControl.action = RefreshBodyView;
dimmableLightControl.Show(device, Room.CurrentRoom);
};
@@ -2305,16 +1613,11 @@
itemView.AddChidren(lightView);
lightView.Init();
lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
- lightView.SetStatuText("寮�");
- lightView.SetDeviceName("鎸夐敭");
+ lightView.SetStatuText(device.GetDeviceStatu());
+ lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
//lightView.SetStatu(true);
lightView.IsSelected = true;
- lightView.SetCollect(true);
-
- continue;
- //鎸夐敭
- var panel = (Panel)device.CommonDevice;
-
+ lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
index 2855c62..b8477ee 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
@@ -79,7 +79,12 @@
/// 鏀寔鐨勯閫熸ā寮�
/// </summary>
public List<FanMode> fanModes = new List<FanMode> { };
-
+ /// <summary>
+ /// <para>鑷畾涔夌┖璋冩敮鎸佺殑妯″紡(榛樿鍏ㄥ叧)</para>
+ /// <para>鏁扮粍绱㈠紩 -> 0:鍒跺喎 1:鍒剁儹 2:閫侀 3:闄ゆ箍 4:鑷姩</para>
+ /// <para>鍊� -> 1:浠ｈ〃浣跨敤 0:浠ｈ〃涓嶄娇鐢�</para>
+ /// </summary>
+ public int[] listSupportMode = new int[5] { 0, 0, 0, 0, 0 };
/// <summary>
/// 鑾峰彇褰撳墠瀹ゅ唴娓╁害.
@@ -154,6 +159,14 @@
ReadAttri(Device.Cluster_ID.FanControl, AttriButeId.FanModeSequence);
}
+ /// <summary>
+ /// 鑾峰彇绌鸿皟鑷畾涔夎缃殑鏀寔妯″紡
+ /// </summary>
+ public void ReadModeSupport()
+ {
+ ReadAttri(Device.Cluster_ID.Thermostat, AttriButeId.AcModeSupport);
+ }
+
///<summary >
///璁剧疆鍒跺喎搴︽暟.
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index e5c61ca..4a2710a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using Java.Util;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
@@ -20,18 +21,29 @@
#region 闂ㄩ攣鏈湴鍙橀噺
/// <summary>
- /// 闂ㄩ攣鏈湴鐢ㄦ埛鍒楄〃
+ /// 鏈湴闂ㄩ攣鐢ㄦ埛鍜岃处鎴峰垪琛�
+ /// key:闂ㄩ攣鐢ㄦ埛ID
/// </summary>
/// <returns></returns>
public Dictionary<int, LocaDoorLockObj> localDoorLockUserList = new Dictionary<int, LocaDoorLockObj>();
- public string currentUserDisplayMethod = string.Empty;
+ /// <summary>
+ /// 鏈湴闂ㄨ处鎴峰垪琛�
+ /// key:璐︽埛ID锛堜富璐︽埛鏄疓UID锛屽瓙璐︽埛鏄垎浜繃鏉ョ殑璐︽埛ID锛�
+ /// </summary>
+ /// <returns></returns>
+ public Dictionary<string, LocaDoorLockObj> localDoorLockAccountList = new Dictionary<string, LocaDoorLockObj>();
+
+ public string currentUserDisplayMethod = string.Empty;//褰撳墠鐢ㄦ埛鏄剧ず鏂瑰紡
+ //鏈湴鎵�鏈夎处鎴峰垪琛�
public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
public static int RemoteUnlockCount = 5;//杩滅▼寮�閿佹鏁伴檺鍒�
public static string RemoteUnlockPassword = string.Empty;//杩滅▼寮�閿佸瘑鐮�
public static DateTime maxValue = DateTime.MaxValue;
public static DateTime minValue = DateTime.MinValue;
public string LocalTempPassword = string.Empty;//鏈湴鐢熸垚鐨勪复鏃跺瘑鐮�
-
+ public Dictionary<string, bool> IsFreezeAccount = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
+ public Dictionary<string, bool> HasRemoteUnlockAccess = new Dictionary<string, bool> { };//鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
+ public Dictionary<string, bool> IsFailedToGetDoorLockInfo = new Dictionary<string, bool> { };//鏄惁鑾峰彇闂ㄩ攣鏁版嵁澶辫触
#region 涓存椂瀵嗙爜淇℃伅
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
@@ -169,10 +181,6 @@
/// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
/// </summary>
public string PrimaryId = "";
- /// <summary>
- /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId
- /// </summary>
- public string CloudAccountId = "";
/// <summary>
/// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�) -->閿悕 : OpenLockMode (鍙��)
/// </summary>
@@ -1960,6 +1968,8 @@
public async System.Threading.Tasks.Task<DoorlockUserInfo> GetDoorlockUserInfoAsync()
{
DoorlockUserInfo result = null;
+ int totalNum = 0;
+ int currentNum = -1;
DoorLockUserDetailData doorLockUserDetailData = new DoorLockUserDetailData { };
if (Gateway == null)
{
@@ -2025,15 +2035,15 @@
var data = new JObject { { "PassData", passData } };
jObject.Add("Data", data);
Gateway.Send(("ClientDataPassthrough"), jObject.ToString());
+
}
catch { }
- //鎺ユ敹涓�涓寘鏈�澶氱瓑5绉掞紝娌℃湁鏀跺埌灏遍��鍑�
- while ((DateTime.Now - dateTime).TotalMilliseconds < 5000)
+ //鎺ユ敹涓�涓寘鏈�澶氱瓑3绉掞紝娌℃湁鏀跺埌灏遍��鍑�
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 3000)
{
await System.Threading.Tasks.Task.Delay(100);
}
-
Gateway.Actions -= action;
DebugPrintLog("ClientDataPassthrough_Actions 閫�鍑�" + System.DateTime.Now.ToString());
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
index 9256d23..6f60fa8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
@@ -251,7 +251,11 @@
/// <summary>
/// 杩囪檻缃戞竻娲楁爣蹇�,濡傛灉杩斿洖鍗佽繘鍒躲��42銆戝垯浠ｈ〃闇�瑕佹竻娲楁护缃�
/// </summary>
- FilterCleaningStatus = 4097,
+ FilterCleaningStatus = 4097,
+ /// <summary>
+ /// 绌鸿皟鑷畾涔夎缃殑鏀寔妯″紡
+ /// </summary>
+ AcModeSupport = 4099,
#endregion
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index e922717..477029d 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -288,6 +288,17 @@
public readonly static int ModifyTempPasswordTip2 = 201;
public readonly static int FirstFloor = 202;
public readonly static int GwResponseOvertime = 203;
+ public readonly static int CloudServerResponseOvertime = 204;
+ public readonly static int SureToFreezeAccount = 205;
+ public readonly static int FreezeFailed = 206;
+ public readonly static int UnFreezeFailed = 207;
+ public readonly static int DoorLockShare = 208;
+ public readonly static int EntryCurrentUnlockMethod = 209;
+ public readonly static int SureGiveAccessToSubaccount = 210;
+ public readonly static int GiveAccessToSubaccountSuccess = 211;
+ public readonly static int GiveAccessToSubaccountFailed = 212;
+ public readonly static int AccountIsFreezed = 213;
+ public readonly static int NoAccess = 214;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -556,11 +567,15 @@
public readonly static int selecfoolr = 5368;
- #region 鐧诲綍娉ㄥ唽
- /// <summary>
- /// HDL Home
- /// </summary>
- public const int AppName = 10000;
+ #region 鐧诲綍娉ㄥ唽
+ /// <summary>
+ /// HDL Home
+ /// </summary>
+ public const int AppName = 10000;
+ /// <summary>
+ /// 甯哥敤
+ /// </summary>
+ public const int Favorite = 10001;
/// <summary>
@@ -1068,10 +1083,7 @@
- /// <summary>
- /// 鍠滅埍
- /// </summary>
- public static readonly int Favorite = 100000;
+
public static readonly int OK = 10005;
@@ -1667,10 +1679,6 @@
/// </summary>
public const int uCurtainMotor = 15079;
/// <summary>
- /// 瀹夐槻鍔熻兘
- /// </summary>
- public const int uSecurityFunction = 15084;
- /// <summary>
/// 璁惧绫诲瀷
/// </summary>
public const int uDeviceType = 15085;
@@ -2055,9 +2063,9 @@
/// </summary>
public const int uSharedDevice = 15083;
/// <summary>
- /// 鍏变韩鎴块棿
+ /// 鏈垎閰�
/// </summary>
- public const int uSharedRoom = 15084;
+ public const int uUnallocated = 15084;
/// <summary>
/// 閰嶇疆鍏变韩璁惧
/// </summary>
@@ -3203,9 +3211,9 @@
/// </summary>
public const int uGatewayType = 15520;
/// <summary>
- /// 璁惧纭欢鐗堟湰
+ /// 纭欢鐗堟湰
/// </summary>
- public const int uDeviceHardwareVersion = 15521;
+ public const int uHardwareVersion = 15521;
/// <summary>
/// 缃戝叧鍥轰欢鐗堟湰
/// </summary>
@@ -3231,9 +3239,9 @@
/// </summary>
public const int uDeviceImageId = 15527;
/// <summary>
- /// 缃戝叧闀滃儚ID
+ /// 闀滃儚ID
/// </summary>
- public const int uGatewayImageId = 15528;
+ public const int uImageId = 15528;
/// <summary>
/// 铏氭嫙椹卞姩闀滃儚ID
/// </summary>
@@ -3305,7 +3313,7 @@
/// <summary>
/// 鍥轰欢鏃ユ湡
/// </summary>
- public const int uGatewayHardwareDate = 15548;
+ public const int uHardwareDate = 15548;
/// <summary>
/// 娌℃湁鍙戠幇鏂扮綉鍏�,璇锋鏌ョ綉鍏抽摼鎺ユ槸鍚︽甯�
/// </summary>
@@ -3523,17 +3531,9 @@
/// </summary>
public const int uPleaseSelectNetwork = 15614;
/// <summary>
- /// 鍚� 绉�
+ /// 璇疯緭鍏iFi瀵嗙爜
/// </summary>
- public const int uNameHadSpace = 15615;
- /// <summary>
- /// 瀵� 鐮�
- /// </summary>
- public const int uPasswordHadSpace = 15616;
- /// <summary>
- /// 璇疯緭鍏ョ綉缁滃瘑鐮�
- /// </summary>
- public const int uPleaseInputNetworkPassword = 15617;
+ public const int uPleaseInputWifiPassword = 15617;
/// <summary>
/// 瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
/// </summary>
@@ -4650,6 +4650,42 @@
/// 鑳佽揩瀵嗙爜璁剧疆鎴愬姛
/// </summary>
public const int uSetCoercePasswordSuccess = 15897;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟妯″紡澶辫触
+ /// </summary>
+ public const int uGetAcModeFail = 15898;
+ /// <summary>
+ /// 璁剧疆绌鸿皟妯″紡澶辫触
+ /// </summary>
+ public const int uSetAcModeFail = 15899;
+ /// <summary>
+ /// 缁х画娣诲姞缃戝叧
+ /// </summary>
+ public const int uContinuteToAddGateway = 15900;
+ /// <summary>
+ /// 杩斿洖涓婚〉
+ /// </summary>
+ public const int uGobackToHomePage = 15901;
+ /// <summary>
+ /// 娣诲姞鏅鸿兘缃戝叧鎴愬姛
+ /// </summary>
+ public const int uAddgatewaySuccess = 15902;
+ /// <summary>
+ /// UDP妯″紡(鎺ㄨ崘)
+ /// </summary>
+ public const int uUdpModeRecommend = 15903;
+ /// <summary>
+ /// AP妯″紡
+ /// </summary>
+ public const int uApMode = 15904;
+ /// <summary>
+ /// 璺宠浆鍒扮Щ鍔ㄨ澶�
+ /// </summary>
+ public const int uJumpToMobileDevice= 15905;
+ /// <summary>
+ /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
+ /// </summary>
+ public const int uWlanConnectHomeWifi = 15906;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 6ddf8ca..6aec2ea 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -155,6 +155,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\SiphonateDirectionAndLimitSettionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirConditionerZbGatewayDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirSwitchCloudContrDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CommonForm\DirectionCommonForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CurtainAutoOpenDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CurtainSiphonateDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\RepeaterZigbeeDirectionForm.cs" />
@@ -175,6 +176,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockUserMangement.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\EntryStatusPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\FunctionSetting.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\FunctionSettingSub.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\HistoryRecordPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\MasterManagementPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\MemberFrozenPage.cs" />
@@ -187,11 +189,16 @@
<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\GatewayAddSuccessForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\GatewayProductInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayRebindForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpSelectNetworkForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayGeneralInformationForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayCoordinatorInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayFirmwareUpdateForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayVirtualDriveInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberNotEsixtForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewPhoneForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckOldPhoneForm.cs" />
@@ -276,13 +283,10 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessGatewaySearchForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessGwClickButtonForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessGwSelectNetworkForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayCoordinatorInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayFirmwareInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayHistoryFirmwareVersionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayLinuxInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayLinuxInfoForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayVirtualDriveInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayVirtualDriveListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlAutoBackUpForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlAutoBackupSettionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlGatewayBackUpForm.cs" />
--
Gitblit v1.8.0