From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 16
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 10565 ++++++++++++++++++++--------------------
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 139
ZigbeeApp/Home.Ios/Resources/DeviceName.ini | 6
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 74
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 288
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 24
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs | 53
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 30
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 12
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs | 23
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 23
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidence.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 26
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected.png | 0
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 27
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs | 32
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 113
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 51
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotion.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 77
ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs | 83
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 23
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 8
ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs | 1
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs | 495 +
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 34
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 16
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 1
ZigbeeApp/Home.Ios/Info.plist | 4
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml | 26
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs | 20
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs | 29
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs | 2
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 2
ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs | 16
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs | 27
ZigbeeApp/Shared/Shared.projitems | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs | 251
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberNotEsixtForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs | 3
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButton.png | 0
ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs | 135
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 67
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 4
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected.png | 0
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 254
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 57
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 29
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs | 23
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs | 27
ZigbeeApp/Shared/Common/CommonPage.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 76
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs | 176
ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs | 172
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 30
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs | 37
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs | 11
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs | 125
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ScanQrCodeGroud.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 2
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorTemperatureLightDetailCardForm.cs | 57
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs | 2
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButton.png | 0
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 93
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs | 64
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs | 52
ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 1
ZigbeeApp/Home.Ios/Resources/Language.ini | 16
ZigbeeApp/Home.Ios/Home.IOS.csproj | 8
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected2.png | 0
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs | 78
ZigbeeApp/Shared/R.cs | 64
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs | 171
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 27
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 8
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotion.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidence.png | 0
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 51
ZigbeeApp/Shared/Common/Device.cs | 107
ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs | 89
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 5
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 9
ZigbeeApp/Home.Ios/Resources/Phone/Item/ScanQrCodeGroud.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs | 149
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 61
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 8
/dev/null | 45
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 19
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 5
ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs | 1
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected2.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs | 12
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs | 27
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 46
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs | 62
ZigbeeApp/Shared/Common/House.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs | 2
143 files changed, 8,481 insertions(+), 6,969 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
index be83f7f..2cccf66 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
@@ -118,6 +118,12 @@
MPR0310-ZB.10 = 2300 / 3璺紑鍏冲皬妯″潡 / 3璺紑鍏冲皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
;鏂规偊鏂伴灏忔ā鍧�
MFA01-ZB.10 = 2310 / 鏂规偊鏂伴灏忔ā鍧� / 鏂规偊鏂伴灏忔ā鍧� / 2300 / 缁х數鍣� / 鏂伴妯″潡
+;鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡
+MLR0310-ZB.20= 2311 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
+;娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡
+MLR0205-ZB.18= 2312 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
+;娆ф爣14璺共鎺ョ偣灏忔ā鍧�
+MLDRY14-ZB.18= 2313 / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 2300 / 缁х數鍣� / 骞叉帴鐐规ā鍧�
;***************************************************************
; 璋冨厜鍣ㄨ澶�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index e960eea..568a03f 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -343,6 +343,11 @@
339=鐭娓╁害澶辫触
340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
341=璇疯緭鍏ユ纭殑鏁板��
+342=璇疯緭鍏ユ纭殑娓╁害鍊�
+343=璇疯緭鍏ユ纭殑婀垮害鍊�
+344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+345=鐩爣鍚嶇О澶暱
+346=鐭ラ亾浜�
5097=鍙栨秷
5098=纭畾
@@ -1890,6 +1895,17 @@
16147=寮�鍏抽敭
16148=杩囨埛
16149=浣忓畢杩囨埛
+16150=杞Щ浣忓畢鍒板叾浠朎voyo
+16151=Home璐﹀彿
+16152=璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+16153=1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+16154=2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+16155=3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+16156=杩囨埛璐﹀彿
+16157=璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+16158=鏌ョ湅
+16159=瀹氭椂鑷姩鍏抽棴
+16160=涓嶅叧闂�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButton.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButton.png
new file mode 100755
index 0000000..5c472b6
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButton.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected.png
new file mode 100755
index 0000000..ee6ad95
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected2.png
new file mode 100755
index 0000000..ffcf6fd
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButtonSelected2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotion.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotion.png
new file mode 100755
index 0000000..22723f6
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotion.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected.png
new file mode 100755
index 0000000..bb287fd
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected2.png
new file mode 100755
index 0000000..0f56c72
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotionSelected2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ScanQrCodeGroud.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ScanQrCodeGroud.png
new file mode 100755
index 0000000..257298f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ScanQrCodeGroud.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidence.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidence.png
new file mode 100755
index 0000000..1fd7221
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidence.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 797b6cd..1b9d694 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -388,7 +388,7 @@
<AndroidAsset Include="Assets\Phone\Account\Code.png" />
<AndroidAsset Include="Assets\Phone\Account\HidePwd.png" />
<AndroidAsset Include="Assets\Phone\Account\Logo_loginBG.png" />
- <AndroidAsset Include="Assets\Phone\Account\Logo_White.png" />
+ <AndroidAsset Include="Assets\Phone\Account\Logo_Evoyo.png" />
<AndroidAsset Include="Assets\Phone\Account\Password.png" />
<AndroidAsset Include="Assets\Phone\Account\PhoneEmail_White.png" />
<AndroidAsset Include="Assets\Phone\Account\UnhidePwd.png" />
@@ -2487,6 +2487,33 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\BindPic\TemperaTureReduction.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Account\Logo_WhiteHome.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButton.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorMotion.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ScanQrCodeGroud.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\TransferOfResidence.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 847bb8c..ab6d27e 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120081801" android:installLocation="auto" android:versionName="1.1.0120081801">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120082701" android:installLocation="auto" android:versionName="1.1.0120082701">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.evoyo.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 af3c412..77c05a9 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -31,233 +31,233 @@
public partial class Animation
{
- // aapt resource value: 0x7F010000
- public const int abc_fade_in = 2130771968;
+ // aapt resource value: 0x7f050000
+ public const int abc_fade_in = 2131034112;
- // aapt resource value: 0x7F010001
- public const int abc_fade_out = 2130771969;
+ // aapt resource value: 0x7f050001
+ public const int abc_fade_out = 2131034113;
- // aapt resource value: 0x7F010002
- public const int abc_grow_fade_in_from_bottom = 2130771970;
+ // aapt resource value: 0x7f050002
+ public const int abc_grow_fade_in_from_bottom = 2131034114;
- // aapt resource value: 0x7F010003
- public const int abc_popup_enter = 2130771971;
+ // aapt resource value: 0x7f050003
+ public const int abc_popup_enter = 2131034115;
- // aapt resource value: 0x7F010004
- public const int abc_popup_exit = 2130771972;
+ // aapt resource value: 0x7f050004
+ public const int abc_popup_exit = 2131034116;
- // aapt resource value: 0x7F010005
- public const int abc_shrink_fade_out_from_bottom = 2130771973;
+ // aapt resource value: 0x7f050005
+ public const int abc_shrink_fade_out_from_bottom = 2131034117;
- // aapt resource value: 0x7F010006
- public const int abc_slide_in_bottom = 2130771974;
+ // aapt resource value: 0x7f050006
+ public const int abc_slide_in_bottom = 2131034118;
- // aapt resource value: 0x7F010007
- public const int abc_slide_in_top = 2130771975;
+ // aapt resource value: 0x7f050007
+ public const int abc_slide_in_top = 2131034119;
- // aapt resource value: 0x7F010008
- public const int abc_slide_out_bottom = 2130771976;
+ // aapt resource value: 0x7f050008
+ public const int abc_slide_out_bottom = 2131034120;
- // aapt resource value: 0x7F010009
- public const int abc_slide_out_top = 2130771977;
+ // aapt resource value: 0x7f050009
+ public const int abc_slide_out_top = 2131034121;
- // aapt resource value: 0x7F01000A
- public const int design_bottom_sheet_slide_in = 2130771978;
+ // aapt resource value: 0x7f05000a
+ public const int design_bottom_sheet_slide_in = 2131034122;
- // aapt resource value: 0x7F01000B
- public const int design_bottom_sheet_slide_out = 2130771979;
+ // aapt resource value: 0x7f05000b
+ public const int design_bottom_sheet_slide_out = 2131034123;
- // aapt resource value: 0x7F01000C
- public const int design_snackbar_in = 2130771980;
+ // aapt resource value: 0x7f05000c
+ public const int design_snackbar_in = 2131034124;
- // aapt resource value: 0x7F01000D
- public const int design_snackbar_out = 2130771981;
+ // aapt resource value: 0x7f05000d
+ public const int design_snackbar_out = 2131034125;
- // aapt resource value: 0x7F01000E
- public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
+ // aapt resource value: 0x7f05000e
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
- // aapt resource value: 0x7F01000F
- public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
+ // aapt resource value: 0x7f05000f
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
- // aapt resource value: 0x7F010010
- public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
+ // aapt resource value: 0x7f050010
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
- // aapt resource value: 0x7F010011
- public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
+ // aapt resource value: 0x7f050011
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
- // aapt resource value: 0x7F010012
- public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
+ // aapt resource value: 0x7f050012
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
- // aapt resource value: 0x7F010013
- public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
+ // aapt resource value: 0x7f050013
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
- // aapt resource value: 0x7F010014
- public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
+ // aapt resource value: 0x7f050014
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
- // aapt resource value: 0x7F010015
- public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
+ // aapt resource value: 0x7f050015
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
- // aapt resource value: 0x7F010016
- public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
+ // aapt resource value: 0x7f050016
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
- // aapt resource value: 0x7F010017
- public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
+ // aapt resource value: 0x7f050017
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
- // aapt resource value: 0x7F010018
- public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
+ // aapt resource value: 0x7f050018
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
- // aapt resource value: 0x7F010019
- public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
+ // aapt resource value: 0x7f050019
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
- // aapt resource value: 0x7F01001A
- public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
+ // aapt resource value: 0x7f05001a
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
- // aapt resource value: 0x7F01001B
- public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
+ // aapt resource value: 0x7f05001b
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
- // aapt resource value: 0x7F01001C
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
+ // aapt resource value: 0x7f05001c
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
- // aapt resource value: 0x7F01001D
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
+ // aapt resource value: 0x7f05001d
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
- // aapt resource value: 0x7F01001E
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
+ // aapt resource value: 0x7f05001e
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
- // aapt resource value: 0x7F01001F
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
+ // aapt resource value: 0x7f05001f
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
- // aapt resource value: 0x7F010020
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
+ // aapt resource value: 0x7f050020
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
- // aapt resource value: 0x7F010021
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
+ // aapt resource value: 0x7f050021
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
- // aapt resource value: 0x7F010022
- public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
+ // aapt resource value: 0x7f050022
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
- // aapt resource value: 0x7F010023
- public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
+ // aapt resource value: 0x7f050023
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
- // aapt resource value: 0x7F010024
- public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
+ // aapt resource value: 0x7f050024
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
- // aapt resource value: 0x7F010025
- public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
+ // aapt resource value: 0x7f050025
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
- // aapt resource value: 0x7F010026
- public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
+ // aapt resource value: 0x7f050026
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
- // aapt resource value: 0x7F010027
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
+ // aapt resource value: 0x7f050027
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
- // aapt resource value: 0x7F010028
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
+ // aapt resource value: 0x7f050028
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
- // aapt resource value: 0x7F010029
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
+ // aapt resource value: 0x7f050029
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
- // aapt resource value: 0x7F01002A
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
+ // aapt resource value: 0x7f05002a
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
- // aapt resource value: 0x7F01002B
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
+ // aapt resource value: 0x7f05002b
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
- // aapt resource value: 0x7F01002C
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
+ // aapt resource value: 0x7f05002c
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
- // aapt resource value: 0x7F01002D
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
+ // aapt resource value: 0x7f05002d
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
- // aapt resource value: 0x7F01002E
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
+ // aapt resource value: 0x7f05002e
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
- // aapt resource value: 0x7F01002F
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
+ // aapt resource value: 0x7f05002f
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
- // aapt resource value: 0x7F010030
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
+ // aapt resource value: 0x7f050030
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
- // aapt resource value: 0x7F010031
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
+ // aapt resource value: 0x7f050031
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
- // aapt resource value: 0x7F010032
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
+ // aapt resource value: 0x7f050032
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
- // aapt resource value: 0x7F010033
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
+ // aapt resource value: 0x7f050033
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
- // aapt resource value: 0x7F010034
- public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
+ // aapt resource value: 0x7f050034
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
- // aapt resource value: 0x7F010035
- public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
+ // aapt resource value: 0x7f050035
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
- // aapt resource value: 0x7F010036
- public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
+ // aapt resource value: 0x7f050036
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
- // aapt resource value: 0x7F010037
- public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
+ // aapt resource value: 0x7f050037
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
- // aapt resource value: 0x7F010038
- public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
+ // aapt resource value: 0x7f050038
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
- // aapt resource value: 0x7F010039
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
+ // aapt resource value: 0x7f050039
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
- // aapt resource value: 0x7F01003A
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
+ // aapt resource value: 0x7f05003a
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
- // aapt resource value: 0x7F01003B
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
+ // aapt resource value: 0x7f05003b
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
- // aapt resource value: 0x7F01003C
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
+ // aapt resource value: 0x7f05003c
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
- // aapt resource value: 0x7F01003D
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
+ // aapt resource value: 0x7f05003d
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
- // aapt resource value: 0x7F01003E
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
+ // aapt resource value: 0x7f05003e
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
- // aapt resource value: 0x7F01003F
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
+ // aapt resource value: 0x7f05003f
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
- // aapt resource value: 0x7F010040
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
+ // aapt resource value: 0x7f050040
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
- // aapt resource value: 0x7F010041
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
+ // aapt resource value: 0x7f050041
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
- // aapt resource value: 0x7F010042
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
+ // aapt resource value: 0x7f050042
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
- // aapt resource value: 0x7F010043
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
+ // aapt resource value: 0x7f050043
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
- // aapt resource value: 0x7F010044
- public const int move_in = 2130772036;
+ // aapt resource value: 0x7f050044
+ public const int move_in = 2131034180;
- // aapt resource value: 0x7F010045
- public const int move_out = 2130772037;
+ // aapt resource value: 0x7f050045
+ public const int move_out = 2131034181;
- // aapt resource value: 0x7F010046
- public const int pickerview_dialog_scale_in = 2130772038;
+ // aapt resource value: 0x7f050046
+ public const int pickerview_dialog_scale_in = 2131034182;
- // aapt resource value: 0x7F010047
- public const int pickerview_dialog_scale_out = 2130772039;
+ // aapt resource value: 0x7f050047
+ public const int pickerview_dialog_scale_out = 2131034183;
- // aapt resource value: 0x7F010048
- public const int pickerview_slide_in_bottom = 2130772040;
+ // aapt resource value: 0x7f050048
+ public const int pickerview_slide_in_bottom = 2131034184;
- // aapt resource value: 0x7F010049
- public const int pickerview_slide_out_bottom = 2130772041;
+ // aapt resource value: 0x7f050049
+ public const int pickerview_slide_out_bottom = 2131034185;
- // aapt resource value: 0x7F01004A
- public const int tooltip_enter = 2130772042;
+ // aapt resource value: 0x7f05004a
+ public const int tooltip_enter = 2131034186;
- // aapt resource value: 0x7F01004B
- public const int tooltip_exit = 2130772043;
+ // aapt resource value: 0x7f05004b
+ public const int tooltip_exit = 2131034187;
static Animation()
{
@@ -272,8 +272,8 @@
public partial class Animator
{
- // aapt resource value: 0x7F020000
- public const int design_appbar_state_list_animator = 2130837504;
+ // aapt resource value: 0x7f060000
+ public const int design_appbar_state_list_animator = 2131099648;
static Animator()
{
@@ -288,8 +288,8 @@
public partial class Array
{
- // aapt resource value: 0x7F030000
- public const int arc_colors_default = 2130903040;
+ // aapt resource value: 0x7f0f0000
+ public const int arc_colors_default = 2131689472;
static Array()
{
@@ -304,1355 +304,1355 @@
public partial class Attribute
{
- // aapt resource value: 0x7F040000
- public const int actionBarDivider = 2130968576;
+ // aapt resource value: 0x7f010052
+ public const int actionBarDivider = 2130772050;
- // aapt resource value: 0x7F040001
- public const int actionBarItemBackground = 2130968577;
+ // aapt resource value: 0x7f010053
+ public const int actionBarItemBackground = 2130772051;
- // aapt resource value: 0x7F040002
- public const int actionBarPopupTheme = 2130968578;
+ // aapt resource value: 0x7f01004c
+ public const int actionBarPopupTheme = 2130772044;
- // aapt resource value: 0x7F040003
- public const int actionBarSize = 2130968579;
+ // aapt resource value: 0x7f010051
+ public const int actionBarSize = 2130772049;
- // aapt resource value: 0x7F040004
- public const int actionBarSplitStyle = 2130968580;
+ // aapt resource value: 0x7f01004e
+ public const int actionBarSplitStyle = 2130772046;
- // aapt resource value: 0x7F040005
- public const int actionBarStyle = 2130968581;
+ // aapt resource value: 0x7f01004d
+ public const int actionBarStyle = 2130772045;
- // aapt resource value: 0x7F040006
- public const int actionBarTabBarStyle = 2130968582;
+ // aapt resource value: 0x7f010048
+ public const int actionBarTabBarStyle = 2130772040;
- // aapt resource value: 0x7F040007
- public const int actionBarTabStyle = 2130968583;
+ // aapt resource value: 0x7f010047
+ public const int actionBarTabStyle = 2130772039;
- // aapt resource value: 0x7F040008
- public const int actionBarTabTextStyle = 2130968584;
+ // aapt resource value: 0x7f010049
+ public const int actionBarTabTextStyle = 2130772041;
- // aapt resource value: 0x7F040009
- public const int actionBarTheme = 2130968585;
+ // aapt resource value: 0x7f01004f
+ public const int actionBarTheme = 2130772047;
- // aapt resource value: 0x7F04000A
- public const int actionBarWidgetTheme = 2130968586;
+ // aapt resource value: 0x7f010050
+ public const int actionBarWidgetTheme = 2130772048;
- // aapt resource value: 0x7F04000B
- public const int actionButtonStyle = 2130968587;
+ // aapt resource value: 0x7f01006d
+ public const int actionButtonStyle = 2130772077;
- // aapt resource value: 0x7F04000C
- public const int actionDropDownStyle = 2130968588;
+ // aapt resource value: 0x7f010069
+ public const int actionDropDownStyle = 2130772073;
- // aapt resource value: 0x7F04000D
- public const int actionLayout = 2130968589;
+ // aapt resource value: 0x7f0100c4
+ public const int actionLayout = 2130772164;
- // aapt resource value: 0x7F04000E
- public const int actionMenuTextAppearance = 2130968590;
+ // aapt resource value: 0x7f010054
+ public const int actionMenuTextAppearance = 2130772052;
- // aapt resource value: 0x7F04000F
- public const int actionMenuTextColor = 2130968591;
+ // aapt resource value: 0x7f010055
+ public const int actionMenuTextColor = 2130772053;
- // aapt resource value: 0x7F040010
- public const int actionModeBackground = 2130968592;
+ // aapt resource value: 0x7f010058
+ public const int actionModeBackground = 2130772056;
- // aapt resource value: 0x7F040011
- public const int actionModeCloseButtonStyle = 2130968593;
+ // aapt resource value: 0x7f010057
+ public const int actionModeCloseButtonStyle = 2130772055;
- // aapt resource value: 0x7F040012
- public const int actionModeCloseDrawable = 2130968594;
+ // aapt resource value: 0x7f01005a
+ public const int actionModeCloseDrawable = 2130772058;
- // aapt resource value: 0x7F040013
- public const int actionModeCopyDrawable = 2130968595;
+ // aapt resource value: 0x7f01005c
+ public const int actionModeCopyDrawable = 2130772060;
- // aapt resource value: 0x7F040014
- public const int actionModeCutDrawable = 2130968596;
+ // aapt resource value: 0x7f01005b
+ public const int actionModeCutDrawable = 2130772059;
- // aapt resource value: 0x7F040015
- public const int actionModeFindDrawable = 2130968597;
+ // aapt resource value: 0x7f010060
+ public const int actionModeFindDrawable = 2130772064;
- // aapt resource value: 0x7F040016
- public const int actionModePasteDrawable = 2130968598;
+ // aapt resource value: 0x7f01005d
+ public const int actionModePasteDrawable = 2130772061;
- // aapt resource value: 0x7F040017
- public const int actionModePopupWindowStyle = 2130968599;
+ // aapt resource value: 0x7f010062
+ public const int actionModePopupWindowStyle = 2130772066;
- // aapt resource value: 0x7F040018
- public const int actionModeSelectAllDrawable = 2130968600;
+ // aapt resource value: 0x7f01005e
+ public const int actionModeSelectAllDrawable = 2130772062;
- // aapt resource value: 0x7F040019
- public const int actionModeShareDrawable = 2130968601;
+ // aapt resource value: 0x7f01005f
+ public const int actionModeShareDrawable = 2130772063;
- // aapt resource value: 0x7F04001A
- public const int actionModeSplitBackground = 2130968602;
+ // aapt resource value: 0x7f010059
+ public const int actionModeSplitBackground = 2130772057;
- // aapt resource value: 0x7F04001B
- public const int actionModeStyle = 2130968603;
+ // aapt resource value: 0x7f010056
+ public const int actionModeStyle = 2130772054;
- // aapt resource value: 0x7F04001C
- public const int actionModeWebSearchDrawable = 2130968604;
+ // aapt resource value: 0x7f010061
+ public const int actionModeWebSearchDrawable = 2130772065;
- // aapt resource value: 0x7F04001D
- public const int actionOverflowButtonStyle = 2130968605;
+ // aapt resource value: 0x7f01004a
+ public const int actionOverflowButtonStyle = 2130772042;
- // aapt resource value: 0x7F04001E
- public const int actionOverflowMenuStyle = 2130968606;
+ // aapt resource value: 0x7f01004b
+ public const int actionOverflowMenuStyle = 2130772043;
- // aapt resource value: 0x7F04001F
- public const int actionProviderClass = 2130968607;
+ // aapt resource value: 0x7f0100c6
+ public const int actionProviderClass = 2130772166;
- // aapt resource value: 0x7F040020
- public const int actionViewClass = 2130968608;
+ // aapt resource value: 0x7f0100c5
+ public const int actionViewClass = 2130772165;
- // aapt resource value: 0x7F040021
- public const int activityChooserViewStyle = 2130968609;
+ // aapt resource value: 0x7f010075
+ public const int activityChooserViewStyle = 2130772085;
- // aapt resource value: 0x7F040022
- public const int alertDialogButtonGroupStyle = 2130968610;
+ // aapt resource value: 0x7f01009a
+ public const int alertDialogButtonGroupStyle = 2130772122;
- // aapt resource value: 0x7F040023
- public const int alertDialogCenterButtons = 2130968611;
+ // aapt resource value: 0x7f01009b
+ public const int alertDialogCenterButtons = 2130772123;
- // aapt resource value: 0x7F040024
- public const int alertDialogStyle = 2130968612;
+ // aapt resource value: 0x7f010099
+ public const int alertDialogStyle = 2130772121;
- // aapt resource value: 0x7F040025
- public const int alertDialogTheme = 2130968613;
+ // aapt resource value: 0x7f01009c
+ public const int alertDialogTheme = 2130772124;
- // aapt resource value: 0x7F040026
- public const int allowStacking = 2130968614;
+ // aapt resource value: 0x7f0100b2
+ public const int allowStacking = 2130772146;
- // aapt resource value: 0x7F040027
- public const int alpha = 2130968615;
+ // aapt resource value: 0x7f0100b3
+ public const int alpha = 2130772147;
- // aapt resource value: 0x7F040028
- public const int alphabeticModifiers = 2130968616;
+ // aapt resource value: 0x7f0100c1
+ public const int alphabeticModifiers = 2130772161;
- // aapt resource value: 0x7F040029
- public const int arc_border_color = 2130968617;
+ // aapt resource value: 0x7f0101a3
+ public const int arc_border_color = 2130772387;
- // aapt resource value: 0x7F04002A
- public const int arc_border_width = 2130968618;
+ // aapt resource value: 0x7f0101a2
+ public const int arc_border_width = 2130772386;
- // aapt resource value: 0x7F04002B
- public const int arc_colors = 2130968619;
+ // aapt resource value: 0x7f0101a1
+ public const int arc_colors = 2130772385;
- // aapt resource value: 0x7F04002C
- public const int arc_max = 2130968620;
+ // aapt resource value: 0x7f0101a4
+ public const int arc_max = 2130772388;
- // aapt resource value: 0x7F04002D
- public const int arc_min = 2130968621;
+ // aapt resource value: 0x7f0101a5
+ public const int arc_min = 2130772389;
- // aapt resource value: 0x7F04002E
- public const int arc_open_angle = 2130968622;
+ // aapt resource value: 0x7f01019f
+ public const int arc_open_angle = 2130772383;
- // aapt resource value: 0x7F04002F
- public const int arc_progress = 2130968623;
+ // aapt resource value: 0x7f0101a6
+ public const int arc_progress = 2130772390;
- // aapt resource value: 0x7F040030
- public const int arc_progress_bar_color = 2130968624;
+ // aapt resource value: 0x7f0101ae
+ public const int arc_progress_bar_color = 2130772398;
- // aapt resource value: 0x7F040031
- public const int arc_progress_bar_text_unit = 2130968625;
+ // aapt resource value: 0x7f0101af
+ public const int arc_progress_bar_text_unit = 2130772399;
- // aapt resource value: 0x7F040032
- public const int arc_rotate_angle = 2130968626;
+ // aapt resource value: 0x7f0101a0
+ public const int arc_rotate_angle = 2130772384;
- // aapt resource value: 0x7F040033
- public const int arc_shadow_radius = 2130968627;
+ // aapt resource value: 0x7f0101ad
+ public const int arc_shadow_radius = 2130772397;
- // aapt resource value: 0x7F040034
- public const int arc_thumb_color = 2130968628;
+ // aapt resource value: 0x7f0101a8
+ public const int arc_thumb_color = 2130772392;
- // aapt resource value: 0x7F040035
- public const int arc_thumb_radius = 2130968629;
+ // aapt resource value: 0x7f0101a9
+ public const int arc_thumb_radius = 2130772393;
- // aapt resource value: 0x7F040036
- public const int arc_thumb_shadow_color = 2130968630;
+ // aapt resource value: 0x7f0101ab
+ public const int arc_thumb_shadow_color = 2130772395;
- // aapt resource value: 0x7F040037
- public const int arc_thumb_shadow_radius = 2130968631;
+ // aapt resource value: 0x7f0101aa
+ public const int arc_thumb_shadow_radius = 2130772394;
- // aapt resource value: 0x7F040038
- public const int arc_thumb_width = 2130968632;
+ // aapt resource value: 0x7f0101a7
+ public const int arc_thumb_width = 2130772391;
- // aapt resource value: 0x7F040039
- public const int arc_width = 2130968633;
+ // aapt resource value: 0x7f01019e
+ public const int arc_width = 2130772382;
- // aapt resource value: 0x7F04003A
- public const int arrowHeadLength = 2130968634;
+ // aapt resource value: 0x7f0100ba
+ public const int arrowHeadLength = 2130772154;
- // aapt resource value: 0x7F04003B
- public const int arrowShaftLength = 2130968635;
+ // aapt resource value: 0x7f0100bb
+ public const int arrowShaftLength = 2130772155;
- // aapt resource value: 0x7F04003C
- public const int autoCompleteTextViewStyle = 2130968636;
+ // aapt resource value: 0x7f0100a1
+ public const int autoCompleteTextViewStyle = 2130772129;
- // aapt resource value: 0x7F04003D
- public const int autoSizeMaxTextSize = 2130968637;
+ // aapt resource value: 0x7f01003b
+ public const int autoSizeMaxTextSize = 2130772027;
- // aapt resource value: 0x7F04003E
- public const int autoSizeMinTextSize = 2130968638;
+ // aapt resource value: 0x7f01003a
+ public const int autoSizeMinTextSize = 2130772026;
- // aapt resource value: 0x7F04003F
- public const int autoSizePresetSizes = 2130968639;
+ // aapt resource value: 0x7f010039
+ public const int autoSizePresetSizes = 2130772025;
- // aapt resource value: 0x7F040040
- public const int autoSizeStepGranularity = 2130968640;
+ // aapt resource value: 0x7f010038
+ public const int autoSizeStepGranularity = 2130772024;
- // aapt resource value: 0x7F040041
- public const int autoSizeTextType = 2130968641;
+ // aapt resource value: 0x7f010037
+ public const int autoSizeTextType = 2130772023;
- // aapt resource value: 0x7F040042
- public const int background = 2130968642;
+ // aapt resource value: 0x7f010015
+ public const int background = 2130771989;
- // aapt resource value: 0x7F040043
- public const int backgroundSplit = 2130968643;
+ // aapt resource value: 0x7f010017
+ public const int backgroundSplit = 2130771991;
- // aapt resource value: 0x7F040044
- public const int backgroundStacked = 2130968644;
+ // aapt resource value: 0x7f010016
+ public const int backgroundStacked = 2130771990;
- // aapt resource value: 0x7F040045
- public const int backgroundTint = 2130968645;
+ // aapt resource value: 0x7f0100fd
+ public const int backgroundTint = 2130772221;
- // aapt resource value: 0x7F040046
- public const int backgroundTintMode = 2130968646;
+ // aapt resource value: 0x7f0100fe
+ public const int backgroundTintMode = 2130772222;
- // aapt resource value: 0x7F040047
- public const int barLength = 2130968647;
+ // aapt resource value: 0x7f0100bc
+ public const int barLength = 2130772156;
- // aapt resource value: 0x7F040048
- public const int behavior_autoHide = 2130968648;
+ // aapt resource value: 0x7f010128
+ public const int behavior_autoHide = 2130772264;
- // aapt resource value: 0x7F040049
- public const int behavior_hideable = 2130968649;
+ // aapt resource value: 0x7f010105
+ public const int behavior_hideable = 2130772229;
- // aapt resource value: 0x7F04004A
- public const int behavior_overlapTop = 2130968650;
+ // aapt resource value: 0x7f010131
+ public const int behavior_overlapTop = 2130772273;
- // aapt resource value: 0x7F04004B
- public const int behavior_peekHeight = 2130968651;
+ // aapt resource value: 0x7f010104
+ public const int behavior_peekHeight = 2130772228;
- // aapt resource value: 0x7F04004C
- public const int behavior_skipCollapsed = 2130968652;
+ // aapt resource value: 0x7f010106
+ public const int behavior_skipCollapsed = 2130772230;
- // aapt resource value: 0x7F04004D
- public const int biometricPromptDialogTheme = 2130968653;
+ // aapt resource value: 0x7f01015a
+ public const int biometricPromptDialogTheme = 2130772314;
- // aapt resource value: 0x7F04004F
- public const int borderlessButtonStyle = 2130968655;
+ // aapt resource value: 0x7f010126
+ public const int borderWidth = 2130772262;
- // aapt resource value: 0x7F04004E
- public const int borderWidth = 2130968654;
+ // aapt resource value: 0x7f010072
+ public const int borderlessButtonStyle = 2130772082;
- // aapt resource value: 0x7F040050
- public const int bottomSheetDialogTheme = 2130968656;
+ // aapt resource value: 0x7f010120
+ public const int bottomSheetDialogTheme = 2130772256;
- // aapt resource value: 0x7F040051
- public const int bottomSheetStyle = 2130968657;
+ // aapt resource value: 0x7f010121
+ public const int bottomSheetStyle = 2130772257;
- // aapt resource value: 0x7F040052
- public const int buttonBarButtonStyle = 2130968658;
+ // aapt resource value: 0x7f01006f
+ public const int buttonBarButtonStyle = 2130772079;
- // aapt resource value: 0x7F040053
- public const int buttonBarNegativeButtonStyle = 2130968659;
+ // aapt resource value: 0x7f01009f
+ public const int buttonBarNegativeButtonStyle = 2130772127;
- // aapt resource value: 0x7F040054
- public const int buttonBarNeutralButtonStyle = 2130968660;
+ // aapt resource value: 0x7f0100a0
+ public const int buttonBarNeutralButtonStyle = 2130772128;
- // aapt resource value: 0x7F040055
- public const int buttonBarPositiveButtonStyle = 2130968661;
+ // aapt resource value: 0x7f01009e
+ public const int buttonBarPositiveButtonStyle = 2130772126;
- // aapt resource value: 0x7F040056
- public const int buttonBarStyle = 2130968662;
+ // aapt resource value: 0x7f01006e
+ public const int buttonBarStyle = 2130772078;
- // aapt resource value: 0x7F040057
- public const int buttonGravity = 2130968663;
+ // aapt resource value: 0x7f0100f2
+ public const int buttonGravity = 2130772210;
- // aapt resource value: 0x7F040058
- public const int buttonPanelSideLayout = 2130968664;
+ // aapt resource value: 0x7f01002a
+ public const int buttonPanelSideLayout = 2130772010;
- // aapt resource value: 0x7F040059
- public const int buttonStyle = 2130968665;
+ // aapt resource value: 0x7f0100a2
+ public const int buttonStyle = 2130772130;
- // aapt resource value: 0x7F04005A
- public const int buttonStyleSmall = 2130968666;
+ // aapt resource value: 0x7f0100a3
+ public const int buttonStyleSmall = 2130772131;
- // aapt resource value: 0x7F04005B
- public const int buttonTint = 2130968667;
+ // aapt resource value: 0x7f0100b4
+ public const int buttonTint = 2130772148;
- // aapt resource value: 0x7F04005C
- public const int buttonTintMode = 2130968668;
+ // aapt resource value: 0x7f0100b5
+ public const int buttonTintMode = 2130772149;
- // aapt resource value: 0x7F04005D
- public const int checkboxStyle = 2130968669;
+ // aapt resource value: 0x7f0100a4
+ public const int checkboxStyle = 2130772132;
- // aapt resource value: 0x7F04005E
- public const int checkedTextViewStyle = 2130968670;
+ // aapt resource value: 0x7f0100a5
+ public const int checkedTextViewStyle = 2130772133;
- // aapt resource value: 0x7F04005F
- public const int closeIcon = 2130968671;
+ // aapt resource value: 0x7f0100d5
+ public const int closeIcon = 2130772181;
- // aapt resource value: 0x7F040060
- public const int closeItemLayout = 2130968672;
+ // aapt resource value: 0x7f010027
+ public const int closeItemLayout = 2130772007;
- // aapt resource value: 0x7F040061
- public const int collapseContentDescription = 2130968673;
+ // aapt resource value: 0x7f0100f4
+ public const int collapseContentDescription = 2130772212;
- // aapt resource value: 0x7F040063
- public const int collapsedTitleGravity = 2130968675;
+ // aapt resource value: 0x7f0100f3
+ public const int collapseIcon = 2130772211;
- // aapt resource value: 0x7F040064
- public const int collapsedTitleTextAppearance = 2130968676;
+ // aapt resource value: 0x7f010113
+ public const int collapsedTitleGravity = 2130772243;
- // aapt resource value: 0x7F040062
- public const int collapseIcon = 2130968674;
+ // aapt resource value: 0x7f01010d
+ public const int collapsedTitleTextAppearance = 2130772237;
- // aapt resource value: 0x7F040065
- public const int color = 2130968677;
+ // aapt resource value: 0x7f0100b6
+ public const int color = 2130772150;
- // aapt resource value: 0x7F040066
- public const int colorAccent = 2130968678;
+ // aapt resource value: 0x7f010091
+ public const int colorAccent = 2130772113;
- // aapt resource value: 0x7F040067
- public const int colorBackgroundFloating = 2130968679;
+ // aapt resource value: 0x7f010098
+ public const int colorBackgroundFloating = 2130772120;
- // aapt resource value: 0x7F040068
- public const int colorButtonNormal = 2130968680;
+ // aapt resource value: 0x7f010095
+ public const int colorButtonNormal = 2130772117;
- // aapt resource value: 0x7F040069
- public const int colorControlActivated = 2130968681;
+ // aapt resource value: 0x7f010093
+ public const int colorControlActivated = 2130772115;
- // aapt resource value: 0x7F04006A
- public const int colorControlHighlight = 2130968682;
+ // aapt resource value: 0x7f010094
+ public const int colorControlHighlight = 2130772116;
- // aapt resource value: 0x7F04006B
- public const int colorControlNormal = 2130968683;
+ // aapt resource value: 0x7f010092
+ public const int colorControlNormal = 2130772114;
- // aapt resource value: 0x7F04006C
- public const int colorError = 2130968684;
+ // aapt resource value: 0x7f0100b1
+ public const int colorError = 2130772145;
- // aapt resource value: 0x7F04006D
- public const int colorPrimary = 2130968685;
+ // aapt resource value: 0x7f01008f
+ public const int colorPrimary = 2130772111;
- // aapt resource value: 0x7F04006E
- public const int colorPrimaryDark = 2130968686;
+ // aapt resource value: 0x7f010090
+ public const int colorPrimaryDark = 2130772112;
- // aapt resource value: 0x7F04006F
- public const int colorSwitchThumbNormal = 2130968687;
+ // aapt resource value: 0x7f010096
+ public const int colorSwitchThumbNormal = 2130772118;
- // aapt resource value: 0x7F040070
- public const int commitIcon = 2130968688;
+ // aapt resource value: 0x7f0100da
+ public const int commitIcon = 2130772186;
- // aapt resource value: 0x7F040071
- public const int contentDescription = 2130968689;
+ // aapt resource value: 0x7f0100c7
+ public const int contentDescription = 2130772167;
- // aapt resource value: 0x7F040072
- public const int contentInsetEnd = 2130968690;
+ // aapt resource value: 0x7f010020
+ public const int contentInsetEnd = 2130772000;
- // aapt resource value: 0x7F040073
- public const int contentInsetEndWithActions = 2130968691;
+ // aapt resource value: 0x7f010024
+ public const int contentInsetEndWithActions = 2130772004;
- // aapt resource value: 0x7F040074
- public const int contentInsetLeft = 2130968692;
+ // aapt resource value: 0x7f010021
+ public const int contentInsetLeft = 2130772001;
- // aapt resource value: 0x7F040075
- public const int contentInsetRight = 2130968693;
+ // aapt resource value: 0x7f010022
+ public const int contentInsetRight = 2130772002;
- // aapt resource value: 0x7F040076
- public const int contentInsetStart = 2130968694;
+ // aapt resource value: 0x7f01001f
+ public const int contentInsetStart = 2130771999;
- // aapt resource value: 0x7F040077
- public const int contentInsetStartWithNavigation = 2130968695;
+ // aapt resource value: 0x7f010023
+ public const int contentInsetStartWithNavigation = 2130772003;
- // aapt resource value: 0x7F040078
- public const int contentScrim = 2130968696;
+ // aapt resource value: 0x7f01010e
+ public const int contentScrim = 2130772238;
- // aapt resource value: 0x7F040079
- public const int controlBackground = 2130968697;
+ // aapt resource value: 0x7f010097
+ public const int controlBackground = 2130772119;
- // aapt resource value: 0x7F04007A
- public const int counterEnabled = 2130968698;
+ // aapt resource value: 0x7f010147
+ public const int counterEnabled = 2130772295;
- // aapt resource value: 0x7F04007B
- public const int counterMaxLength = 2130968699;
+ // aapt resource value: 0x7f010148
+ public const int counterMaxLength = 2130772296;
- // aapt resource value: 0x7F04007C
- public const int counterOverflowTextAppearance = 2130968700;
+ // aapt resource value: 0x7f01014a
+ public const int counterOverflowTextAppearance = 2130772298;
- // aapt resource value: 0x7F04007D
- public const int counterTextAppearance = 2130968701;
+ // aapt resource value: 0x7f010149
+ public const int counterTextAppearance = 2130772297;
- // aapt resource value: 0x7F04007E
- public const int curtain_bar_bg_color = 2130968702;
+ // aapt resource value: 0x7f0101b2
+ public const int curtain_bar_bg_color = 2130772402;
- // aapt resource value: 0x7F04007F
- public const int curtain_bar_border_color = 2130968703;
+ // aapt resource value: 0x7f0101b3
+ public const int curtain_bar_border_color = 2130772403;
- // aapt resource value: 0x7F040080
- public const int curtain_bar_color = 2130968704;
+ // aapt resource value: 0x7f0101b0
+ public const int curtain_bar_color = 2130772400;
- // aapt resource value: 0x7F040081
- public const int curtain_bar_height = 2130968705;
+ // aapt resource value: 0x7f0101b5
+ public const int curtain_bar_height = 2130772405;
- // aapt resource value: 0x7F040082
- public const int curtain_bar_width = 2130968706;
+ // aapt resource value: 0x7f0101b4
+ public const int curtain_bar_width = 2130772404;
- // aapt resource value: 0x7F040083
- public const int customNavigationLayout = 2130968707;
+ // aapt resource value: 0x7f010018
+ public const int customNavigationLayout = 2130771992;
- // aapt resource value: 0x7F040084
- public const int defaultQueryHint = 2130968708;
+ // aapt resource value: 0x7f0100d4
+ public const int defaultQueryHint = 2130772180;
- // aapt resource value: 0x7F040085
- public const int dialogPreferredPadding = 2130968709;
+ // aapt resource value: 0x7f010067
+ public const int dialogPreferredPadding = 2130772071;
- // aapt resource value: 0x7F040086
- public const int dialogTheme = 2130968710;
+ // aapt resource value: 0x7f010066
+ public const int dialogTheme = 2130772070;
- // aapt resource value: 0x7F040087
- public const int displayOptions = 2130968711;
+ // aapt resource value: 0x7f01000e
+ public const int displayOptions = 2130771982;
- // aapt resource value: 0x7F040088
- public const int divider = 2130968712;
+ // aapt resource value: 0x7f010014
+ public const int divider = 2130771988;
- // aapt resource value: 0x7F040089
- public const int dividerHorizontal = 2130968713;
+ // aapt resource value: 0x7f010074
+ public const int dividerHorizontal = 2130772084;
- // aapt resource value: 0x7F04008A
- public const int dividerPadding = 2130968714;
+ // aapt resource value: 0x7f0100c0
+ public const int dividerPadding = 2130772160;
- // aapt resource value: 0x7F04008B
- public const int dividerVertical = 2130968715;
+ // aapt resource value: 0x7f010073
+ public const int dividerVertical = 2130772083;
- // aapt resource value: 0x7F04008C
- public const int drawableSize = 2130968716;
+ // aapt resource value: 0x7f0100b8
+ public const int drawableSize = 2130772152;
- // aapt resource value: 0x7F04008D
- public const int drawerArrowStyle = 2130968717;
+ // aapt resource value: 0x7f010009
+ public const int drawerArrowStyle = 2130771977;
- // aapt resource value: 0x7F04008F
- public const int dropdownListPreferredItemHeight = 2130968719;
+ // aapt resource value: 0x7f010086
+ public const int dropDownListViewStyle = 2130772102;
- // aapt resource value: 0x7F04008E
- public const int dropDownListViewStyle = 2130968718;
+ // aapt resource value: 0x7f01006a
+ public const int dropdownListPreferredItemHeight = 2130772074;
- // aapt resource value: 0x7F040090
- public const int editTextBackground = 2130968720;
+ // aapt resource value: 0x7f01007b
+ public const int editTextBackground = 2130772091;
- // aapt resource value: 0x7F040091
- public const int editTextColor = 2130968721;
+ // aapt resource value: 0x7f01007a
+ public const int editTextColor = 2130772090;
- // aapt resource value: 0x7F040092
- public const int editTextStyle = 2130968722;
+ // aapt resource value: 0x7f0100a6
+ public const int editTextStyle = 2130772134;
- // aapt resource value: 0x7F040093
- public const int elevation = 2130968723;
+ // aapt resource value: 0x7f010025
+ public const int elevation = 2130772005;
- // aapt resource value: 0x7F040094
- public const int errorEnabled = 2130968724;
+ // aapt resource value: 0x7f010145
+ public const int errorEnabled = 2130772293;
- // aapt resource value: 0x7F040095
- public const int errorTextAppearance = 2130968725;
+ // aapt resource value: 0x7f010146
+ public const int errorTextAppearance = 2130772294;
- // aapt resource value: 0x7F040096
- public const int expandActivityOverflowButtonDrawable = 2130968726;
+ // aapt resource value: 0x7f010029
+ public const int expandActivityOverflowButtonDrawable = 2130772009;
- // aapt resource value: 0x7F040097
- public const int expanded = 2130968727;
+ // aapt resource value: 0x7f0100ff
+ public const int expanded = 2130772223;
- // aapt resource value: 0x7F040098
- public const int expandedTitleGravity = 2130968728;
+ // aapt resource value: 0x7f010114
+ public const int expandedTitleGravity = 2130772244;
- // aapt resource value: 0x7F040099
- public const int expandedTitleMargin = 2130968729;
+ // aapt resource value: 0x7f010107
+ public const int expandedTitleMargin = 2130772231;
- // aapt resource value: 0x7F04009A
- public const int expandedTitleMarginBottom = 2130968730;
+ // aapt resource value: 0x7f01010b
+ public const int expandedTitleMarginBottom = 2130772235;
- // aapt resource value: 0x7F04009B
- public const int expandedTitleMarginEnd = 2130968731;
+ // aapt resource value: 0x7f01010a
+ public const int expandedTitleMarginEnd = 2130772234;
- // aapt resource value: 0x7F04009C
- public const int expandedTitleMarginStart = 2130968732;
+ // aapt resource value: 0x7f010108
+ public const int expandedTitleMarginStart = 2130772232;
- // aapt resource value: 0x7F04009D
- public const int expandedTitleMarginTop = 2130968733;
+ // aapt resource value: 0x7f010109
+ public const int expandedTitleMarginTop = 2130772233;
- // aapt resource value: 0x7F04009E
- public const int expandedTitleTextAppearance = 2130968734;
+ // aapt resource value: 0x7f01010c
+ public const int expandedTitleTextAppearance = 2130772236;
- // aapt resource value: 0x7F04009F
- public const int fabSize = 2130968735;
+ // aapt resource value: 0x7f010124
+ public const int fabSize = 2130772260;
- // aapt resource value: 0x7F0400A0
- public const int fastScrollEnabled = 2130968736;
+ // aapt resource value: 0x7f010004
+ public const int fastScrollEnabled = 2130771972;
- // aapt resource value: 0x7F0400A1
- public const int fastScrollHorizontalThumbDrawable = 2130968737;
+ // aapt resource value: 0x7f010007
+ public const int fastScrollHorizontalThumbDrawable = 2130771975;
- // aapt resource value: 0x7F0400A2
- public const int fastScrollHorizontalTrackDrawable = 2130968738;
+ // aapt resource value: 0x7f010008
+ public const int fastScrollHorizontalTrackDrawable = 2130771976;
- // aapt resource value: 0x7F0400A3
- public const int fastScrollVerticalThumbDrawable = 2130968739;
+ // aapt resource value: 0x7f010005
+ public const int fastScrollVerticalThumbDrawable = 2130771973;
- // aapt resource value: 0x7F0400A4
- public const int fastScrollVerticalTrackDrawable = 2130968740;
+ // aapt resource value: 0x7f010006
+ public const int fastScrollVerticalTrackDrawable = 2130771974;
- // aapt resource value: 0x7F0400A5
- public const int font = 2130968741;
+ // aapt resource value: 0x7f010158
+ public const int font = 2130772312;
- // aapt resource value: 0x7F0400A6
- public const int fontFamily = 2130968742;
+ // aapt resource value: 0x7f01003c
+ public const int fontFamily = 2130772028;
- // aapt resource value: 0x7F0400A7
- public const int fontProviderAuthority = 2130968743;
+ // aapt resource value: 0x7f010151
+ public const int fontProviderAuthority = 2130772305;
- // aapt resource value: 0x7F0400A8
- public const int fontProviderCerts = 2130968744;
+ // aapt resource value: 0x7f010154
+ public const int fontProviderCerts = 2130772308;
- // aapt resource value: 0x7F0400A9
- public const int fontProviderFetchStrategy = 2130968745;
+ // aapt resource value: 0x7f010155
+ public const int fontProviderFetchStrategy = 2130772309;
- // aapt resource value: 0x7F0400AA
- public const int fontProviderFetchTimeout = 2130968746;
+ // aapt resource value: 0x7f010156
+ public const int fontProviderFetchTimeout = 2130772310;
- // aapt resource value: 0x7F0400AB
- public const int fontProviderPackage = 2130968747;
+ // aapt resource value: 0x7f010152
+ public const int fontProviderPackage = 2130772306;
- // aapt resource value: 0x7F0400AC
- public const int fontProviderQuery = 2130968748;
+ // aapt resource value: 0x7f010153
+ public const int fontProviderQuery = 2130772307;
- // aapt resource value: 0x7F0400AD
- public const int fontStyle = 2130968749;
+ // aapt resource value: 0x7f010157
+ public const int fontStyle = 2130772311;
- // aapt resource value: 0x7F0400AE
- public const int fontWeight = 2130968750;
+ // aapt resource value: 0x7f010159
+ public const int fontWeight = 2130772313;
- // aapt resource value: 0x7F0400AF
- public const int foregroundInsidePadding = 2130968751;
+ // aapt resource value: 0x7f010129
+ public const int foregroundInsidePadding = 2130772265;
- // aapt resource value: 0x7F0400B0
- public const int gapBetweenBars = 2130968752;
+ // aapt resource value: 0x7f0100b9
+ public const int gapBetweenBars = 2130772153;
- // aapt resource value: 0x7F0400B1
- public const int goIcon = 2130968753;
+ // aapt resource value: 0x7f0100d6
+ public const int goIcon = 2130772182;
- // aapt resource value: 0x7F0400B2
- public const int hdl_arc_thumb_mode = 2130968754;
+ // aapt resource value: 0x7f0101ac
+ public const int hdl_arc_thumb_mode = 2130772396;
- // aapt resource value: 0x7F0400B3
- public const int headerLayout = 2130968755;
+ // aapt resource value: 0x7f01012f
+ public const int headerLayout = 2130772271;
- // aapt resource value: 0x7F0400B4
- public const int height = 2130968756;
+ // aapt resource value: 0x7f01000a
+ public const int height = 2130771978;
- // aapt resource value: 0x7F0400B5
- public const int hideOnContentScroll = 2130968757;
+ // aapt resource value: 0x7f01001e
+ public const int hideOnContentScroll = 2130771998;
- // aapt resource value: 0x7F0400B6
- public const int hintAnimationEnabled = 2130968758;
+ // aapt resource value: 0x7f01014b
+ public const int hintAnimationEnabled = 2130772299;
- // aapt resource value: 0x7F0400B7
- public const int hintEnabled = 2130968759;
+ // aapt resource value: 0x7f010144
+ public const int hintEnabled = 2130772292;
- // aapt resource value: 0x7F0400B8
- public const int hintTextAppearance = 2130968760;
+ // aapt resource value: 0x7f010143
+ public const int hintTextAppearance = 2130772291;
- // aapt resource value: 0x7F0400B9
- public const int homeAsUpIndicator = 2130968761;
+ // aapt resource value: 0x7f01006c
+ public const int homeAsUpIndicator = 2130772076;
- // aapt resource value: 0x7F0400BA
- public const int homeLayout = 2130968762;
+ // aapt resource value: 0x7f010019
+ public const int homeLayout = 2130771993;
- // aapt resource value: 0x7F0400BB
- public const int icon = 2130968763;
+ // aapt resource value: 0x7f010012
+ public const int icon = 2130771986;
- // aapt resource value: 0x7F0400BE
- public const int iconifiedByDefault = 2130968766;
+ // aapt resource value: 0x7f0100c9
+ public const int iconTint = 2130772169;
- // aapt resource value: 0x7F0400BC
- public const int iconTint = 2130968764;
+ // aapt resource value: 0x7f0100ca
+ public const int iconTintMode = 2130772170;
- // aapt resource value: 0x7F0400BD
- public const int iconTintMode = 2130968765;
+ // aapt resource value: 0x7f0100d2
+ public const int iconifiedByDefault = 2130772178;
- // aapt resource value: 0x7F0400BF
- public const int imageButtonStyle = 2130968767;
+ // aapt resource value: 0x7f01007c
+ public const int imageButtonStyle = 2130772092;
- // aapt resource value: 0x7F0400C0
- public const int indeterminateProgressStyle = 2130968768;
+ // aapt resource value: 0x7f01001b
+ public const int indeterminateProgressStyle = 2130771995;
- // aapt resource value: 0x7F0400C1
- public const int initialActivityCount = 2130968769;
+ // aapt resource value: 0x7f010028
+ public const int initialActivityCount = 2130772008;
- // aapt resource value: 0x7F0400C2
- public const int insetForeground = 2130968770;
+ // aapt resource value: 0x7f010130
+ public const int insetForeground = 2130772272;
- // aapt resource value: 0x7F0400C3
- public const int isLightTheme = 2130968771;
+ // aapt resource value: 0x7f01000b
+ public const int isLightTheme = 2130771979;
- // aapt resource value: 0x7F0400C4
- public const int itemBackground = 2130968772;
+ // aapt resource value: 0x7f01012d
+ public const int itemBackground = 2130772269;
- // aapt resource value: 0x7F0400C5
- public const int itemIconTint = 2130968773;
+ // aapt resource value: 0x7f01012b
+ public const int itemIconTint = 2130772267;
- // aapt resource value: 0x7F0400C6
- public const int itemPadding = 2130968774;
+ // aapt resource value: 0x7f01001d
+ public const int itemPadding = 2130771997;
- // aapt resource value: 0x7F0400C7
- public const int itemTextAppearance = 2130968775;
+ // aapt resource value: 0x7f01012e
+ public const int itemTextAppearance = 2130772270;
- // aapt resource value: 0x7F0400C8
- public const int itemTextColor = 2130968776;
+ // aapt resource value: 0x7f01012c
+ public const int itemTextColor = 2130772268;
- // aapt resource value: 0x7F0400C9
- public const int keylines = 2130968777;
+ // aapt resource value: 0x7f010118
+ public const int keylines = 2130772248;
- // aapt resource value: 0x7F0400CA
- public const int layout = 2130968778;
+ // aapt resource value: 0x7f0100d1
+ public const int layout = 2130772177;
- // aapt resource value: 0x7F0400CB
- public const int layoutManager = 2130968779;
+ // aapt resource value: 0x7f010000
+ public const int layoutManager = 2130771968;
- // aapt resource value: 0x7F0400CC
- public const int layout_anchor = 2130968780;
+ // aapt resource value: 0x7f01011b
+ public const int layout_anchor = 2130772251;
- // aapt resource value: 0x7F0400CD
- public const int layout_anchorGravity = 2130968781;
+ // aapt resource value: 0x7f01011d
+ public const int layout_anchorGravity = 2130772253;
- // aapt resource value: 0x7F0400CE
- public const int layout_behavior = 2130968782;
+ // aapt resource value: 0x7f01011a
+ public const int layout_behavior = 2130772250;
- // aapt resource value: 0x7F0400CF
- public const int layout_collapseMode = 2130968783;
+ // aapt resource value: 0x7f010116
+ public const int layout_collapseMode = 2130772246;
- // aapt resource value: 0x7F0400D0
- public const int layout_collapseParallaxMultiplier = 2130968784;
+ // aapt resource value: 0x7f010117
+ public const int layout_collapseParallaxMultiplier = 2130772247;
- // aapt resource value: 0x7F0400D1
- public const int layout_dodgeInsetEdges = 2130968785;
+ // aapt resource value: 0x7f01011f
+ public const int layout_dodgeInsetEdges = 2130772255;
- // aapt resource value: 0x7F0400D2
- public const int layout_insetEdge = 2130968786;
+ // aapt resource value: 0x7f01011e
+ public const int layout_insetEdge = 2130772254;
- // aapt resource value: 0x7F0400D3
- public const int layout_keyline = 2130968787;
+ // aapt resource value: 0x7f01011c
+ public const int layout_keyline = 2130772252;
- // aapt resource value: 0x7F0400D4
- public const int layout_scrollFlags = 2130968788;
+ // aapt resource value: 0x7f010102
+ public const int layout_scrollFlags = 2130772226;
- // aapt resource value: 0x7F0400D5
- public const int layout_scrollInterpolator = 2130968789;
+ // aapt resource value: 0x7f010103
+ public const int layout_scrollInterpolator = 2130772227;
- // aapt resource value: 0x7F0400D6
- public const int layout_srlBackgroundColor = 2130968790;
+ // aapt resource value: 0x7f010197
+ public const int layout_srlBackgroundColor = 2130772375;
- // aapt resource value: 0x7F0400D7
- public const int layout_srlSpinnerStyle = 2130968791;
+ // aapt resource value: 0x7f01015b
+ public const int layout_srlSpinnerStyle = 2130772315;
- // aapt resource value: 0x7F0400D8
- public const int listChoiceBackgroundIndicator = 2130968792;
+ // aapt resource value: 0x7f01008e
+ public const int listChoiceBackgroundIndicator = 2130772110;
- // aapt resource value: 0x7F0400D9
- public const int listDividerAlertDialog = 2130968793;
+ // aapt resource value: 0x7f010068
+ public const int listDividerAlertDialog = 2130772072;
- // aapt resource value: 0x7F0400DA
- public const int listItemLayout = 2130968794;
+ // aapt resource value: 0x7f01002e
+ public const int listItemLayout = 2130772014;
- // aapt resource value: 0x7F0400DB
- public const int listLayout = 2130968795;
+ // aapt resource value: 0x7f01002b
+ public const int listLayout = 2130772011;
- // aapt resource value: 0x7F0400DC
- public const int listMenuViewStyle = 2130968796;
+ // aapt resource value: 0x7f0100ae
+ public const int listMenuViewStyle = 2130772142;
- // aapt resource value: 0x7F0400DD
- public const int listPopupWindowStyle = 2130968797;
+ // aapt resource value: 0x7f010087
+ public const int listPopupWindowStyle = 2130772103;
- // aapt resource value: 0x7F0400DE
- public const int listPreferredItemHeight = 2130968798;
+ // aapt resource value: 0x7f010081
+ public const int listPreferredItemHeight = 2130772097;
- // aapt resource value: 0x7F0400DF
- public const int listPreferredItemHeightLarge = 2130968799;
+ // aapt resource value: 0x7f010083
+ public const int listPreferredItemHeightLarge = 2130772099;
- // aapt resource value: 0x7F0400E0
- public const int listPreferredItemHeightSmall = 2130968800;
+ // aapt resource value: 0x7f010082
+ public const int listPreferredItemHeightSmall = 2130772098;
- // aapt resource value: 0x7F0400E1
- public const int listPreferredItemPaddingLeft = 2130968801;
+ // aapt resource value: 0x7f010084
+ public const int listPreferredItemPaddingLeft = 2130772100;
- // aapt resource value: 0x7F0400E2
- public const int listPreferredItemPaddingRight = 2130968802;
+ // aapt resource value: 0x7f010085
+ public const int listPreferredItemPaddingRight = 2130772101;
- // aapt resource value: 0x7F0400E3
- public const int logo = 2130968803;
+ // aapt resource value: 0x7f010013
+ public const int logo = 2130771987;
- // aapt resource value: 0x7F0400E4
- public const int logoDescription = 2130968804;
+ // aapt resource value: 0x7f0100f7
+ public const int logoDescription = 2130772215;
- // aapt resource value: 0x7F0400E5
- public const int maxActionInlineWidth = 2130968805;
+ // aapt resource value: 0x7f010132
+ public const int maxActionInlineWidth = 2130772274;
- // aapt resource value: 0x7F0400E6
- public const int maxButtonHeight = 2130968806;
+ // aapt resource value: 0x7f0100f1
+ public const int maxButtonHeight = 2130772209;
- // aapt resource value: 0x7F0400E7
- public const int measureWithLargestChild = 2130968807;
+ // aapt resource value: 0x7f0100be
+ public const int measureWithLargestChild = 2130772158;
- // aapt resource value: 0x7F0400E8
- public const int menu = 2130968808;
+ // aapt resource value: 0x7f01012a
+ public const int menu = 2130772266;
- // aapt resource value: 0x7F0400E9
- public const int multiChoiceItemLayout = 2130968809;
+ // aapt resource value: 0x7f01002c
+ public const int multiChoiceItemLayout = 2130772012;
- // aapt resource value: 0x7F0400EA
- public const int navigationContentDescription = 2130968810;
+ // aapt resource value: 0x7f0100f6
+ public const int navigationContentDescription = 2130772214;
- // aapt resource value: 0x7F0400EB
- public const int navigationIcon = 2130968811;
+ // aapt resource value: 0x7f0100f5
+ public const int navigationIcon = 2130772213;
- // aapt resource value: 0x7F0400EC
- public const int navigationMode = 2130968812;
+ // aapt resource value: 0x7f01000d
+ public const int navigationMode = 2130771981;
- // aapt resource value: 0x7F0400ED
- public const int numericModifiers = 2130968813;
+ // aapt resource value: 0x7f0100c2
+ public const int numericModifiers = 2130772162;
- // aapt resource value: 0x7F0400EE
- public const int overlapAnchor = 2130968814;
+ // aapt resource value: 0x7f0100cd
+ public const int overlapAnchor = 2130772173;
- // aapt resource value: 0x7F0400EF
- public const int paddingBottomNoButtons = 2130968815;
+ // aapt resource value: 0x7f0100cf
+ public const int paddingBottomNoButtons = 2130772175;
- // aapt resource value: 0x7F0400F0
- public const int paddingEnd = 2130968816;
+ // aapt resource value: 0x7f0100fb
+ public const int paddingEnd = 2130772219;
- // aapt resource value: 0x7F0400F1
- public const int paddingStart = 2130968817;
+ // aapt resource value: 0x7f0100fa
+ public const int paddingStart = 2130772218;
- // aapt resource value: 0x7F0400F2
- public const int paddingTopNoTitle = 2130968818;
+ // aapt resource value: 0x7f0100d0
+ public const int paddingTopNoTitle = 2130772176;
- // aapt resource value: 0x7F0400F3
- public const int panelBackground = 2130968819;
+ // aapt resource value: 0x7f01008b
+ public const int panelBackground = 2130772107;
- // aapt resource value: 0x7F0400F4
- public const int panelMenuListTheme = 2130968820;
+ // aapt resource value: 0x7f01008d
+ public const int panelMenuListTheme = 2130772109;
- // aapt resource value: 0x7F0400F5
- public const int panelMenuListWidth = 2130968821;
+ // aapt resource value: 0x7f01008c
+ public const int panelMenuListWidth = 2130772108;
- // aapt resource value: 0x7F0400F6
- public const int passwordToggleContentDescription = 2130968822;
+ // aapt resource value: 0x7f01014e
+ public const int passwordToggleContentDescription = 2130772302;
- // aapt resource value: 0x7F0400F7
- public const int passwordToggleDrawable = 2130968823;
+ // aapt resource value: 0x7f01014d
+ public const int passwordToggleDrawable = 2130772301;
- // aapt resource value: 0x7F0400F8
- public const int passwordToggleEnabled = 2130968824;
+ // aapt resource value: 0x7f01014c
+ public const int passwordToggleEnabled = 2130772300;
- // aapt resource value: 0x7F0400F9
- public const int passwordToggleTint = 2130968825;
+ // aapt resource value: 0x7f01014f
+ public const int passwordToggleTint = 2130772303;
- // aapt resource value: 0x7F0400FA
- public const int passwordToggleTintMode = 2130968826;
+ // aapt resource value: 0x7f010150
+ public const int passwordToggleTintMode = 2130772304;
- // aapt resource value: 0x7F0400FB
- public const int popupMenuStyle = 2130968827;
+ // aapt resource value: 0x7f010078
+ public const int popupMenuStyle = 2130772088;
- // aapt resource value: 0x7F0400FC
- public const int popupTheme = 2130968828;
+ // aapt resource value: 0x7f010026
+ public const int popupTheme = 2130772006;
- // aapt resource value: 0x7F0400FD
- public const int popupWindowStyle = 2130968829;
+ // aapt resource value: 0x7f010079
+ public const int popupWindowStyle = 2130772089;
- // aapt resource value: 0x7F0400FE
- public const int preserveIconSpacing = 2130968830;
+ // aapt resource value: 0x7f0100cb
+ public const int preserveIconSpacing = 2130772171;
- // aapt resource value: 0x7F0400FF
- public const int pressedTranslationZ = 2130968831;
+ // aapt resource value: 0x7f010125
+ public const int pressedTranslationZ = 2130772261;
- // aapt resource value: 0x7F040100
- public const int progressBarPadding = 2130968832;
+ // aapt resource value: 0x7f01001c
+ public const int progressBarPadding = 2130771996;
- // aapt resource value: 0x7F040101
- public const int progressBarStyle = 2130968833;
+ // aapt resource value: 0x7f01001a
+ public const int progressBarStyle = 2130771994;
- // aapt resource value: 0x7F040102
- public const int queryBackground = 2130968834;
+ // aapt resource value: 0x7f0100dc
+ public const int queryBackground = 2130772188;
- // aapt resource value: 0x7F040103
- public const int queryHint = 2130968835;
+ // aapt resource value: 0x7f0100d3
+ public const int queryHint = 2130772179;
- // aapt resource value: 0x7F040104
- public const int radioButtonStyle = 2130968836;
+ // aapt resource value: 0x7f0100a7
+ public const int radioButtonStyle = 2130772135;
- // aapt resource value: 0x7F040105
- public const int ratingBarStyle = 2130968837;
+ // aapt resource value: 0x7f0100a8
+ public const int ratingBarStyle = 2130772136;
- // aapt resource value: 0x7F040106
- public const int ratingBarStyleIndicator = 2130968838;
+ // aapt resource value: 0x7f0100a9
+ public const int ratingBarStyleIndicator = 2130772137;
- // aapt resource value: 0x7F040107
- public const int ratingBarStyleSmall = 2130968839;
+ // aapt resource value: 0x7f0100aa
+ public const int ratingBarStyleSmall = 2130772138;
- // aapt resource value: 0x7F040108
- public const int reverseLayout = 2130968840;
+ // aapt resource value: 0x7f010002
+ public const int reverseLayout = 2130771970;
- // aapt resource value: 0x7F040109
- public const int rippleColor = 2130968841;
+ // aapt resource value: 0x7f010123
+ public const int rippleColor = 2130772259;
- // aapt resource value: 0x7F04010A
- public const int scrimAnimationDuration = 2130968842;
+ // aapt resource value: 0x7f010112
+ public const int scrimAnimationDuration = 2130772242;
- // aapt resource value: 0x7F04010B
- public const int scrimVisibleHeightTrigger = 2130968843;
+ // aapt resource value: 0x7f010111
+ public const int scrimVisibleHeightTrigger = 2130772241;
- // aapt resource value: 0x7F04010C
- public const int searchHintIcon = 2130968844;
+ // aapt resource value: 0x7f0100d8
+ public const int searchHintIcon = 2130772184;
- // aapt resource value: 0x7F04010D
- public const int searchIcon = 2130968845;
+ // aapt resource value: 0x7f0100d7
+ public const int searchIcon = 2130772183;
- // aapt resource value: 0x7F04010E
- public const int searchViewStyle = 2130968846;
+ // aapt resource value: 0x7f010080
+ public const int searchViewStyle = 2130772096;
- // aapt resource value: 0x7F04010F
- public const int second_curtain_bar_color = 2130968847;
+ // aapt resource value: 0x7f0101b1
+ public const int second_curtain_bar_color = 2130772401;
- // aapt resource value: 0x7F040110
- public const int second_wave_color = 2130968848;
+ // aapt resource value: 0x7f0101b7
+ public const int second_wave_color = 2130772407;
- // aapt resource value: 0x7F040111
- public const int seekBarStyle = 2130968849;
+ // aapt resource value: 0x7f0100ab
+ public const int seekBarStyle = 2130772139;
- // aapt resource value: 0x7F040112
- public const int selectableItemBackground = 2130968850;
+ // aapt resource value: 0x7f010070
+ public const int selectableItemBackground = 2130772080;
- // aapt resource value: 0x7F040113
- public const int selectableItemBackgroundBorderless = 2130968851;
+ // aapt resource value: 0x7f010071
+ public const int selectableItemBackgroundBorderless = 2130772081;
- // aapt resource value: 0x7F040114
- public const int showAsAction = 2130968852;
+ // aapt resource value: 0x7f0100c3
+ public const int showAsAction = 2130772163;
- // aapt resource value: 0x7F040115
- public const int showDividers = 2130968853;
+ // aapt resource value: 0x7f0100bf
+ public const int showDividers = 2130772159;
- // aapt resource value: 0x7F040116
- public const int showText = 2130968854;
+ // aapt resource value: 0x7f0100e8
+ public const int showText = 2130772200;
- // aapt resource value: 0x7F040117
- public const int showTitle = 2130968855;
+ // aapt resource value: 0x7f01002f
+ public const int showTitle = 2130772015;
- // aapt resource value: 0x7F040118
- public const int singleChoiceItemLayout = 2130968856;
+ // aapt resource value: 0x7f01002d
+ public const int singleChoiceItemLayout = 2130772013;
- // aapt resource value: 0x7F040119
- public const int spanCount = 2130968857;
+ // aapt resource value: 0x7f010001
+ public const int spanCount = 2130771969;
- // aapt resource value: 0x7F04011A
- public const int spinBars = 2130968858;
+ // aapt resource value: 0x7f0100b7
+ public const int spinBars = 2130772151;
- // aapt resource value: 0x7F04011B
- public const int spinnerDropDownItemStyle = 2130968859;
+ // aapt resource value: 0x7f01006b
+ public const int spinnerDropDownItemStyle = 2130772075;
- // aapt resource value: 0x7F04011C
- public const int spinnerStyle = 2130968860;
+ // aapt resource value: 0x7f0100ac
+ public const int spinnerStyle = 2130772140;
- // aapt resource value: 0x7F04011D
- public const int splitTrack = 2130968861;
+ // aapt resource value: 0x7f0100e7
+ public const int splitTrack = 2130772199;
- // aapt resource value: 0x7F04011E
- public const int srcCompat = 2130968862;
+ // aapt resource value: 0x7f010030
+ public const int srcCompat = 2130772016;
- // aapt resource value: 0x7F04011F
- public const int srlAccentColor = 2130968863;
+ // aapt resource value: 0x7f01015c
+ public const int srlAccentColor = 2130772316;
- // aapt resource value: 0x7F040120
- public const int srlAnimatingColor = 2130968864;
+ // aapt resource value: 0x7f010172
+ public const int srlAnimatingColor = 2130772338;
- // aapt resource value: 0x7F040121
- public const int srlClassicsSpinnerStyle = 2130968865;
+ // aapt resource value: 0x7f01015d
+ public const int srlClassicsSpinnerStyle = 2130772317;
- // aapt resource value: 0x7F040122
- public const int srlDisableContentWhenLoading = 2130968866;
+ // aapt resource value: 0x7f010194
+ public const int srlDisableContentWhenLoading = 2130772372;
- // aapt resource value: 0x7F040123
- public const int srlDisableContentWhenRefresh = 2130968867;
+ // aapt resource value: 0x7f010193
+ public const int srlDisableContentWhenRefresh = 2130772371;
- // aapt resource value: 0x7F040124
- public const int srlDragRate = 2130968868;
+ // aapt resource value: 0x7f01017b
+ public const int srlDragRate = 2130772347;
- // aapt resource value: 0x7F040125
- public const int srlDrawableArrow = 2130968869;
+ // aapt resource value: 0x7f01015e
+ public const int srlDrawableArrow = 2130772318;
- // aapt resource value: 0x7F040126
- public const int srlDrawableArrowSize = 2130968870;
+ // aapt resource value: 0x7f01015f
+ public const int srlDrawableArrowSize = 2130772319;
- // aapt resource value: 0x7F040127
- public const int srlDrawableMarginRight = 2130968871;
+ // aapt resource value: 0x7f010160
+ public const int srlDrawableMarginRight = 2130772320;
- // aapt resource value: 0x7F040128
- public const int srlDrawableProgress = 2130968872;
+ // aapt resource value: 0x7f010161
+ public const int srlDrawableProgress = 2130772321;
- // aapt resource value: 0x7F040129
- public const int srlDrawableProgressSize = 2130968873;
+ // aapt resource value: 0x7f010162
+ public const int srlDrawableProgressSize = 2130772322;
- // aapt resource value: 0x7F04012A
- public const int srlDrawableSize = 2130968874;
+ // aapt resource value: 0x7f010163
+ public const int srlDrawableSize = 2130772323;
- // aapt resource value: 0x7F04012B
- public const int srlEnableAutoLoadMore = 2130968875;
+ // aapt resource value: 0x7f010187
+ public const int srlEnableAutoLoadMore = 2130772359;
- // aapt resource value: 0x7F04012C
- public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
+ // aapt resource value: 0x7f010191
+ public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
- // aapt resource value: 0x7F04012D
- public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
+ // aapt resource value: 0x7f010190
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
- // aapt resource value: 0x7F04012E
- public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
+ // aapt resource value: 0x7f01018e
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
- // aapt resource value: 0x7F04012F
- public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
+ // aapt resource value: 0x7f01018f
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
- // aapt resource value: 0x7F040130
- public const int srlEnableFooterTranslationContent = 2130968880;
+ // aapt resource value: 0x7f010183
+ public const int srlEnableFooterTranslationContent = 2130772355;
- // aapt resource value: 0x7F040131
- public const int srlEnableHeaderTranslationContent = 2130968881;
+ // aapt resource value: 0x7f010182
+ public const int srlEnableHeaderTranslationContent = 2130772354;
- // aapt resource value: 0x7F040132
- public const int srlEnableHorizontalDrag = 2130968882;
+ // aapt resource value: 0x7f010164
+ public const int srlEnableHorizontalDrag = 2130772324;
- // aapt resource value: 0x7F040133
- public const int srlEnableLastTime = 2130968883;
+ // aapt resource value: 0x7f010175
+ public const int srlEnableLastTime = 2130772341;
- // aapt resource value: 0x7F040134
- public const int srlEnableLoadMore = 2130968884;
+ // aapt resource value: 0x7f010181
+ public const int srlEnableLoadMore = 2130772353;
- // aapt resource value: 0x7F040135
- public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
+ // aapt resource value: 0x7f01018d
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
- // aapt resource value: 0x7F040136
- public const int srlEnableNestedScrolling = 2130968886;
+ // aapt resource value: 0x7f01018a
+ public const int srlEnableNestedScrolling = 2130772362;
- // aapt resource value: 0x7F040137
- public const int srlEnableOverScrollBounce = 2130968887;
+ // aapt resource value: 0x7f010188
+ public const int srlEnableOverScrollBounce = 2130772360;
- // aapt resource value: 0x7F040138
- public const int srlEnableOverScrollDrag = 2130968888;
+ // aapt resource value: 0x7f010192
+ public const int srlEnableOverScrollDrag = 2130772370;
- // aapt resource value: 0x7F040139
- public const int srlEnablePreviewInEditMode = 2130968889;
+ // aapt resource value: 0x7f010186
+ public const int srlEnablePreviewInEditMode = 2130772358;
- // aapt resource value: 0x7F04013A
- public const int srlEnablePullToCloseTwoLevel = 2130968890;
+ // aapt resource value: 0x7f01019d
+ public const int srlEnablePullToCloseTwoLevel = 2130772381;
- // aapt resource value: 0x7F04013B
- public const int srlEnablePureScrollMode = 2130968891;
+ // aapt resource value: 0x7f010189
+ public const int srlEnablePureScrollMode = 2130772361;
- // aapt resource value: 0x7F04013C
- public const int srlEnableRefresh = 2130968892;
+ // aapt resource value: 0x7f010180
+ public const int srlEnableRefresh = 2130772352;
- // aapt resource value: 0x7F04013D
- public const int srlEnableScrollContentWhenLoaded = 2130968893;
+ // aapt resource value: 0x7f01018b
+ public const int srlEnableScrollContentWhenLoaded = 2130772363;
- // aapt resource value: 0x7F04013E
- public const int srlEnableScrollContentWhenRefreshed = 2130968894;
+ // aapt resource value: 0x7f01018c
+ public const int srlEnableScrollContentWhenRefreshed = 2130772364;
- // aapt resource value: 0x7F04013F
- public const int srlEnableTwoLevel = 2130968895;
+ // aapt resource value: 0x7f01019c
+ public const int srlEnableTwoLevel = 2130772380;
- // aapt resource value: 0x7F040140
- public const int srlFinishDuration = 2130968896;
+ // aapt resource value: 0x7f010165
+ public const int srlFinishDuration = 2130772325;
- // aapt resource value: 0x7F040141
- public const int srlFixedFooterViewId = 2130968897;
+ // aapt resource value: 0x7f010196
+ public const int srlFixedFooterViewId = 2130772374;
- // aapt resource value: 0x7F040142
- public const int srlFixedHeaderViewId = 2130968898;
+ // aapt resource value: 0x7f010195
+ public const int srlFixedHeaderViewId = 2130772373;
- // aapt resource value: 0x7F040143
- public const int srlFloorDuration = 2130968899;
+ // aapt resource value: 0x7f01019b
+ public const int srlFloorDuration = 2130772379;
- // aapt resource value: 0x7F040144
- public const int srlFloorRage = 2130968900;
+ // aapt resource value: 0x7f010199
+ public const int srlFloorRage = 2130772377;
- // aapt resource value: 0x7F040145
- public const int srlFooterHeight = 2130968901;
+ // aapt resource value: 0x7f010178
+ public const int srlFooterHeight = 2130772344;
- // aapt resource value: 0x7F040146
- public const int srlFooterInsetStart = 2130968902;
+ // aapt resource value: 0x7f01017a
+ public const int srlFooterInsetStart = 2130772346;
- // aapt resource value: 0x7F040147
- public const int srlFooterMaxDragRate = 2130968903;
+ // aapt resource value: 0x7f01017d
+ public const int srlFooterMaxDragRate = 2130772349;
- // aapt resource value: 0x7F040148
- public const int srlFooterTranslationViewId = 2130968904;
+ // aapt resource value: 0x7f010185
+ public const int srlFooterTranslationViewId = 2130772357;
- // aapt resource value: 0x7F040149
- public const int srlFooterTriggerRate = 2130968905;
+ // aapt resource value: 0x7f01017f
+ public const int srlFooterTriggerRate = 2130772351;
- // aapt resource value: 0x7F04014A
- public const int srlHeaderHeight = 2130968906;
+ // aapt resource value: 0x7f010177
+ public const int srlHeaderHeight = 2130772343;
- // aapt resource value: 0x7F04014B
- public const int srlHeaderInsetStart = 2130968907;
+ // aapt resource value: 0x7f010179
+ public const int srlHeaderInsetStart = 2130772345;
- // aapt resource value: 0x7F04014C
- public const int srlHeaderMaxDragRate = 2130968908;
+ // aapt resource value: 0x7f01017c
+ public const int srlHeaderMaxDragRate = 2130772348;
- // aapt resource value: 0x7F04014D
- public const int srlHeaderTranslationViewId = 2130968909;
+ // aapt resource value: 0x7f010184
+ public const int srlHeaderTranslationViewId = 2130772356;
- // aapt resource value: 0x7F04014E
- public const int srlHeaderTriggerRate = 2130968910;
+ // aapt resource value: 0x7f01017e
+ public const int srlHeaderTriggerRate = 2130772350;
- // aapt resource value: 0x7F04014F
- public const int srlMaxRage = 2130968911;
+ // aapt resource value: 0x7f010198
+ public const int srlMaxRage = 2130772376;
- // aapt resource value: 0x7F040150
- public const int srlNormalColor = 2130968912;
+ // aapt resource value: 0x7f010173
+ public const int srlNormalColor = 2130772339;
- // aapt resource value: 0x7F040151
- public const int srlPrimaryColor = 2130968913;
+ // aapt resource value: 0x7f010166
+ public const int srlPrimaryColor = 2130772326;
- // aapt resource value: 0x7F040152
- public const int srlReboundDuration = 2130968914;
+ // aapt resource value: 0x7f010176
+ public const int srlReboundDuration = 2130772342;
- // aapt resource value: 0x7F040153
- public const int srlRefreshRage = 2130968915;
+ // aapt resource value: 0x7f01019a
+ public const int srlRefreshRage = 2130772378;
- // aapt resource value: 0x7F040154
- public const int srlTextFailed = 2130968916;
+ // aapt resource value: 0x7f010167
+ public const int srlTextFailed = 2130772327;
- // aapt resource value: 0x7F040155
- public const int srlTextFinish = 2130968917;
+ // aapt resource value: 0x7f010168
+ public const int srlTextFinish = 2130772328;
- // aapt resource value: 0x7F040156
- public const int srlTextLoading = 2130968918;
+ // aapt resource value: 0x7f010169
+ public const int srlTextLoading = 2130772329;
- // aapt resource value: 0x7F040157
- public const int srlTextNothing = 2130968919;
+ // aapt resource value: 0x7f01016a
+ public const int srlTextNothing = 2130772330;
- // aapt resource value: 0x7F040158
- public const int srlTextPulling = 2130968920;
+ // aapt resource value: 0x7f01016b
+ public const int srlTextPulling = 2130772331;
- // aapt resource value: 0x7F040159
- public const int srlTextRefreshing = 2130968921;
+ // aapt resource value: 0x7f01016c
+ public const int srlTextRefreshing = 2130772332;
- // aapt resource value: 0x7F04015A
- public const int srlTextRelease = 2130968922;
+ // aapt resource value: 0x7f01016d
+ public const int srlTextRelease = 2130772333;
- // aapt resource value: 0x7F04015B
- public const int srlTextSecondary = 2130968923;
+ // aapt resource value: 0x7f01016e
+ public const int srlTextSecondary = 2130772334;
- // aapt resource value: 0x7F04015C
- public const int srlTextSizeTime = 2130968924;
+ // aapt resource value: 0x7f01016f
+ public const int srlTextSizeTime = 2130772335;
- // aapt resource value: 0x7F04015D
- public const int srlTextSizeTitle = 2130968925;
+ // aapt resource value: 0x7f010170
+ public const int srlTextSizeTitle = 2130772336;
- // aapt resource value: 0x7F04015E
- public const int srlTextTimeMarginTop = 2130968926;
+ // aapt resource value: 0x7f010174
+ public const int srlTextTimeMarginTop = 2130772340;
- // aapt resource value: 0x7F04015F
- public const int srlTextUpdate = 2130968927;
+ // aapt resource value: 0x7f010171
+ public const int srlTextUpdate = 2130772337;
- // aapt resource value: 0x7F040160
- public const int stackFromEnd = 2130968928;
+ // aapt resource value: 0x7f010003
+ public const int stackFromEnd = 2130771971;
- // aapt resource value: 0x7F040161
- public const int state_above_anchor = 2130968929;
+ // aapt resource value: 0x7f0100ce
+ public const int state_above_anchor = 2130772174;
- // aapt resource value: 0x7F040162
- public const int state_collapsed = 2130968930;
+ // aapt resource value: 0x7f010100
+ public const int state_collapsed = 2130772224;
- // aapt resource value: 0x7F040163
- public const int state_collapsible = 2130968931;
+ // aapt resource value: 0x7f010101
+ public const int state_collapsible = 2130772225;
- // aapt resource value: 0x7F040164
- public const int statusBarBackground = 2130968932;
+ // aapt resource value: 0x7f010119
+ public const int statusBarBackground = 2130772249;
- // aapt resource value: 0x7F040165
- public const int statusBarScrim = 2130968933;
+ // aapt resource value: 0x7f01010f
+ public const int statusBarScrim = 2130772239;
- // aapt resource value: 0x7F040166
- public const int subMenuArrow = 2130968934;
+ // aapt resource value: 0x7f0100cc
+ public const int subMenuArrow = 2130772172;
- // aapt resource value: 0x7F040167
- public const int submitBackground = 2130968935;
+ // aapt resource value: 0x7f0100dd
+ public const int submitBackground = 2130772189;
- // aapt resource value: 0x7F040168
- public const int subtitle = 2130968936;
+ // aapt resource value: 0x7f01000f
+ public const int subtitle = 2130771983;
- // aapt resource value: 0x7F040169
- public const int subtitleTextAppearance = 2130968937;
+ // aapt resource value: 0x7f0100ea
+ public const int subtitleTextAppearance = 2130772202;
- // aapt resource value: 0x7F04016A
- public const int subtitleTextColor = 2130968938;
+ // aapt resource value: 0x7f0100f9
+ public const int subtitleTextColor = 2130772217;
- // aapt resource value: 0x7F04016B
- public const int subtitleTextStyle = 2130968939;
+ // aapt resource value: 0x7f010011
+ public const int subtitleTextStyle = 2130771985;
- // aapt resource value: 0x7F04016C
- public const int suggestionRowLayout = 2130968940;
+ // aapt resource value: 0x7f0100db
+ public const int suggestionRowLayout = 2130772187;
- // aapt resource value: 0x7F04016D
- public const int switchMinWidth = 2130968941;
+ // aapt resource value: 0x7f0100e5
+ public const int switchMinWidth = 2130772197;
- // aapt resource value: 0x7F04016E
- public const int switchPadding = 2130968942;
+ // aapt resource value: 0x7f0100e6
+ public const int switchPadding = 2130772198;
- // aapt resource value: 0x7F04016F
- public const int switchStyle = 2130968943;
+ // aapt resource value: 0x7f0100ad
+ public const int switchStyle = 2130772141;
- // aapt resource value: 0x7F040170
- public const int switchTextAppearance = 2130968944;
+ // aapt resource value: 0x7f0100e4
+ public const int switchTextAppearance = 2130772196;
- // aapt resource value: 0x7F040171
- public const int tabBackground = 2130968945;
+ // aapt resource value: 0x7f010136
+ public const int tabBackground = 2130772278;
- // aapt resource value: 0x7F040172
- public const int tabContentStart = 2130968946;
+ // aapt resource value: 0x7f010135
+ public const int tabContentStart = 2130772277;
- // aapt resource value: 0x7F040173
- public const int tabGravity = 2130968947;
+ // aapt resource value: 0x7f010138
+ public const int tabGravity = 2130772280;
- // aapt resource value: 0x7F040174
- public const int tabIndicatorColor = 2130968948;
+ // aapt resource value: 0x7f010133
+ public const int tabIndicatorColor = 2130772275;
- // aapt resource value: 0x7F040175
- public const int tabIndicatorHeight = 2130968949;
+ // aapt resource value: 0x7f010134
+ public const int tabIndicatorHeight = 2130772276;
- // aapt resource value: 0x7F040176
- public const int tabMaxWidth = 2130968950;
+ // aapt resource value: 0x7f01013a
+ public const int tabMaxWidth = 2130772282;
- // aapt resource value: 0x7F040177
- public const int tabMinWidth = 2130968951;
+ // aapt resource value: 0x7f010139
+ public const int tabMinWidth = 2130772281;
- // aapt resource value: 0x7F040178
- public const int tabMode = 2130968952;
+ // aapt resource value: 0x7f010137
+ public const int tabMode = 2130772279;
- // aapt resource value: 0x7F040179
- public const int tabPadding = 2130968953;
+ // aapt resource value: 0x7f010142
+ public const int tabPadding = 2130772290;
- // aapt resource value: 0x7F04017A
- public const int tabPaddingBottom = 2130968954;
+ // aapt resource value: 0x7f010141
+ public const int tabPaddingBottom = 2130772289;
- // aapt resource value: 0x7F04017B
- public const int tabPaddingEnd = 2130968955;
+ // aapt resource value: 0x7f010140
+ public const int tabPaddingEnd = 2130772288;
- // aapt resource value: 0x7F04017C
- public const int tabPaddingStart = 2130968956;
+ // aapt resource value: 0x7f01013e
+ public const int tabPaddingStart = 2130772286;
- // aapt resource value: 0x7F04017D
- public const int tabPaddingTop = 2130968957;
+ // aapt resource value: 0x7f01013f
+ public const int tabPaddingTop = 2130772287;
- // aapt resource value: 0x7F04017E
- public const int tabSelectedTextColor = 2130968958;
+ // aapt resource value: 0x7f01013d
+ public const int tabSelectedTextColor = 2130772285;
- // aapt resource value: 0x7F04017F
- public const int tabTextAppearance = 2130968959;
+ // aapt resource value: 0x7f01013b
+ public const int tabTextAppearance = 2130772283;
- // aapt resource value: 0x7F040180
- public const int tabTextColor = 2130968960;
+ // aapt resource value: 0x7f01013c
+ public const int tabTextColor = 2130772284;
- // aapt resource value: 0x7F040181
- public const int textAllCaps = 2130968961;
+ // aapt resource value: 0x7f010036
+ public const int textAllCaps = 2130772022;
- // aapt resource value: 0x7F040182
- public const int textAppearanceLargePopupMenu = 2130968962;
+ // aapt resource value: 0x7f010063
+ public const int textAppearanceLargePopupMenu = 2130772067;
- // aapt resource value: 0x7F040183
- public const int textAppearanceListItem = 2130968963;
+ // aapt resource value: 0x7f010088
+ public const int textAppearanceListItem = 2130772104;
- // aapt resource value: 0x7F040184
- public const int textAppearanceListItemSecondary = 2130968964;
+ // aapt resource value: 0x7f010089
+ public const int textAppearanceListItemSecondary = 2130772105;
- // aapt resource value: 0x7F040185
- public const int textAppearanceListItemSmall = 2130968965;
+ // aapt resource value: 0x7f01008a
+ public const int textAppearanceListItemSmall = 2130772106;
- // aapt resource value: 0x7F040186
- public const int textAppearancePopupMenuHeader = 2130968966;
+ // aapt resource value: 0x7f010065
+ public const int textAppearancePopupMenuHeader = 2130772069;
- // aapt resource value: 0x7F040187
- public const int textAppearanceSearchResultSubtitle = 2130968967;
+ // aapt resource value: 0x7f01007e
+ public const int textAppearanceSearchResultSubtitle = 2130772094;
- // aapt resource value: 0x7F040188
- public const int textAppearanceSearchResultTitle = 2130968968;
+ // aapt resource value: 0x7f01007d
+ public const int textAppearanceSearchResultTitle = 2130772093;
- // aapt resource value: 0x7F040189
- public const int textAppearanceSmallPopupMenu = 2130968969;
+ // aapt resource value: 0x7f010064
+ public const int textAppearanceSmallPopupMenu = 2130772068;
- // aapt resource value: 0x7F04018A
- public const int textColorAlertDialogListItem = 2130968970;
+ // aapt resource value: 0x7f01009d
+ public const int textColorAlertDialogListItem = 2130772125;
- // aapt resource value: 0x7F04018B
- public const int textColorError = 2130968971;
+ // aapt resource value: 0x7f010122
+ public const int textColorError = 2130772258;
- // aapt resource value: 0x7F04018C
- public const int textColorSearchUrl = 2130968972;
+ // aapt resource value: 0x7f01007f
+ public const int textColorSearchUrl = 2130772095;
- // aapt resource value: 0x7F04018D
- public const int theme = 2130968973;
+ // aapt resource value: 0x7f0100fc
+ public const int theme = 2130772220;
- // aapt resource value: 0x7F04018E
- public const int thickness = 2130968974;
+ // aapt resource value: 0x7f0100bd
+ public const int thickness = 2130772157;
- // aapt resource value: 0x7F04018F
- public const int thumbTextPadding = 2130968975;
+ // aapt resource value: 0x7f0100e3
+ public const int thumbTextPadding = 2130772195;
- // aapt resource value: 0x7F040190
- public const int thumbTint = 2130968976;
+ // aapt resource value: 0x7f0100de
+ public const int thumbTint = 2130772190;
- // aapt resource value: 0x7F040191
- public const int thumbTintMode = 2130968977;
+ // aapt resource value: 0x7f0100df
+ public const int thumbTintMode = 2130772191;
- // aapt resource value: 0x7F040192
- public const int tickMark = 2130968978;
+ // aapt resource value: 0x7f010033
+ public const int tickMark = 2130772019;
- // aapt resource value: 0x7F040193
- public const int tickMarkTint = 2130968979;
+ // aapt resource value: 0x7f010034
+ public const int tickMarkTint = 2130772020;
- // aapt resource value: 0x7F040194
- public const int tickMarkTintMode = 2130968980;
+ // aapt resource value: 0x7f010035
+ public const int tickMarkTintMode = 2130772021;
- // aapt resource value: 0x7F040195
- public const int tint = 2130968981;
+ // aapt resource value: 0x7f010031
+ public const int tint = 2130772017;
- // aapt resource value: 0x7F040196
- public const int tintMode = 2130968982;
+ // aapt resource value: 0x7f010032
+ public const int tintMode = 2130772018;
- // aapt resource value: 0x7F040197
- public const int title = 2130968983;
+ // aapt resource value: 0x7f01000c
+ public const int title = 2130771980;
- // aapt resource value: 0x7F040198
- public const int titleEnabled = 2130968984;
+ // aapt resource value: 0x7f010115
+ public const int titleEnabled = 2130772245;
- // aapt resource value: 0x7F040199
- public const int titleMargin = 2130968985;
+ // aapt resource value: 0x7f0100eb
+ public const int titleMargin = 2130772203;
- // aapt resource value: 0x7F04019A
- public const int titleMarginBottom = 2130968986;
+ // aapt resource value: 0x7f0100ef
+ public const int titleMarginBottom = 2130772207;
- // aapt resource value: 0x7F04019B
- public const int titleMarginEnd = 2130968987;
+ // aapt resource value: 0x7f0100ed
+ public const int titleMarginEnd = 2130772205;
- // aapt resource value: 0x7F04019E
- public const int titleMargins = 2130968990;
+ // aapt resource value: 0x7f0100ec
+ public const int titleMarginStart = 2130772204;
- // aapt resource value: 0x7F04019C
- public const int titleMarginStart = 2130968988;
+ // aapt resource value: 0x7f0100ee
+ public const int titleMarginTop = 2130772206;
- // aapt resource value: 0x7F04019D
- public const int titleMarginTop = 2130968989;
+ // aapt resource value: 0x7f0100f0
+ public const int titleMargins = 2130772208;
- // aapt resource value: 0x7F04019F
- public const int titleTextAppearance = 2130968991;
+ // aapt resource value: 0x7f0100e9
+ public const int titleTextAppearance = 2130772201;
- // aapt resource value: 0x7F0401A0
- public const int titleTextColor = 2130968992;
+ // aapt resource value: 0x7f0100f8
+ public const int titleTextColor = 2130772216;
- // aapt resource value: 0x7F0401A1
- public const int titleTextStyle = 2130968993;
+ // aapt resource value: 0x7f010010
+ public const int titleTextStyle = 2130771984;
- // aapt resource value: 0x7F0401A2
- public const int toolbarId = 2130968994;
+ // aapt resource value: 0x7f010110
+ public const int toolbarId = 2130772240;
- // aapt resource value: 0x7F0401A3
- public const int toolbarNavigationButtonStyle = 2130968995;
+ // aapt resource value: 0x7f010077
+ public const int toolbarNavigationButtonStyle = 2130772087;
- // aapt resource value: 0x7F0401A4
- public const int toolbarStyle = 2130968996;
+ // aapt resource value: 0x7f010076
+ public const int toolbarStyle = 2130772086;
- // aapt resource value: 0x7F0401A5
- public const int tooltipForegroundColor = 2130968997;
+ // aapt resource value: 0x7f0100b0
+ public const int tooltipForegroundColor = 2130772144;
- // aapt resource value: 0x7F0401A6
- public const int tooltipFrameBackground = 2130968998;
+ // aapt resource value: 0x7f0100af
+ public const int tooltipFrameBackground = 2130772143;
- // aapt resource value: 0x7F0401A7
- public const int tooltipText = 2130968999;
+ // aapt resource value: 0x7f0100c8
+ public const int tooltipText = 2130772168;
- // aapt resource value: 0x7F0401A8
- public const int track = 2130969000;
+ // aapt resource value: 0x7f0100e0
+ public const int track = 2130772192;
- // aapt resource value: 0x7F0401A9
- public const int trackTint = 2130969001;
+ // aapt resource value: 0x7f0100e1
+ public const int trackTint = 2130772193;
- // aapt resource value: 0x7F0401AA
- public const int trackTintMode = 2130969002;
+ // aapt resource value: 0x7f0100e2
+ public const int trackTintMode = 2130772194;
- // aapt resource value: 0x7F0401AB
- public const int useCompatPadding = 2130969003;
+ // aapt resource value: 0x7f010127
+ public const int useCompatPadding = 2130772263;
- // aapt resource value: 0x7F0401AC
- public const int voiceIcon = 2130969004;
+ // aapt resource value: 0x7f0100d9
+ public const int voiceIcon = 2130772185;
- // aapt resource value: 0x7F0401AD
- public const int wave_bg_color = 2130969005;
+ // aapt resource value: 0x7f0101b8
+ public const int wave_bg_color = 2130772408;
- // aapt resource value: 0x7F0401AE
- public const int wave_border_color = 2130969006;
+ // aapt resource value: 0x7f0101b9
+ public const int wave_border_color = 2130772409;
- // aapt resource value: 0x7F0401AF
- public const int wave_color = 2130969007;
+ // aapt resource value: 0x7f0101b6
+ public const int wave_color = 2130772406;
- // aapt resource value: 0x7F0401B0
- public const int wave_height = 2130969008;
+ // aapt resource value: 0x7f0101bb
+ public const int wave_height = 2130772411;
- // aapt resource value: 0x7F0401B1
- public const int wave_width = 2130969009;
+ // aapt resource value: 0x7f0101ba
+ public const int wave_width = 2130772410;
- // aapt resource value: 0x7F0401B2
- public const int wheelview_dividerColor = 2130969010;
+ // aapt resource value: 0x7f0101c0
+ public const int wheelview_dividerColor = 2130772416;
- // aapt resource value: 0x7F0401B3
- public const int wheelview_gravity = 2130969011;
+ // aapt resource value: 0x7f0101bc
+ public const int wheelview_gravity = 2130772412;
- // aapt resource value: 0x7F0401B4
- public const int wheelview_lineSpacingMultiplier = 2130969012;
+ // aapt resource value: 0x7f0101c1
+ public const int wheelview_lineSpacingMultiplier = 2130772417;
- // aapt resource value: 0x7F0401B5
- public const int wheelview_textColorCenter = 2130969013;
+ // aapt resource value: 0x7f0101bf
+ public const int wheelview_textColorCenter = 2130772415;
- // aapt resource value: 0x7F0401B6
- public const int wheelview_textColorOut = 2130969014;
+ // aapt resource value: 0x7f0101be
+ public const int wheelview_textColorOut = 2130772414;
- // aapt resource value: 0x7F0401B7
- public const int wheelview_textSize = 2130969015;
+ // aapt resource value: 0x7f0101bd
+ public const int wheelview_textSize = 2130772413;
- // aapt resource value: 0x7F0401B8
- public const int windowActionBar = 2130969016;
+ // aapt resource value: 0x7f01003d
+ public const int windowActionBar = 2130772029;
- // aapt resource value: 0x7F0401B9
- public const int windowActionBarOverlay = 2130969017;
+ // aapt resource value: 0x7f01003f
+ public const int windowActionBarOverlay = 2130772031;
- // aapt resource value: 0x7F0401BA
- public const int windowActionModeOverlay = 2130969018;
+ // aapt resource value: 0x7f010040
+ public const int windowActionModeOverlay = 2130772032;
- // aapt resource value: 0x7F0401BB
- public const int windowFixedHeightMajor = 2130969019;
+ // aapt resource value: 0x7f010044
+ public const int windowFixedHeightMajor = 2130772036;
- // aapt resource value: 0x7F0401BC
- public const int windowFixedHeightMinor = 2130969020;
+ // aapt resource value: 0x7f010042
+ public const int windowFixedHeightMinor = 2130772034;
- // aapt resource value: 0x7F0401BD
- public const int windowFixedWidthMajor = 2130969021;
+ // aapt resource value: 0x7f010041
+ public const int windowFixedWidthMajor = 2130772033;
- // aapt resource value: 0x7F0401BE
- public const int windowFixedWidthMinor = 2130969022;
+ // aapt resource value: 0x7f010043
+ public const int windowFixedWidthMinor = 2130772035;
- // aapt resource value: 0x7F0401BF
- public const int windowMinWidthMajor = 2130969023;
+ // aapt resource value: 0x7f010045
+ public const int windowMinWidthMajor = 2130772037;
- // aapt resource value: 0x7F0401C0
- public const int windowMinWidthMinor = 2130969024;
+ // aapt resource value: 0x7f010046
+ public const int windowMinWidthMinor = 2130772038;
- // aapt resource value: 0x7F0401C1
- public const int windowNoTitle = 2130969025;
+ // aapt resource value: 0x7f01003e
+ public const int windowNoTitle = 2130772030;
static Attribute()
{
@@ -1667,20 +1667,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7F050000
- public const int abc_action_bar_embed_tabs = 2131034112;
+ // aapt resource value: 0x7f0c0000
+ public const int abc_action_bar_embed_tabs = 2131492864;
- // aapt resource value: 0x7F050001
- public const int abc_allow_stacked_button_bar = 2131034113;
+ // aapt resource value: 0x7f0c0001
+ public const int abc_allow_stacked_button_bar = 2131492865;
- // aapt resource value: 0x7F050002
- public const int abc_config_actionMenuItemAllCaps = 2131034114;
+ // aapt resource value: 0x7f0c0002
+ public const int abc_config_actionMenuItemAllCaps = 2131492866;
- // aapt resource value: 0x7F050003
- public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
+ // aapt resource value: 0x7f0c0003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
- // aapt resource value: 0x7F050004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
+ // aapt resource value: 0x7f0c0004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
static Boolean()
{
@@ -1695,347 +1695,347 @@
public partial class Color
{
- // aapt resource value: 0x7F060000
- public const int abc_background_cache_hint_selector_material_dark = 2131099648;
+ // aapt resource value: 0x7f0d0059
+ public const int abc_background_cache_hint_selector_material_dark = 2131558489;
- // aapt resource value: 0x7F060001
- public const int abc_background_cache_hint_selector_material_light = 2131099649;
+ // aapt resource value: 0x7f0d005a
+ public const int abc_background_cache_hint_selector_material_light = 2131558490;
- // aapt resource value: 0x7F060002
- public const int abc_btn_colored_borderless_text_material = 2131099650;
+ // aapt resource value: 0x7f0d005b
+ public const int abc_btn_colored_borderless_text_material = 2131558491;
- // aapt resource value: 0x7F060003
- public const int abc_btn_colored_text_material = 2131099651;
+ // aapt resource value: 0x7f0d005c
+ public const int abc_btn_colored_text_material = 2131558492;
- // aapt resource value: 0x7F060004
- public const int abc_color_highlight_material = 2131099652;
+ // aapt resource value: 0x7f0d005d
+ public const int abc_color_highlight_material = 2131558493;
- // aapt resource value: 0x7F060005
- public const int abc_hint_foreground_material_dark = 2131099653;
+ // aapt resource value: 0x7f0d005e
+ public const int abc_hint_foreground_material_dark = 2131558494;
- // aapt resource value: 0x7F060006
- public const int abc_hint_foreground_material_light = 2131099654;
+ // aapt resource value: 0x7f0d005f
+ public const int abc_hint_foreground_material_light = 2131558495;
- // aapt resource value: 0x7F060007
- public const int abc_input_method_navigation_guard = 2131099655;
+ // aapt resource value: 0x7f0d0000
+ public const int abc_input_method_navigation_guard = 2131558400;
- // aapt resource value: 0x7F060008
- public const int abc_primary_text_disable_only_material_dark = 2131099656;
+ // aapt resource value: 0x7f0d0060
+ public const int abc_primary_text_disable_only_material_dark = 2131558496;
- // aapt resource value: 0x7F060009
- public const int abc_primary_text_disable_only_material_light = 2131099657;
+ // aapt resource value: 0x7f0d0061
+ public const int abc_primary_text_disable_only_material_light = 2131558497;
- // aapt resource value: 0x7F06000A
- public const int abc_primary_text_material_dark = 2131099658;
+ // aapt resource value: 0x7f0d0062
+ public const int abc_primary_text_material_dark = 2131558498;
- // aapt resource value: 0x7F06000B
- public const int abc_primary_text_material_light = 2131099659;
+ // aapt resource value: 0x7f0d0063
+ public const int abc_primary_text_material_light = 2131558499;
- // aapt resource value: 0x7F06000C
- public const int abc_search_url_text = 2131099660;
+ // aapt resource value: 0x7f0d0064
+ public const int abc_search_url_text = 2131558500;
- // aapt resource value: 0x7F06000D
- public const int abc_search_url_text_normal = 2131099661;
+ // aapt resource value: 0x7f0d0001
+ public const int abc_search_url_text_normal = 2131558401;
- // aapt resource value: 0x7F06000E
- public const int abc_search_url_text_pressed = 2131099662;
+ // aapt resource value: 0x7f0d0002
+ public const int abc_search_url_text_pressed = 2131558402;
- // aapt resource value: 0x7F06000F
- public const int abc_search_url_text_selected = 2131099663;
+ // aapt resource value: 0x7f0d0003
+ public const int abc_search_url_text_selected = 2131558403;
- // aapt resource value: 0x7F060010
- public const int abc_secondary_text_material_dark = 2131099664;
+ // aapt resource value: 0x7f0d0065
+ public const int abc_secondary_text_material_dark = 2131558501;
- // aapt resource value: 0x7F060011
- public const int abc_secondary_text_material_light = 2131099665;
+ // aapt resource value: 0x7f0d0066
+ public const int abc_secondary_text_material_light = 2131558502;
- // aapt resource value: 0x7F060012
- public const int abc_tint_btn_checkable = 2131099666;
+ // aapt resource value: 0x7f0d0067
+ public const int abc_tint_btn_checkable = 2131558503;
- // aapt resource value: 0x7F060013
- public const int abc_tint_default = 2131099667;
+ // aapt resource value: 0x7f0d0068
+ public const int abc_tint_default = 2131558504;
- // aapt resource value: 0x7F060014
- public const int abc_tint_edittext = 2131099668;
+ // aapt resource value: 0x7f0d0069
+ public const int abc_tint_edittext = 2131558505;
- // aapt resource value: 0x7F060015
- public const int abc_tint_seek_thumb = 2131099669;
+ // aapt resource value: 0x7f0d006a
+ public const int abc_tint_seek_thumb = 2131558506;
- // aapt resource value: 0x7F060016
- public const int abc_tint_spinner = 2131099670;
+ // aapt resource value: 0x7f0d006b
+ public const int abc_tint_spinner = 2131558507;
- // aapt resource value: 0x7F060017
- public const int abc_tint_switch_track = 2131099671;
+ // aapt resource value: 0x7f0d006c
+ public const int abc_tint_switch_track = 2131558508;
- // aapt resource value: 0x7F060018
- public const int accent_material_dark = 2131099672;
+ // aapt resource value: 0x7f0d0004
+ public const int accent_material_dark = 2131558404;
- // aapt resource value: 0x7F060019
- public const int accent_material_light = 2131099673;
+ // aapt resource value: 0x7f0d0005
+ public const int accent_material_light = 2131558405;
- // aapt resource value: 0x7F06001A
- public const int background_floating_material_dark = 2131099674;
+ // aapt resource value: 0x7f0d0006
+ public const int background_floating_material_dark = 2131558406;
- // aapt resource value: 0x7F06001B
- public const int background_floating_material_light = 2131099675;
+ // aapt resource value: 0x7f0d0007
+ public const int background_floating_material_light = 2131558407;
- // aapt resource value: 0x7F06001C
- public const int background_material_dark = 2131099676;
+ // aapt resource value: 0x7f0d0008
+ public const int background_material_dark = 2131558408;
- // aapt resource value: 0x7F06001D
- public const int background_material_light = 2131099677;
+ // aapt resource value: 0x7f0d0009
+ public const int background_material_light = 2131558409;
- // aapt resource value: 0x7F06001E
- public const int bright_foreground_disabled_material_dark = 2131099678;
+ // aapt resource value: 0x7f0d000a
+ public const int bright_foreground_disabled_material_dark = 2131558410;
- // aapt resource value: 0x7F06001F
- public const int bright_foreground_disabled_material_light = 2131099679;
+ // aapt resource value: 0x7f0d000b
+ public const int bright_foreground_disabled_material_light = 2131558411;
- // aapt resource value: 0x7F060020
- public const int bright_foreground_inverse_material_dark = 2131099680;
+ // aapt resource value: 0x7f0d000c
+ public const int bright_foreground_inverse_material_dark = 2131558412;
- // aapt resource value: 0x7F060021
- public const int bright_foreground_inverse_material_light = 2131099681;
+ // aapt resource value: 0x7f0d000d
+ public const int bright_foreground_inverse_material_light = 2131558413;
- // aapt resource value: 0x7F060022
- public const int bright_foreground_material_dark = 2131099682;
+ // aapt resource value: 0x7f0d000e
+ public const int bright_foreground_material_dark = 2131558414;
- // aapt resource value: 0x7F060023
- public const int bright_foreground_material_light = 2131099683;
+ // aapt resource value: 0x7f0d000f
+ public const int bright_foreground_material_light = 2131558415;
- // aapt resource value: 0x7F060024
- public const int button_material_dark = 2131099684;
+ // aapt resource value: 0x7f0d0010
+ public const int button_material_dark = 2131558416;
- // aapt resource value: 0x7F060025
- public const int button_material_light = 2131099685;
+ // aapt resource value: 0x7f0d0011
+ public const int button_material_light = 2131558417;
- // aapt resource value: 0x7F060026
- public const int colorAccent = 2131099686;
+ // aapt resource value: 0x7f0d0047
+ public const int colorAccent = 2131558471;
- // aapt resource value: 0x7F060027
- public const int colorPrimary = 2131099687;
+ // aapt resource value: 0x7f0d0048
+ public const int colorPrimary = 2131558472;
- // aapt resource value: 0x7F060028
- public const int colorPrimaryDark = 2131099688;
+ // aapt resource value: 0x7f0d0049
+ public const int colorPrimaryDark = 2131558473;
- // aapt resource value: 0x7F060029
- public const int color_default = 2131099689;
+ // aapt resource value: 0x7f0d0058
+ public const int color_default = 2131558488;
- // aapt resource value: 0x7F06002A
- public const int color_disable = 2131099690;
+ // aapt resource value: 0x7f0d0056
+ public const int color_disable = 2131558486;
- // aapt resource value: 0x7F06002B
- public const int color_select = 2131099691;
+ // aapt resource value: 0x7f0d0057
+ public const int color_select = 2131558487;
- // aapt resource value: 0x7F06002C
- public const int color_white = 2131099692;
+ // aapt resource value: 0x7f0d0055
+ public const int color_white = 2131558485;
- // aapt resource value: 0x7F06002D
- public const int design_bottom_navigation_shadow_color = 2131099693;
+ // aapt resource value: 0x7f0d003c
+ public const int design_bottom_navigation_shadow_color = 2131558460;
- // aapt resource value: 0x7F06002E
- public const int design_error = 2131099694;
+ // aapt resource value: 0x7f0d006d
+ public const int design_error = 2131558509;
- // aapt resource value: 0x7F06002F
- public const int design_fab_shadow_end_color = 2131099695;
+ // aapt resource value: 0x7f0d003d
+ public const int design_fab_shadow_end_color = 2131558461;
- // aapt resource value: 0x7F060030
- public const int design_fab_shadow_mid_color = 2131099696;
+ // aapt resource value: 0x7f0d003e
+ public const int design_fab_shadow_mid_color = 2131558462;
- // aapt resource value: 0x7F060031
- public const int design_fab_shadow_start_color = 2131099697;
+ // aapt resource value: 0x7f0d003f
+ public const int design_fab_shadow_start_color = 2131558463;
- // aapt resource value: 0x7F060032
- public const int design_fab_stroke_end_inner_color = 2131099698;
+ // aapt resource value: 0x7f0d0040
+ public const int design_fab_stroke_end_inner_color = 2131558464;
- // aapt resource value: 0x7F060033
- public const int design_fab_stroke_end_outer_color = 2131099699;
+ // aapt resource value: 0x7f0d0041
+ public const int design_fab_stroke_end_outer_color = 2131558465;
- // aapt resource value: 0x7F060034
- public const int design_fab_stroke_top_inner_color = 2131099700;
+ // aapt resource value: 0x7f0d0042
+ public const int design_fab_stroke_top_inner_color = 2131558466;
- // aapt resource value: 0x7F060035
- public const int design_fab_stroke_top_outer_color = 2131099701;
+ // aapt resource value: 0x7f0d0043
+ public const int design_fab_stroke_top_outer_color = 2131558467;
- // aapt resource value: 0x7F060036
- public const int design_snackbar_background_color = 2131099702;
+ // aapt resource value: 0x7f0d0044
+ public const int design_snackbar_background_color = 2131558468;
- // aapt resource value: 0x7F060037
- public const int design_tint_password_toggle = 2131099703;
+ // aapt resource value: 0x7f0d006e
+ public const int design_tint_password_toggle = 2131558510;
- // aapt resource value: 0x7F060038
- public const int dim_foreground_disabled_material_dark = 2131099704;
+ // aapt resource value: 0x7f0d0012
+ public const int dim_foreground_disabled_material_dark = 2131558418;
- // aapt resource value: 0x7F060039
- public const int dim_foreground_disabled_material_light = 2131099705;
+ // aapt resource value: 0x7f0d0013
+ public const int dim_foreground_disabled_material_light = 2131558419;
- // aapt resource value: 0x7F06003A
- public const int dim_foreground_material_dark = 2131099706;
+ // aapt resource value: 0x7f0d0014
+ public const int dim_foreground_material_dark = 2131558420;
- // aapt resource value: 0x7F06003B
- public const int dim_foreground_material_light = 2131099707;
+ // aapt resource value: 0x7f0d0015
+ public const int dim_foreground_material_light = 2131558421;
- // aapt resource value: 0x7F06003C
- public const int error_color_material = 2131099708;
+ // aapt resource value: 0x7f0d0016
+ public const int error_color_material = 2131558422;
- // aapt resource value: 0x7F06003D
- public const int foreground_material_dark = 2131099709;
+ // aapt resource value: 0x7f0d0017
+ public const int foreground_material_dark = 2131558423;
- // aapt resource value: 0x7F06003E
- public const int foreground_material_light = 2131099710;
+ // aapt resource value: 0x7f0d0018
+ public const int foreground_material_light = 2131558424;
- // aapt resource value: 0x7F06003F
- public const int gd_top_view = 2131099711;
+ // aapt resource value: 0x7f0d004b
+ public const int gd_top_view = 2131558475;
- // aapt resource value: 0x7F060040
- public const int highlighted_text_material_dark = 2131099712;
+ // aapt resource value: 0x7f0d0019
+ public const int highlighted_text_material_dark = 2131558425;
- // aapt resource value: 0x7F060041
- public const int highlighted_text_material_light = 2131099713;
+ // aapt resource value: 0x7f0d001a
+ public const int highlighted_text_material_light = 2131558426;
- // aapt resource value: 0x7F060042
- public const int material_blue_grey_800 = 2131099714;
+ // aapt resource value: 0x7f0d001b
+ public const int material_blue_grey_800 = 2131558427;
- // aapt resource value: 0x7F060043
- public const int material_blue_grey_900 = 2131099715;
+ // aapt resource value: 0x7f0d001c
+ public const int material_blue_grey_900 = 2131558428;
- // aapt resource value: 0x7F060044
- public const int material_blue_grey_950 = 2131099716;
+ // aapt resource value: 0x7f0d001d
+ public const int material_blue_grey_950 = 2131558429;
- // aapt resource value: 0x7F060045
- public const int material_deep_teal_200 = 2131099717;
+ // aapt resource value: 0x7f0d001e
+ public const int material_deep_teal_200 = 2131558430;
- // aapt resource value: 0x7F060046
- public const int material_deep_teal_500 = 2131099718;
+ // aapt resource value: 0x7f0d001f
+ public const int material_deep_teal_500 = 2131558431;
- // aapt resource value: 0x7F060047
- public const int material_grey_100 = 2131099719;
+ // aapt resource value: 0x7f0d0020
+ public const int material_grey_100 = 2131558432;
- // aapt resource value: 0x7F060048
- public const int material_grey_300 = 2131099720;
+ // aapt resource value: 0x7f0d0021
+ public const int material_grey_300 = 2131558433;
- // aapt resource value: 0x7F060049
- public const int material_grey_50 = 2131099721;
+ // aapt resource value: 0x7f0d0022
+ public const int material_grey_50 = 2131558434;
- // aapt resource value: 0x7F06004A
- public const int material_grey_600 = 2131099722;
+ // aapt resource value: 0x7f0d0023
+ public const int material_grey_600 = 2131558435;
- // aapt resource value: 0x7F06004B
- public const int material_grey_800 = 2131099723;
+ // aapt resource value: 0x7f0d0024
+ public const int material_grey_800 = 2131558436;
- // aapt resource value: 0x7F06004C
- public const int material_grey_850 = 2131099724;
+ // aapt resource value: 0x7f0d0025
+ public const int material_grey_850 = 2131558437;
- // aapt resource value: 0x7F06004D
- public const int material_grey_900 = 2131099725;
+ // aapt resource value: 0x7f0d0026
+ public const int material_grey_900 = 2131558438;
- // aapt resource value: 0x7F06004E
- public const int material_red_500 = 2131099726;
+ // aapt resource value: 0x7f0d004a
+ public const int material_red_500 = 2131558474;
- // aapt resource value: 0x7F06004F
- public const int notification_action_color_filter = 2131099727;
+ // aapt resource value: 0x7f0d0045
+ public const int notification_action_color_filter = 2131558469;
- // aapt resource value: 0x7F060050
- public const int notification_icon_bg_color = 2131099728;
+ // aapt resource value: 0x7f0d0046
+ public const int notification_icon_bg_color = 2131558470;
- // aapt resource value: 0x7F060051
- public const int notification_material_background_media_default_color = 2131099729;
+ // aapt resource value: 0x7f0d003b
+ public const int notification_material_background_media_default_color = 2131558459;
- // aapt resource value: 0x7F060052
- public const int pickerview_bgColor_default = 2131099730;
+ // aapt resource value: 0x7f0d004c
+ public const int pickerview_bgColor_default = 2131558476;
- // aapt resource value: 0x7F060053
- public const int pickerview_bgColor_overlay = 2131099731;
+ // aapt resource value: 0x7f0d004d
+ public const int pickerview_bgColor_overlay = 2131558477;
- // aapt resource value: 0x7F060054
- public const int pickerview_bg_topbar = 2131099732;
+ // aapt resource value: 0x7f0d004e
+ public const int pickerview_bg_topbar = 2131558478;
- // aapt resource value: 0x7F060055
- public const int pickerview_timebtn_nor = 2131099733;
+ // aapt resource value: 0x7f0d004f
+ public const int pickerview_timebtn_nor = 2131558479;
- // aapt resource value: 0x7F060056
- public const int pickerview_timebtn_pre = 2131099734;
+ // aapt resource value: 0x7f0d0050
+ public const int pickerview_timebtn_pre = 2131558480;
- // aapt resource value: 0x7F060057
- public const int pickerview_topbar_title = 2131099735;
+ // aapt resource value: 0x7f0d0051
+ public const int pickerview_topbar_title = 2131558481;
- // aapt resource value: 0x7F060058
- public const int pickerview_wheelview_textcolor_center = 2131099736;
+ // aapt resource value: 0x7f0d0052
+ public const int pickerview_wheelview_textcolor_center = 2131558482;
- // aapt resource value: 0x7F060059
- public const int pickerview_wheelview_textcolor_divider = 2131099737;
+ // aapt resource value: 0x7f0d0053
+ public const int pickerview_wheelview_textcolor_divider = 2131558483;
- // aapt resource value: 0x7F06005A
- public const int pickerview_wheelview_textcolor_out = 2131099738;
+ // aapt resource value: 0x7f0d0054
+ public const int pickerview_wheelview_textcolor_out = 2131558484;
- // aapt resource value: 0x7F06005B
- public const int primary_dark_material_dark = 2131099739;
+ // aapt resource value: 0x7f0d0027
+ public const int primary_dark_material_dark = 2131558439;
- // aapt resource value: 0x7F06005C
- public const int primary_dark_material_light = 2131099740;
+ // aapt resource value: 0x7f0d0028
+ public const int primary_dark_material_light = 2131558440;
- // aapt resource value: 0x7F06005D
- public const int primary_material_dark = 2131099741;
+ // aapt resource value: 0x7f0d0029
+ public const int primary_material_dark = 2131558441;
- // aapt resource value: 0x7F06005E
- public const int primary_material_light = 2131099742;
+ // aapt resource value: 0x7f0d002a
+ public const int primary_material_light = 2131558442;
- // aapt resource value: 0x7F06005F
- public const int primary_text_default_material_dark = 2131099743;
+ // aapt resource value: 0x7f0d002b
+ public const int primary_text_default_material_dark = 2131558443;
- // aapt resource value: 0x7F060060
- public const int primary_text_default_material_light = 2131099744;
+ // aapt resource value: 0x7f0d002c
+ public const int primary_text_default_material_light = 2131558444;
- // aapt resource value: 0x7F060061
- public const int primary_text_disabled_material_dark = 2131099745;
+ // aapt resource value: 0x7f0d002d
+ public const int primary_text_disabled_material_dark = 2131558445;
- // aapt resource value: 0x7F060062
- public const int primary_text_disabled_material_light = 2131099746;
+ // aapt resource value: 0x7f0d002e
+ public const int primary_text_disabled_material_light = 2131558446;
- // aapt resource value: 0x7F060063
- public const int ripple_material_dark = 2131099747;
+ // aapt resource value: 0x7f0d002f
+ public const int ripple_material_dark = 2131558447;
- // aapt resource value: 0x7F060064
- public const int ripple_material_light = 2131099748;
+ // aapt resource value: 0x7f0d0030
+ public const int ripple_material_light = 2131558448;
- // aapt resource value: 0x7F060065
- public const int secondary_text_default_material_dark = 2131099749;
+ // aapt resource value: 0x7f0d0031
+ public const int secondary_text_default_material_dark = 2131558449;
- // aapt resource value: 0x7F060066
- public const int secondary_text_default_material_light = 2131099750;
+ // aapt resource value: 0x7f0d0032
+ public const int secondary_text_default_material_light = 2131558450;
- // aapt resource value: 0x7F060067
- public const int secondary_text_disabled_material_dark = 2131099751;
+ // aapt resource value: 0x7f0d0033
+ public const int secondary_text_disabled_material_dark = 2131558451;
- // aapt resource value: 0x7F060068
- public const int secondary_text_disabled_material_light = 2131099752;
+ // aapt resource value: 0x7f0d0034
+ public const int secondary_text_disabled_material_light = 2131558452;
- // aapt resource value: 0x7F060069
- public const int switch_thumb_disabled_material_dark = 2131099753;
+ // aapt resource value: 0x7f0d0035
+ public const int switch_thumb_disabled_material_dark = 2131558453;
- // aapt resource value: 0x7F06006A
- public const int switch_thumb_disabled_material_light = 2131099754;
+ // aapt resource value: 0x7f0d0036
+ public const int switch_thumb_disabled_material_light = 2131558454;
- // aapt resource value: 0x7F06006B
- public const int switch_thumb_material_dark = 2131099755;
+ // aapt resource value: 0x7f0d006f
+ public const int switch_thumb_material_dark = 2131558511;
- // aapt resource value: 0x7F06006C
- public const int switch_thumb_material_light = 2131099756;
+ // aapt resource value: 0x7f0d0070
+ public const int switch_thumb_material_light = 2131558512;
- // aapt resource value: 0x7F06006D
- public const int switch_thumb_normal_material_dark = 2131099757;
+ // aapt resource value: 0x7f0d0037
+ public const int switch_thumb_normal_material_dark = 2131558455;
- // aapt resource value: 0x7F06006E
- public const int switch_thumb_normal_material_light = 2131099758;
+ // aapt resource value: 0x7f0d0038
+ public const int switch_thumb_normal_material_light = 2131558456;
- // aapt resource value: 0x7F06006F
- public const int text_color = 2131099759;
+ // aapt resource value: 0x7f0d0071
+ public const int text_color = 2131558513;
- // aapt resource value: 0x7F060070
- public const int tooltip_background_dark = 2131099760;
+ // aapt resource value: 0x7f0d0039
+ public const int tooltip_background_dark = 2131558457;
- // aapt resource value: 0x7F060071
- public const int tooltip_background_light = 2131099761;
+ // aapt resource value: 0x7f0d003a
+ public const int tooltip_background_light = 2131558458;
static Color()
{
@@ -2050,491 +2050,491 @@
public partial class Dimension
{
- // aapt resource value: 0x7F070000
- public const int abc_action_bar_content_inset_material = 2131165184;
+ // aapt resource value: 0x7f080012
+ public const int abc_action_bar_content_inset_material = 2131230738;
- // aapt resource value: 0x7F070001
- public const int abc_action_bar_content_inset_with_nav = 2131165185;
+ // aapt resource value: 0x7f080013
+ public const int abc_action_bar_content_inset_with_nav = 2131230739;
- // aapt resource value: 0x7F070002
- public const int abc_action_bar_default_height_material = 2131165186;
+ // aapt resource value: 0x7f080007
+ public const int abc_action_bar_default_height_material = 2131230727;
- // aapt resource value: 0x7F070003
- public const int abc_action_bar_default_padding_end_material = 2131165187;
+ // aapt resource value: 0x7f080014
+ public const int abc_action_bar_default_padding_end_material = 2131230740;
- // aapt resource value: 0x7F070004
- public const int abc_action_bar_default_padding_start_material = 2131165188;
+ // aapt resource value: 0x7f080015
+ public const int abc_action_bar_default_padding_start_material = 2131230741;
- // aapt resource value: 0x7F070005
- public const int abc_action_bar_elevation_material = 2131165189;
+ // aapt resource value: 0x7f080017
+ public const int abc_action_bar_elevation_material = 2131230743;
- // aapt resource value: 0x7F070006
- public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
+ // aapt resource value: 0x7f080018
+ public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
- // aapt resource value: 0x7F070007
- public const int abc_action_bar_overflow_padding_end_material = 2131165191;
+ // aapt resource value: 0x7f080019
+ public const int abc_action_bar_overflow_padding_end_material = 2131230745;
- // aapt resource value: 0x7F070008
- public const int abc_action_bar_overflow_padding_start_material = 2131165192;
+ // aapt resource value: 0x7f08001a
+ public const int abc_action_bar_overflow_padding_start_material = 2131230746;
- // aapt resource value: 0x7F070009
- public const int abc_action_bar_progress_bar_size = 2131165193;
+ // aapt resource value: 0x7f080008
+ public const int abc_action_bar_progress_bar_size = 2131230728;
- // aapt resource value: 0x7F07000A
- public const int abc_action_bar_stacked_max_height = 2131165194;
+ // aapt resource value: 0x7f08001b
+ public const int abc_action_bar_stacked_max_height = 2131230747;
- // aapt resource value: 0x7F07000B
- public const int abc_action_bar_stacked_tab_max_width = 2131165195;
+ // aapt resource value: 0x7f08001c
+ public const int abc_action_bar_stacked_tab_max_width = 2131230748;
- // aapt resource value: 0x7F07000C
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
+ // aapt resource value: 0x7f08001d
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
- // aapt resource value: 0x7F07000D
- public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
+ // aapt resource value: 0x7f08001e
+ public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
- // aapt resource value: 0x7F07000E
- public const int abc_action_button_min_height_material = 2131165198;
+ // aapt resource value: 0x7f08001f
+ public const int abc_action_button_min_height_material = 2131230751;
- // aapt resource value: 0x7F07000F
- public const int abc_action_button_min_width_material = 2131165199;
+ // aapt resource value: 0x7f080020
+ public const int abc_action_button_min_width_material = 2131230752;
- // aapt resource value: 0x7F070010
- public const int abc_action_button_min_width_overflow_material = 2131165200;
+ // aapt resource value: 0x7f080021
+ public const int abc_action_button_min_width_overflow_material = 2131230753;
- // aapt resource value: 0x7F070011
- public const int abc_alert_dialog_button_bar_height = 2131165201;
+ // aapt resource value: 0x7f080006
+ public const int abc_alert_dialog_button_bar_height = 2131230726;
- // aapt resource value: 0x7F070012
- public const int abc_button_inset_horizontal_material = 2131165202;
+ // aapt resource value: 0x7f080022
+ public const int abc_button_inset_horizontal_material = 2131230754;
- // aapt resource value: 0x7F070013
- public const int abc_button_inset_vertical_material = 2131165203;
+ // aapt resource value: 0x7f080023
+ public const int abc_button_inset_vertical_material = 2131230755;
- // aapt resource value: 0x7F070014
- public const int abc_button_padding_horizontal_material = 2131165204;
+ // aapt resource value: 0x7f080024
+ public const int abc_button_padding_horizontal_material = 2131230756;
- // aapt resource value: 0x7F070015
- public const int abc_button_padding_vertical_material = 2131165205;
+ // aapt resource value: 0x7f080025
+ public const int abc_button_padding_vertical_material = 2131230757;
- // aapt resource value: 0x7F070016
- public const int abc_cascading_menus_min_smallest_width = 2131165206;
+ // aapt resource value: 0x7f080026
+ public const int abc_cascading_menus_min_smallest_width = 2131230758;
- // aapt resource value: 0x7F070017
- public const int abc_config_prefDialogWidth = 2131165207;
+ // aapt resource value: 0x7f08000b
+ public const int abc_config_prefDialogWidth = 2131230731;
- // aapt resource value: 0x7F070018
- public const int abc_control_corner_material = 2131165208;
+ // aapt resource value: 0x7f080027
+ public const int abc_control_corner_material = 2131230759;
- // aapt resource value: 0x7F070019
- public const int abc_control_inset_material = 2131165209;
+ // aapt resource value: 0x7f080028
+ public const int abc_control_inset_material = 2131230760;
- // aapt resource value: 0x7F07001A
- public const int abc_control_padding_material = 2131165210;
+ // aapt resource value: 0x7f080029
+ public const int abc_control_padding_material = 2131230761;
- // aapt resource value: 0x7F07001B
- public const int abc_dialog_fixed_height_major = 2131165211;
+ // aapt resource value: 0x7f08000c
+ public const int abc_dialog_fixed_height_major = 2131230732;
- // aapt resource value: 0x7F07001C
- public const int abc_dialog_fixed_height_minor = 2131165212;
+ // aapt resource value: 0x7f08000d
+ public const int abc_dialog_fixed_height_minor = 2131230733;
- // aapt resource value: 0x7F07001D
- public const int abc_dialog_fixed_width_major = 2131165213;
+ // aapt resource value: 0x7f08000e
+ public const int abc_dialog_fixed_width_major = 2131230734;
- // aapt resource value: 0x7F07001E
- public const int abc_dialog_fixed_width_minor = 2131165214;
+ // aapt resource value: 0x7f08000f
+ public const int abc_dialog_fixed_width_minor = 2131230735;
- // aapt resource value: 0x7F07001F
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
+ // aapt resource value: 0x7f08002a
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
- // aapt resource value: 0x7F070020
- public const int abc_dialog_list_padding_top_no_title = 2131165216;
+ // aapt resource value: 0x7f08002b
+ public const int abc_dialog_list_padding_top_no_title = 2131230763;
- // aapt resource value: 0x7F070021
- public const int abc_dialog_min_width_major = 2131165217;
+ // aapt resource value: 0x7f080010
+ public const int abc_dialog_min_width_major = 2131230736;
- // aapt resource value: 0x7F070022
- public const int abc_dialog_min_width_minor = 2131165218;
+ // aapt resource value: 0x7f080011
+ public const int abc_dialog_min_width_minor = 2131230737;
- // aapt resource value: 0x7F070023
- public const int abc_dialog_padding_material = 2131165219;
+ // aapt resource value: 0x7f08002c
+ public const int abc_dialog_padding_material = 2131230764;
- // aapt resource value: 0x7F070024
- public const int abc_dialog_padding_top_material = 2131165220;
+ // aapt resource value: 0x7f08002d
+ public const int abc_dialog_padding_top_material = 2131230765;
- // aapt resource value: 0x7F070025
- public const int abc_dialog_title_divider_material = 2131165221;
+ // aapt resource value: 0x7f08002e
+ public const int abc_dialog_title_divider_material = 2131230766;
- // aapt resource value: 0x7F070026
- public const int abc_disabled_alpha_material_dark = 2131165222;
+ // aapt resource value: 0x7f08002f
+ public const int abc_disabled_alpha_material_dark = 2131230767;
- // aapt resource value: 0x7F070027
- public const int abc_disabled_alpha_material_light = 2131165223;
+ // aapt resource value: 0x7f080030
+ public const int abc_disabled_alpha_material_light = 2131230768;
- // aapt resource value: 0x7F070028
- public const int abc_dropdownitem_icon_width = 2131165224;
+ // aapt resource value: 0x7f080031
+ public const int abc_dropdownitem_icon_width = 2131230769;
- // aapt resource value: 0x7F070029
- public const int abc_dropdownitem_text_padding_left = 2131165225;
+ // aapt resource value: 0x7f080032
+ public const int abc_dropdownitem_text_padding_left = 2131230770;
- // aapt resource value: 0x7F07002A
- public const int abc_dropdownitem_text_padding_right = 2131165226;
+ // aapt resource value: 0x7f080033
+ public const int abc_dropdownitem_text_padding_right = 2131230771;
- // aapt resource value: 0x7F07002B
- public const int abc_edit_text_inset_bottom_material = 2131165227;
+ // aapt resource value: 0x7f080034
+ public const int abc_edit_text_inset_bottom_material = 2131230772;
- // aapt resource value: 0x7F07002C
- public const int abc_edit_text_inset_horizontal_material = 2131165228;
+ // aapt resource value: 0x7f080035
+ public const int abc_edit_text_inset_horizontal_material = 2131230773;
- // aapt resource value: 0x7F07002D
- public const int abc_edit_text_inset_top_material = 2131165229;
+ // aapt resource value: 0x7f080036
+ public const int abc_edit_text_inset_top_material = 2131230774;
- // aapt resource value: 0x7F07002E
- public const int abc_floating_window_z = 2131165230;
+ // aapt resource value: 0x7f080037
+ public const int abc_floating_window_z = 2131230775;
- // aapt resource value: 0x7F07002F
- public const int abc_list_item_padding_horizontal_material = 2131165231;
+ // aapt resource value: 0x7f080038
+ public const int abc_list_item_padding_horizontal_material = 2131230776;
- // aapt resource value: 0x7F070030
- public const int abc_panel_menu_list_width = 2131165232;
+ // aapt resource value: 0x7f080039
+ public const int abc_panel_menu_list_width = 2131230777;
- // aapt resource value: 0x7F070031
- public const int abc_progress_bar_height_material = 2131165233;
+ // aapt resource value: 0x7f08003a
+ public const int abc_progress_bar_height_material = 2131230778;
- // aapt resource value: 0x7F070032
- public const int abc_search_view_preferred_height = 2131165234;
+ // aapt resource value: 0x7f08003b
+ public const int abc_search_view_preferred_height = 2131230779;
- // aapt resource value: 0x7F070033
- public const int abc_search_view_preferred_width = 2131165235;
+ // aapt resource value: 0x7f08003c
+ public const int abc_search_view_preferred_width = 2131230780;
- // aapt resource value: 0x7F070034
- public const int abc_seekbar_track_background_height_material = 2131165236;
+ // aapt resource value: 0x7f08003d
+ public const int abc_seekbar_track_background_height_material = 2131230781;
- // aapt resource value: 0x7F070035
- public const int abc_seekbar_track_progress_height_material = 2131165237;
+ // aapt resource value: 0x7f08003e
+ public const int abc_seekbar_track_progress_height_material = 2131230782;
- // aapt resource value: 0x7F070036
- public const int abc_select_dialog_padding_start_material = 2131165238;
+ // aapt resource value: 0x7f08003f
+ public const int abc_select_dialog_padding_start_material = 2131230783;
- // aapt resource value: 0x7F070037
- public const int abc_switch_padding = 2131165239;
+ // aapt resource value: 0x7f080016
+ public const int abc_switch_padding = 2131230742;
- // aapt resource value: 0x7F070038
- public const int abc_text_size_body_1_material = 2131165240;
+ // aapt resource value: 0x7f080040
+ public const int abc_text_size_body_1_material = 2131230784;
- // aapt resource value: 0x7F070039
- public const int abc_text_size_body_2_material = 2131165241;
+ // aapt resource value: 0x7f080041
+ public const int abc_text_size_body_2_material = 2131230785;
- // aapt resource value: 0x7F07003A
- public const int abc_text_size_button_material = 2131165242;
+ // aapt resource value: 0x7f080042
+ public const int abc_text_size_button_material = 2131230786;
- // aapt resource value: 0x7F07003B
- public const int abc_text_size_caption_material = 2131165243;
+ // aapt resource value: 0x7f080043
+ public const int abc_text_size_caption_material = 2131230787;
- // aapt resource value: 0x7F07003C
- public const int abc_text_size_display_1_material = 2131165244;
+ // aapt resource value: 0x7f080044
+ public const int abc_text_size_display_1_material = 2131230788;
- // aapt resource value: 0x7F07003D
- public const int abc_text_size_display_2_material = 2131165245;
+ // aapt resource value: 0x7f080045
+ public const int abc_text_size_display_2_material = 2131230789;
- // aapt resource value: 0x7F07003E
- public const int abc_text_size_display_3_material = 2131165246;
+ // aapt resource value: 0x7f080046
+ public const int abc_text_size_display_3_material = 2131230790;
- // aapt resource value: 0x7F07003F
- public const int abc_text_size_display_4_material = 2131165247;
+ // aapt resource value: 0x7f080047
+ public const int abc_text_size_display_4_material = 2131230791;
- // aapt resource value: 0x7F070040
- public const int abc_text_size_headline_material = 2131165248;
+ // aapt resource value: 0x7f080048
+ public const int abc_text_size_headline_material = 2131230792;
- // aapt resource value: 0x7F070041
- public const int abc_text_size_large_material = 2131165249;
+ // aapt resource value: 0x7f080049
+ public const int abc_text_size_large_material = 2131230793;
- // aapt resource value: 0x7F070042
- public const int abc_text_size_medium_material = 2131165250;
+ // aapt resource value: 0x7f08004a
+ public const int abc_text_size_medium_material = 2131230794;
- // aapt resource value: 0x7F070043
- public const int abc_text_size_menu_header_material = 2131165251;
+ // aapt resource value: 0x7f08004b
+ public const int abc_text_size_menu_header_material = 2131230795;
- // aapt resource value: 0x7F070044
- public const int abc_text_size_menu_material = 2131165252;
+ // aapt resource value: 0x7f08004c
+ public const int abc_text_size_menu_material = 2131230796;
- // aapt resource value: 0x7F070045
- public const int abc_text_size_small_material = 2131165253;
+ // aapt resource value: 0x7f08004d
+ public const int abc_text_size_small_material = 2131230797;
- // aapt resource value: 0x7F070046
- public const int abc_text_size_subhead_material = 2131165254;
+ // aapt resource value: 0x7f08004e
+ public const int abc_text_size_subhead_material = 2131230798;
- // aapt resource value: 0x7F070047
- public const int abc_text_size_subtitle_material_toolbar = 2131165255;
+ // aapt resource value: 0x7f080009
+ public const int abc_text_size_subtitle_material_toolbar = 2131230729;
- // aapt resource value: 0x7F070048
- public const int abc_text_size_title_material = 2131165256;
+ // aapt resource value: 0x7f08004f
+ public const int abc_text_size_title_material = 2131230799;
- // aapt resource value: 0x7F070049
- public const int abc_text_size_title_material_toolbar = 2131165257;
+ // aapt resource value: 0x7f08000a
+ public const int abc_text_size_title_material_toolbar = 2131230730;
- // aapt resource value: 0x7F07004A
- public const int compat_button_inset_horizontal_material = 2131165258;
+ // aapt resource value: 0x7f08008b
+ public const int compat_button_inset_horizontal_material = 2131230859;
- // aapt resource value: 0x7F07004B
- public const int compat_button_inset_vertical_material = 2131165259;
+ // aapt resource value: 0x7f08008c
+ public const int compat_button_inset_vertical_material = 2131230860;
- // aapt resource value: 0x7F07004C
- public const int compat_button_padding_horizontal_material = 2131165260;
+ // aapt resource value: 0x7f08008d
+ public const int compat_button_padding_horizontal_material = 2131230861;
- // aapt resource value: 0x7F07004D
- public const int compat_button_padding_vertical_material = 2131165261;
+ // aapt resource value: 0x7f08008e
+ public const int compat_button_padding_vertical_material = 2131230862;
- // aapt resource value: 0x7F07004E
- public const int compat_control_corner_material = 2131165262;
+ // aapt resource value: 0x7f08008f
+ public const int compat_control_corner_material = 2131230863;
- // aapt resource value: 0x7F07004F
- public const int design_appbar_elevation = 2131165263;
+ // aapt resource value: 0x7f080069
+ public const int design_appbar_elevation = 2131230825;
- // aapt resource value: 0x7F070050
- public const int design_bottom_navigation_active_item_max_width = 2131165264;
+ // aapt resource value: 0x7f08006a
+ public const int design_bottom_navigation_active_item_max_width = 2131230826;
- // aapt resource value: 0x7F070051
- public const int design_bottom_navigation_active_text_size = 2131165265;
+ // aapt resource value: 0x7f08006b
+ public const int design_bottom_navigation_active_text_size = 2131230827;
- // aapt resource value: 0x7F070052
- public const int design_bottom_navigation_elevation = 2131165266;
+ // aapt resource value: 0x7f08006c
+ public const int design_bottom_navigation_elevation = 2131230828;
- // aapt resource value: 0x7F070053
- public const int design_bottom_navigation_height = 2131165267;
+ // aapt resource value: 0x7f08006d
+ public const int design_bottom_navigation_height = 2131230829;
- // aapt resource value: 0x7F070054
- public const int design_bottom_navigation_item_max_width = 2131165268;
+ // aapt resource value: 0x7f08006e
+ public const int design_bottom_navigation_item_max_width = 2131230830;
- // aapt resource value: 0x7F070055
- public const int design_bottom_navigation_item_min_width = 2131165269;
+ // aapt resource value: 0x7f08006f
+ public const int design_bottom_navigation_item_min_width = 2131230831;
- // aapt resource value: 0x7F070056
- public const int design_bottom_navigation_margin = 2131165270;
+ // aapt resource value: 0x7f080070
+ public const int design_bottom_navigation_margin = 2131230832;
- // aapt resource value: 0x7F070057
- public const int design_bottom_navigation_shadow_height = 2131165271;
+ // aapt resource value: 0x7f080071
+ public const int design_bottom_navigation_shadow_height = 2131230833;
- // aapt resource value: 0x7F070058
- public const int design_bottom_navigation_text_size = 2131165272;
+ // aapt resource value: 0x7f080072
+ public const int design_bottom_navigation_text_size = 2131230834;
- // aapt resource value: 0x7F070059
- public const int design_bottom_sheet_modal_elevation = 2131165273;
+ // aapt resource value: 0x7f080073
+ public const int design_bottom_sheet_modal_elevation = 2131230835;
- // aapt resource value: 0x7F07005A
- public const int design_bottom_sheet_peek_height_min = 2131165274;
+ // aapt resource value: 0x7f080074
+ public const int design_bottom_sheet_peek_height_min = 2131230836;
- // aapt resource value: 0x7F07005B
- public const int design_fab_border_width = 2131165275;
+ // aapt resource value: 0x7f080075
+ public const int design_fab_border_width = 2131230837;
- // aapt resource value: 0x7F07005C
- public const int design_fab_elevation = 2131165276;
+ // aapt resource value: 0x7f080076
+ public const int design_fab_elevation = 2131230838;
- // aapt resource value: 0x7F07005D
- public const int design_fab_image_size = 2131165277;
+ // aapt resource value: 0x7f080077
+ public const int design_fab_image_size = 2131230839;
- // aapt resource value: 0x7F07005E
- public const int design_fab_size_mini = 2131165278;
+ // aapt resource value: 0x7f080078
+ public const int design_fab_size_mini = 2131230840;
- // aapt resource value: 0x7F07005F
- public const int design_fab_size_normal = 2131165279;
+ // aapt resource value: 0x7f080079
+ public const int design_fab_size_normal = 2131230841;
- // aapt resource value: 0x7F070060
- public const int design_fab_translation_z_pressed = 2131165280;
+ // aapt resource value: 0x7f08007a
+ public const int design_fab_translation_z_pressed = 2131230842;
- // aapt resource value: 0x7F070061
- public const int design_navigation_elevation = 2131165281;
+ // aapt resource value: 0x7f08007b
+ public const int design_navigation_elevation = 2131230843;
- // aapt resource value: 0x7F070062
- public const int design_navigation_icon_padding = 2131165282;
+ // aapt resource value: 0x7f08007c
+ public const int design_navigation_icon_padding = 2131230844;
- // aapt resource value: 0x7F070063
- public const int design_navigation_icon_size = 2131165283;
+ // aapt resource value: 0x7f08007d
+ public const int design_navigation_icon_size = 2131230845;
- // aapt resource value: 0x7F070064
- public const int design_navigation_max_width = 2131165284;
+ // aapt resource value: 0x7f080061
+ public const int design_navigation_max_width = 2131230817;
- // aapt resource value: 0x7F070065
- public const int design_navigation_padding_bottom = 2131165285;
+ // aapt resource value: 0x7f08007e
+ public const int design_navigation_padding_bottom = 2131230846;
- // aapt resource value: 0x7F070066
- public const int design_navigation_separator_vertical_padding = 2131165286;
+ // aapt resource value: 0x7f08007f
+ public const int design_navigation_separator_vertical_padding = 2131230847;
- // aapt resource value: 0x7F070067
- public const int design_snackbar_action_inline_max_width = 2131165287;
+ // aapt resource value: 0x7f080062
+ public const int design_snackbar_action_inline_max_width = 2131230818;
- // aapt resource value: 0x7F070068
- public const int design_snackbar_background_corner_radius = 2131165288;
+ // aapt resource value: 0x7f080063
+ public const int design_snackbar_background_corner_radius = 2131230819;
- // aapt resource value: 0x7F070069
- public const int design_snackbar_elevation = 2131165289;
+ // aapt resource value: 0x7f080080
+ public const int design_snackbar_elevation = 2131230848;
- // aapt resource value: 0x7F07006A
- public const int design_snackbar_extra_spacing_horizontal = 2131165290;
+ // aapt resource value: 0x7f080064
+ public const int design_snackbar_extra_spacing_horizontal = 2131230820;
- // aapt resource value: 0x7F07006B
- public const int design_snackbar_max_width = 2131165291;
+ // aapt resource value: 0x7f080065
+ public const int design_snackbar_max_width = 2131230821;
- // aapt resource value: 0x7F07006C
- public const int design_snackbar_min_width = 2131165292;
+ // aapt resource value: 0x7f080066
+ public const int design_snackbar_min_width = 2131230822;
- // aapt resource value: 0x7F07006D
- public const int design_snackbar_padding_horizontal = 2131165293;
+ // aapt resource value: 0x7f080081
+ public const int design_snackbar_padding_horizontal = 2131230849;
- // aapt resource value: 0x7F07006E
- public const int design_snackbar_padding_vertical = 2131165294;
+ // aapt resource value: 0x7f080082
+ public const int design_snackbar_padding_vertical = 2131230850;
- // aapt resource value: 0x7F07006F
- public const int design_snackbar_padding_vertical_2lines = 2131165295;
+ // aapt resource value: 0x7f080067
+ public const int design_snackbar_padding_vertical_2lines = 2131230823;
- // aapt resource value: 0x7F070070
- public const int design_snackbar_text_size = 2131165296;
+ // aapt resource value: 0x7f080083
+ public const int design_snackbar_text_size = 2131230851;
- // aapt resource value: 0x7F070071
- public const int design_tab_max_width = 2131165297;
+ // aapt resource value: 0x7f080084
+ public const int design_tab_max_width = 2131230852;
- // aapt resource value: 0x7F070072
- public const int design_tab_scrollable_min_width = 2131165298;
+ // aapt resource value: 0x7f080068
+ public const int design_tab_scrollable_min_width = 2131230824;
- // aapt resource value: 0x7F070073
- public const int design_tab_text_size = 2131165299;
+ // aapt resource value: 0x7f080085
+ public const int design_tab_text_size = 2131230853;
- // aapt resource value: 0x7F070074
- public const int design_tab_text_size_2line = 2131165300;
+ // aapt resource value: 0x7f080086
+ public const int design_tab_text_size_2line = 2131230854;
- // aapt resource value: 0x7F070075
- public const int disabled_alpha_material_dark = 2131165301;
+ // aapt resource value: 0x7f080050
+ public const int disabled_alpha_material_dark = 2131230800;
- // aapt resource value: 0x7F070076
- public const int disabled_alpha_material_light = 2131165302;
+ // aapt resource value: 0x7f080051
+ public const int disabled_alpha_material_light = 2131230801;
- // aapt resource value: 0x7F070077
- public const int fastscroll_default_thickness = 2131165303;
+ // aapt resource value: 0x7f080000
+ public const int fastscroll_default_thickness = 2131230720;
- // aapt resource value: 0x7F070078
- public const int fastscroll_margin = 2131165304;
+ // aapt resource value: 0x7f080001
+ public const int fastscroll_margin = 2131230721;
- // aapt resource value: 0x7F070079
- public const int fastscroll_minimum_range = 2131165305;
+ // aapt resource value: 0x7f080002
+ public const int fastscroll_minimum_range = 2131230722;
- // aapt resource value: 0x7F07007A
- public const int fingerprint_icon_size = 2131165306;
+ // aapt resource value: 0x7f08009c
+ public const int fingerprint_icon_size = 2131230876;
- // aapt resource value: 0x7F07007B
- public const int fingerprint_status_layout_margin_vertical = 2131165307;
+ // aapt resource value: 0x7f08009b
+ public const int fingerprint_status_layout_margin_vertical = 2131230875;
- // aapt resource value: 0x7F07007C
- public const int highlight_alpha_material_colored = 2131165308;
+ // aapt resource value: 0x7f080052
+ public const int highlight_alpha_material_colored = 2131230802;
- // aapt resource value: 0x7F07007D
- public const int highlight_alpha_material_dark = 2131165309;
+ // aapt resource value: 0x7f080053
+ public const int highlight_alpha_material_dark = 2131230803;
- // aapt resource value: 0x7F07007E
- public const int highlight_alpha_material_light = 2131165310;
+ // aapt resource value: 0x7f080054
+ public const int highlight_alpha_material_light = 2131230804;
- // aapt resource value: 0x7F07007F
- public const int hint_alpha_material_dark = 2131165311;
+ // aapt resource value: 0x7f080055
+ public const int hint_alpha_material_dark = 2131230805;
- // aapt resource value: 0x7F070080
- public const int hint_alpha_material_light = 2131165312;
+ // aapt resource value: 0x7f080056
+ public const int hint_alpha_material_light = 2131230806;
- // aapt resource value: 0x7F070081
- public const int hint_pressed_alpha_material_dark = 2131165313;
+ // aapt resource value: 0x7f080057
+ public const int hint_pressed_alpha_material_dark = 2131230807;
- // aapt resource value: 0x7F070082
- public const int hint_pressed_alpha_material_light = 2131165314;
+ // aapt resource value: 0x7f080058
+ public const int hint_pressed_alpha_material_light = 2131230808;
- // aapt resource value: 0x7F070083
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
+ // aapt resource value: 0x7f080003
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
- // aapt resource value: 0x7F070084
- public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
+ // aapt resource value: 0x7f080004
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
- // aapt resource value: 0x7F070085
- public const int item_touch_helper_swipe_escape_velocity = 2131165317;
+ // aapt resource value: 0x7f080005
+ public const int item_touch_helper_swipe_escape_velocity = 2131230725;
- // aapt resource value: 0x7F070086
- public const int notification_action_icon_size = 2131165318;
+ // aapt resource value: 0x7f080090
+ public const int notification_action_icon_size = 2131230864;
- // aapt resource value: 0x7F070087
- public const int notification_action_text_size = 2131165319;
+ // aapt resource value: 0x7f080091
+ public const int notification_action_text_size = 2131230865;
- // aapt resource value: 0x7F070088
- public const int notification_big_circle_margin = 2131165320;
+ // aapt resource value: 0x7f080092
+ public const int notification_big_circle_margin = 2131230866;
- // aapt resource value: 0x7F070089
- public const int notification_content_margin_start = 2131165321;
+ // aapt resource value: 0x7f080088
+ public const int notification_content_margin_start = 2131230856;
- // aapt resource value: 0x7F07008A
- public const int notification_large_icon_height = 2131165322;
+ // aapt resource value: 0x7f080093
+ public const int notification_large_icon_height = 2131230867;
- // aapt resource value: 0x7F07008B
- public const int notification_large_icon_width = 2131165323;
+ // aapt resource value: 0x7f080094
+ public const int notification_large_icon_width = 2131230868;
- // aapt resource value: 0x7F07008C
- public const int notification_main_column_padding_top = 2131165324;
+ // aapt resource value: 0x7f080089
+ public const int notification_main_column_padding_top = 2131230857;
- // aapt resource value: 0x7F07008D
- public const int notification_media_narrow_margin = 2131165325;
+ // aapt resource value: 0x7f08008a
+ public const int notification_media_narrow_margin = 2131230858;
- // aapt resource value: 0x7F07008E
- public const int notification_right_icon_size = 2131165326;
+ // aapt resource value: 0x7f080095
+ public const int notification_right_icon_size = 2131230869;
- // aapt resource value: 0x7F07008F
- public const int notification_right_side_padding_top = 2131165327;
+ // aapt resource value: 0x7f080087
+ public const int notification_right_side_padding_top = 2131230855;
- // aapt resource value: 0x7F070090
- public const int notification_small_icon_background_padding = 2131165328;
+ // aapt resource value: 0x7f080096
+ public const int notification_small_icon_background_padding = 2131230870;
- // aapt resource value: 0x7F070091
- public const int notification_small_icon_size_as_large = 2131165329;
+ // aapt resource value: 0x7f080097
+ public const int notification_small_icon_size_as_large = 2131230871;
- // aapt resource value: 0x7F070092
- public const int notification_subtext_size = 2131165330;
+ // aapt resource value: 0x7f080098
+ public const int notification_subtext_size = 2131230872;
- // aapt resource value: 0x7F070093
- public const int notification_top_pad = 2131165331;
+ // aapt resource value: 0x7f080099
+ public const int notification_top_pad = 2131230873;
- // aapt resource value: 0x7F070094
- public const int notification_top_pad_large_text = 2131165332;
+ // aapt resource value: 0x7f08009a
+ public const int notification_top_pad_large_text = 2131230874;
- // aapt resource value: 0x7F070095
- public const int pickerview_textsize = 2131165333;
+ // aapt resource value: 0x7f08009d
+ public const int pickerview_textsize = 2131230877;
- // aapt resource value: 0x7F070096
- public const int pickerview_topbar_btn_textsize = 2131165334;
+ // aapt resource value: 0x7f08009e
+ public const int pickerview_topbar_btn_textsize = 2131230878;
- // aapt resource value: 0x7F070097
- public const int pickerview_topbar_height = 2131165335;
+ // aapt resource value: 0x7f08009f
+ public const int pickerview_topbar_height = 2131230879;
- // aapt resource value: 0x7F070098
- public const int pickerview_topbar_padding = 2131165336;
+ // aapt resource value: 0x7f0800a0
+ public const int pickerview_topbar_padding = 2131230880;
- // aapt resource value: 0x7F070099
- public const int pickerview_topbar_title_textsize = 2131165337;
+ // aapt resource value: 0x7f0800a1
+ public const int pickerview_topbar_title_textsize = 2131230881;
- // aapt resource value: 0x7F07009A
- public const int tooltip_corner_radius = 2131165338;
+ // aapt resource value: 0x7f080059
+ public const int tooltip_corner_radius = 2131230809;
- // aapt resource value: 0x7F07009B
- public const int tooltip_horizontal_padding = 2131165339;
+ // aapt resource value: 0x7f08005a
+ public const int tooltip_horizontal_padding = 2131230810;
- // aapt resource value: 0x7F07009C
- public const int tooltip_margin = 2131165340;
+ // aapt resource value: 0x7f08005b
+ public const int tooltip_margin = 2131230811;
- // aapt resource value: 0x7F07009D
- public const int tooltip_precise_anchor_extra_offset = 2131165341;
+ // aapt resource value: 0x7f08005c
+ public const int tooltip_precise_anchor_extra_offset = 2131230812;
- // aapt resource value: 0x7F07009E
- public const int tooltip_precise_anchor_threshold = 2131165342;
+ // aapt resource value: 0x7f08005d
+ public const int tooltip_precise_anchor_threshold = 2131230813;
- // aapt resource value: 0x7F07009F
- public const int tooltip_vertical_padding = 2131165343;
+ // aapt resource value: 0x7f08005e
+ public const int tooltip_vertical_padding = 2131230814;
- // aapt resource value: 0x7F0700A0
- public const int tooltip_y_offset_non_touch = 2131165344;
+ // aapt resource value: 0x7f08005f
+ public const int tooltip_y_offset_non_touch = 2131230815;
- // aapt resource value: 0x7F0700A1
- public const int tooltip_y_offset_touch = 2131165345;
+ // aapt resource value: 0x7f080060
+ public const int tooltip_y_offset_touch = 2131230816;
static Dimension()
{
@@ -2549,533 +2549,554 @@
public partial class Drawable
{
- // aapt resource value: 0x7F080007
- public const int abc_ab_share_pack_mtrl_alpha = 2131230727;
+ // aapt resource value: 0x7f020000
+ public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
- // aapt resource value: 0x7F080008
- public const int abc_action_bar_item_background_material = 2131230728;
+ // aapt resource value: 0x7f020001
+ public const int abc_action_bar_item_background_material = 2130837505;
- // aapt resource value: 0x7F080009
- public const int abc_btn_borderless_material = 2131230729;
+ // aapt resource value: 0x7f020002
+ public const int abc_btn_borderless_material = 2130837506;
- // aapt resource value: 0x7F08000A
- public const int abc_btn_check_material = 2131230730;
+ // aapt resource value: 0x7f020003
+ public const int abc_btn_check_material = 2130837507;
- // aapt resource value: 0x7F08000B
- public const int abc_btn_check_to_on_mtrl_000 = 2131230731;
+ // aapt resource value: 0x7f020004
+ public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
- // aapt resource value: 0x7F08000C
- public const int abc_btn_check_to_on_mtrl_015 = 2131230732;
+ // aapt resource value: 0x7f020005
+ public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
- // aapt resource value: 0x7F08000D
- public const int abc_btn_colored_material = 2131230733;
+ // aapt resource value: 0x7f020006
+ public const int abc_btn_colored_material = 2130837510;
- // aapt resource value: 0x7F08000E
- public const int abc_btn_default_mtrl_shape = 2131230734;
+ // aapt resource value: 0x7f020007
+ public const int abc_btn_default_mtrl_shape = 2130837511;
- // aapt resource value: 0x7F08000F
- public const int abc_btn_radio_material = 2131230735;
+ // aapt resource value: 0x7f020008
+ public const int abc_btn_radio_material = 2130837512;
- // aapt resource value: 0x7F080010
- public const int abc_btn_radio_to_on_mtrl_000 = 2131230736;
+ // aapt resource value: 0x7f020009
+ public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
- // aapt resource value: 0x7F080011
- public const int abc_btn_radio_to_on_mtrl_015 = 2131230737;
+ // aapt resource value: 0x7f02000a
+ public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
- // aapt resource value: 0x7F080012
- public const int abc_btn_switch_to_on_mtrl_00001 = 2131230738;
+ // aapt resource value: 0x7f02000b
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
- // aapt resource value: 0x7F080013
- public const int abc_btn_switch_to_on_mtrl_00012 = 2131230739;
+ // aapt resource value: 0x7f02000c
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
- // aapt resource value: 0x7F080014
- public const int abc_cab_background_internal_bg = 2131230740;
+ // aapt resource value: 0x7f02000d
+ public const int abc_cab_background_internal_bg = 2130837517;
- // aapt resource value: 0x7F080015
- public const int abc_cab_background_top_material = 2131230741;
+ // aapt resource value: 0x7f02000e
+ public const int abc_cab_background_top_material = 2130837518;
- // aapt resource value: 0x7F080016
- public const int abc_cab_background_top_mtrl_alpha = 2131230742;
+ // aapt resource value: 0x7f02000f
+ public const int abc_cab_background_top_mtrl_alpha = 2130837519;
- // aapt resource value: 0x7F080017
- public const int abc_control_background_material = 2131230743;
+ // aapt resource value: 0x7f020010
+ public const int abc_control_background_material = 2130837520;
- // aapt resource value: 0x7F080018
- public const int abc_dialog_material_background = 2131230744;
+ // aapt resource value: 0x7f020011
+ public const int abc_dialog_material_background = 2130837521;
- // aapt resource value: 0x7F080019
- public const int abc_edit_text_material = 2131230745;
+ // aapt resource value: 0x7f020012
+ public const int abc_edit_text_material = 2130837522;
- // aapt resource value: 0x7F08001A
- public const int abc_ic_ab_back_material = 2131230746;
+ // aapt resource value: 0x7f020013
+ public const int abc_ic_ab_back_material = 2130837523;
- // aapt resource value: 0x7F08001B
- public const int abc_ic_arrow_drop_right_black_24dp = 2131230747;
+ // aapt resource value: 0x7f020014
+ public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
- // aapt resource value: 0x7F08001C
- public const int abc_ic_clear_material = 2131230748;
+ // aapt resource value: 0x7f020015
+ public const int abc_ic_clear_material = 2130837525;
- // aapt resource value: 0x7F08001D
- public const int abc_ic_commit_search_api_mtrl_alpha = 2131230749;
+ // aapt resource value: 0x7f020016
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
- // aapt resource value: 0x7F08001E
- public const int abc_ic_go_search_api_material = 2131230750;
+ // aapt resource value: 0x7f020017
+ public const int abc_ic_go_search_api_material = 2130837527;
- // aapt resource value: 0x7F08001F
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230751;
+ // aapt resource value: 0x7f020018
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
- // aapt resource value: 0x7F080020
- public const int abc_ic_menu_cut_mtrl_alpha = 2131230752;
+ // aapt resource value: 0x7f020019
+ public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
- // aapt resource value: 0x7F080021
- public const int abc_ic_menu_overflow_material = 2131230753;
+ // aapt resource value: 0x7f02001a
+ public const int abc_ic_menu_overflow_material = 2130837530;
- // aapt resource value: 0x7F080022
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230754;
+ // aapt resource value: 0x7f02001b
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
- // aapt resource value: 0x7F080023
- public const int abc_ic_menu_selectall_mtrl_alpha = 2131230755;
+ // aapt resource value: 0x7f02001c
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
- // aapt resource value: 0x7F080024
- public const int abc_ic_menu_share_mtrl_alpha = 2131230756;
+ // aapt resource value: 0x7f02001d
+ public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
- // aapt resource value: 0x7F080025
- public const int abc_ic_search_api_material = 2131230757;
+ // aapt resource value: 0x7f02001e
+ public const int abc_ic_search_api_material = 2130837534;
- // aapt resource value: 0x7F080026
- public const int abc_ic_star_black_16dp = 2131230758;
+ // aapt resource value: 0x7f02001f
+ public const int abc_ic_star_black_16dp = 2130837535;
- // aapt resource value: 0x7F080027
- public const int abc_ic_star_black_36dp = 2131230759;
+ // aapt resource value: 0x7f020020
+ public const int abc_ic_star_black_36dp = 2130837536;
- // aapt resource value: 0x7F080028
- public const int abc_ic_star_black_48dp = 2131230760;
+ // aapt resource value: 0x7f020021
+ public const int abc_ic_star_black_48dp = 2130837537;
- // aapt resource value: 0x7F080029
- public const int abc_ic_star_half_black_16dp = 2131230761;
+ // aapt resource value: 0x7f020022
+ public const int abc_ic_star_half_black_16dp = 2130837538;
- // aapt resource value: 0x7F08002A
- public const int abc_ic_star_half_black_36dp = 2131230762;
+ // aapt resource value: 0x7f020023
+ public const int abc_ic_star_half_black_36dp = 2130837539;
- // aapt resource value: 0x7F08002B
- public const int abc_ic_star_half_black_48dp = 2131230763;
+ // aapt resource value: 0x7f020024
+ public const int abc_ic_star_half_black_48dp = 2130837540;
- // aapt resource value: 0x7F08002C
- public const int abc_ic_voice_search_api_material = 2131230764;
+ // aapt resource value: 0x7f020025
+ public const int abc_ic_voice_search_api_material = 2130837541;
- // aapt resource value: 0x7F08002D
- public const int abc_item_background_holo_dark = 2131230765;
+ // aapt resource value: 0x7f020026
+ public const int abc_item_background_holo_dark = 2130837542;
- // aapt resource value: 0x7F08002E
- public const int abc_item_background_holo_light = 2131230766;
+ // aapt resource value: 0x7f020027
+ public const int abc_item_background_holo_light = 2130837543;
- // aapt resource value: 0x7F08002F
- public const int abc_list_divider_mtrl_alpha = 2131230767;
+ // aapt resource value: 0x7f020028
+ public const int abc_list_divider_mtrl_alpha = 2130837544;
- // aapt resource value: 0x7F080030
- public const int abc_list_focused_holo = 2131230768;
+ // aapt resource value: 0x7f020029
+ public const int abc_list_focused_holo = 2130837545;
- // aapt resource value: 0x7F080031
- public const int abc_list_longpressed_holo = 2131230769;
+ // aapt resource value: 0x7f02002a
+ public const int abc_list_longpressed_holo = 2130837546;
- // aapt resource value: 0x7F080032
- public const int abc_list_pressed_holo_dark = 2131230770;
+ // aapt resource value: 0x7f02002b
+ public const int abc_list_pressed_holo_dark = 2130837547;
- // aapt resource value: 0x7F080033
- public const int abc_list_pressed_holo_light = 2131230771;
+ // aapt resource value: 0x7f02002c
+ public const int abc_list_pressed_holo_light = 2130837548;
- // aapt resource value: 0x7F080034
- public const int abc_list_selector_background_transition_holo_dark = 2131230772;
+ // aapt resource value: 0x7f02002d
+ public const int abc_list_selector_background_transition_holo_dark = 2130837549;
- // aapt resource value: 0x7F080035
- public const int abc_list_selector_background_transition_holo_light = 2131230773;
+ // aapt resource value: 0x7f02002e
+ public const int abc_list_selector_background_transition_holo_light = 2130837550;
- // aapt resource value: 0x7F080036
- public const int abc_list_selector_disabled_holo_dark = 2131230774;
+ // aapt resource value: 0x7f02002f
+ public const int abc_list_selector_disabled_holo_dark = 2130837551;
- // aapt resource value: 0x7F080037
- public const int abc_list_selector_disabled_holo_light = 2131230775;
+ // aapt resource value: 0x7f020030
+ public const int abc_list_selector_disabled_holo_light = 2130837552;
- // aapt resource value: 0x7F080038
- public const int abc_list_selector_holo_dark = 2131230776;
+ // aapt resource value: 0x7f020031
+ public const int abc_list_selector_holo_dark = 2130837553;
- // aapt resource value: 0x7F080039
- public const int abc_list_selector_holo_light = 2131230777;
+ // aapt resource value: 0x7f020032
+ public const int abc_list_selector_holo_light = 2130837554;
- // aapt resource value: 0x7F08003A
- public const int abc_menu_hardkey_panel_mtrl_mult = 2131230778;
+ // aapt resource value: 0x7f020033
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
- // aapt resource value: 0x7F08003B
- public const int abc_popup_background_mtrl_mult = 2131230779;
+ // aapt resource value: 0x7f020034
+ public const int abc_popup_background_mtrl_mult = 2130837556;
- // aapt resource value: 0x7F08003C
- public const int abc_ratingbar_indicator_material = 2131230780;
+ // aapt resource value: 0x7f020035
+ public const int abc_ratingbar_indicator_material = 2130837557;
- // aapt resource value: 0x7F08003D
- public const int abc_ratingbar_material = 2131230781;
+ // aapt resource value: 0x7f020036
+ public const int abc_ratingbar_material = 2130837558;
- // aapt resource value: 0x7F08003E
- public const int abc_ratingbar_small_material = 2131230782;
+ // aapt resource value: 0x7f020037
+ public const int abc_ratingbar_small_material = 2130837559;
- // aapt resource value: 0x7F08003F
- public const int abc_scrubber_control_off_mtrl_alpha = 2131230783;
+ // aapt resource value: 0x7f020038
+ public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
- // aapt resource value: 0x7F080040
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230784;
+ // aapt resource value: 0x7f020039
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
- // aapt resource value: 0x7F080041
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230785;
+ // aapt resource value: 0x7f02003a
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
- // aapt resource value: 0x7F080042
- public const int abc_scrubber_primary_mtrl_alpha = 2131230786;
+ // aapt resource value: 0x7f02003b
+ public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
- // aapt resource value: 0x7F080043
- public const int abc_scrubber_track_mtrl_alpha = 2131230787;
+ // aapt resource value: 0x7f02003c
+ public const int abc_scrubber_track_mtrl_alpha = 2130837564;
- // aapt resource value: 0x7F080044
- public const int abc_seekbar_thumb_material = 2131230788;
+ // aapt resource value: 0x7f02003d
+ public const int abc_seekbar_thumb_material = 2130837565;
- // aapt resource value: 0x7F080045
- public const int abc_seekbar_tick_mark_material = 2131230789;
+ // aapt resource value: 0x7f02003e
+ public const int abc_seekbar_tick_mark_material = 2130837566;
- // aapt resource value: 0x7F080046
- public const int abc_seekbar_track_material = 2131230790;
+ // aapt resource value: 0x7f02003f
+ public const int abc_seekbar_track_material = 2130837567;
- // aapt resource value: 0x7F080047
- public const int abc_spinner_mtrl_am_alpha = 2131230791;
+ // aapt resource value: 0x7f020040
+ public const int abc_spinner_mtrl_am_alpha = 2130837568;
- // aapt resource value: 0x7F080048
- public const int abc_spinner_textfield_background_material = 2131230792;
+ // aapt resource value: 0x7f020041
+ public const int abc_spinner_textfield_background_material = 2130837569;
- // aapt resource value: 0x7F080049
- public const int abc_switch_thumb_material = 2131230793;
+ // aapt resource value: 0x7f020042
+ public const int abc_switch_thumb_material = 2130837570;
- // aapt resource value: 0x7F08004A
- public const int abc_switch_track_mtrl_alpha = 2131230794;
+ // aapt resource value: 0x7f020043
+ public const int abc_switch_track_mtrl_alpha = 2130837571;
- // aapt resource value: 0x7F08004B
- public const int abc_tab_indicator_material = 2131230795;
+ // aapt resource value: 0x7f020044
+ public const int abc_tab_indicator_material = 2130837572;
- // aapt resource value: 0x7F08004C
- public const int abc_tab_indicator_mtrl_alpha = 2131230796;
+ // aapt resource value: 0x7f020045
+ public const int abc_tab_indicator_mtrl_alpha = 2130837573;
- // aapt resource value: 0x7F080054
- public const int abc_textfield_activated_mtrl_alpha = 2131230804;
+ // aapt resource value: 0x7f020046
+ public const int abc_text_cursor_material = 2130837574;
- // aapt resource value: 0x7F080055
- public const int abc_textfield_default_mtrl_alpha = 2131230805;
+ // aapt resource value: 0x7f020047
+ public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
- // aapt resource value: 0x7F080056
- public const int abc_textfield_search_activated_mtrl_alpha = 2131230806;
+ // aapt resource value: 0x7f020048
+ public const int abc_text_select_handle_left_mtrl_light = 2130837576;
- // aapt resource value: 0x7F080057
- public const int abc_textfield_search_default_mtrl_alpha = 2131230807;
+ // aapt resource value: 0x7f020049
+ public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
- // aapt resource value: 0x7F080058
- public const int abc_textfield_search_material = 2131230808;
+ // aapt resource value: 0x7f02004a
+ public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
- // aapt resource value: 0x7F08004D
- public const int abc_text_cursor_material = 2131230797;
+ // aapt resource value: 0x7f02004b
+ public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
- // aapt resource value: 0x7F08004E
- public const int abc_text_select_handle_left_mtrl_dark = 2131230798;
+ // aapt resource value: 0x7f02004c
+ public const int abc_text_select_handle_right_mtrl_light = 2130837580;
- // aapt resource value: 0x7F08004F
- public const int abc_text_select_handle_left_mtrl_light = 2131230799;
+ // aapt resource value: 0x7f02004d
+ public const int abc_textfield_activated_mtrl_alpha = 2130837581;
- // aapt resource value: 0x7F080050
- public const int abc_text_select_handle_middle_mtrl_dark = 2131230800;
+ // aapt resource value: 0x7f02004e
+ public const int abc_textfield_default_mtrl_alpha = 2130837582;
- // aapt resource value: 0x7F080051
- public const int abc_text_select_handle_middle_mtrl_light = 2131230801;
+ // aapt resource value: 0x7f02004f
+ public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
- // aapt resource value: 0x7F080052
- public const int abc_text_select_handle_right_mtrl_dark = 2131230802;
+ // aapt resource value: 0x7f020050
+ public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
- // aapt resource value: 0x7F080053
- public const int abc_text_select_handle_right_mtrl_light = 2131230803;
+ // aapt resource value: 0x7f020051
+ public const int abc_textfield_search_material = 2130837585;
- // aapt resource value: 0x7F080059
- public const int abc_vector_test = 2131230809;
+ // aapt resource value: 0x7f020052
+ public const int abc_vector_test = 2130837586;
- // aapt resource value: 0x7F08005A
- public const int avd_hide_password = 2131230810;
+ // aapt resource value: 0x7f020053
+ public const int avd_hide_password = 2130837587;
- // aapt resource value: 0x7F08005B
- public const int avd_show_password = 2131230811;
+ // aapt resource value: 0x7f0200b0
+ public const int avd_hide_password_1 = 2130837680;
- // aapt resource value: 0x7F08005C
- public const int back = 2131230812;
+ // aapt resource value: 0x7f0200b1
+ public const int avd_hide_password_2 = 2130837681;
+
+ // aapt resource value: 0x7f0200b2
+ public const int avd_hide_password_3 = 2130837682;
+
+ // aapt resource value: 0x7f020054
+ public const int avd_show_password = 2130837588;
+
+ // aapt resource value: 0x7f0200b3
+ public const int avd_show_password_1 = 2130837683;
+
+ // aapt resource value: 0x7f0200b4
+ public const int avd_show_password_2 = 2130837684;
+
+ // aapt resource value: 0x7f0200b5
+ public const int avd_show_password_3 = 2130837685;
+
+ // aapt resource value: 0x7f020055
+ public const int back = 2130837589;
+
+ // aapt resource value: 0x7f020056
+ public const int call = 2130837590;
- // aapt resource value: 0x7F08005D
- public const int call = 2131230813;
+ // aapt resource value: 0x7f020057
+ public const int design_bottom_navigation_item_background = 2130837591;
- // aapt resource value: 0x7F08005E
- public const int design_bottom_navigation_item_background = 2131230814;
+ // aapt resource value: 0x7f020058
+ public const int design_fab_background = 2130837592;
- // aapt resource value: 0x7F08005F
- public const int design_fab_background = 2131230815;
+ // aapt resource value: 0x7f020059
+ public const int design_ic_visibility = 2130837593;
- // aapt resource value: 0x7F080060
- public const int design_ic_visibility = 2131230816;
+ // aapt resource value: 0x7f02005a
+ public const int design_ic_visibility_off = 2130837594;
- // aapt resource value: 0x7F080061
- public const int design_ic_visibility_off = 2131230817;
+ // aapt resource value: 0x7f02005b
+ public const int design_password_eye = 2130837595;
- // aapt resource value: 0x7F080062
- public const int design_password_eye = 2131230818;
+ // aapt resource value: 0x7f02005c
+ public const int design_snackbar_background = 2130837596;
- // aapt resource value: 0x7F080063
- public const int design_snackbar_background = 2131230819;
+ // aapt resource value: 0x7f02005d
+ public const int dialog_background = 2130837597;
- // aapt resource value: 0x7F080064
- public const int dialog_background = 2131230820;
+ // aapt resource value: 0x7f02005e
+ public const int fingerprint_draw_off = 2130837598;
- // aapt resource value: 0x7F080065
- public const int fingerprint_draw_off = 2131230821;
+ // aapt resource value: 0x7f02005f
+ public const int fingerprint_draw_off_animation = 2130837599;
- // aapt resource value: 0x7F080066
- public const int fingerprint_draw_off_animation = 2131230822;
+ // aapt resource value: 0x7f020060
+ public const int fingerprint_draw_on = 2130837600;
- // aapt resource value: 0x7F080067
- public const int fingerprint_draw_on = 2131230823;
+ // aapt resource value: 0x7f020061
+ public const int fingerprint_draw_on_animation = 2130837601;
- // aapt resource value: 0x7F080068
- public const int fingerprint_draw_on_animation = 2131230824;
+ // aapt resource value: 0x7f020062
+ public const int fingerprint_error = 2130837602;
- // aapt resource value: 0x7F080069
- public const int fingerprint_error = 2131230825;
+ // aapt resource value: 0x7f020063
+ public const int fingerprint_error_off = 2130837603;
- // aapt resource value: 0x7F08006A
- public const int fingerprint_error_off = 2131230826;
+ // aapt resource value: 0x7f020064
+ public const int fingerprint_error_off_animation = 2130837604;
- // aapt resource value: 0x7F08006B
- public const int fingerprint_error_off_animation = 2131230827;
+ // aapt resource value: 0x7f020065
+ public const int fingerprint_error_on = 2130837605;
- // aapt resource value: 0x7F08006C
- public const int fingerprint_error_on = 2131230828;
+ // aapt resource value: 0x7f020066
+ public const int fingerprint_error_on_animation = 2130837606;
- // aapt resource value: 0x7F08006D
- public const int fingerprint_error_on_animation = 2131230829;
+ // aapt resource value: 0x7f020067
+ public const int fingerprint_error_state_to_fp = 2130837607;
- // aapt resource value: 0x7F08006E
- public const int fingerprint_error_state_to_fp = 2131230830;
+ // aapt resource value: 0x7f020068
+ public const int fingerprint_error_state_to_fp_animation = 2130837608;
- // aapt resource value: 0x7F08006F
- public const int fingerprint_error_state_to_fp_animation = 2131230831;
+ // aapt resource value: 0x7f020069
+ public const int fingerprint_fingerprint = 2130837609;
- // aapt resource value: 0x7F080070
- public const int fingerprint_fingerprint = 2131230832;
+ // aapt resource value: 0x7f02006a
+ public const int fingerprint_fp_to_error_state = 2130837610;
- // aapt resource value: 0x7F080071
- public const int fingerprint_fp_to_error_state = 2131230833;
+ // aapt resource value: 0x7f02006b
+ public const int fingerprint_fp_to_error_state_animation = 2130837611;
- // aapt resource value: 0x7F080072
- public const int fingerprint_fp_to_error_state_animation = 2131230834;
+ // aapt resource value: 0x7f02006c
+ public const int floor = 2130837612;
- // aapt resource value: 0x7F080073
- public const int floor = 2131230835;
+ // aapt resource value: 0x7f02006d
+ public const int gd_btn_shape_app_b = 2130837613;
- // aapt resource value: 0x7F080074
- public const int gd_btn_shape_app_b = 2131230836;
+ // aapt resource value: 0x7f02006e
+ public const int gd_btn_shape_app_g = 2130837614;
- // aapt resource value: 0x7F080075
- public const int gd_btn_shape_app_g = 2131230837;
+ // aapt resource value: 0x7f02006f
+ public const int gd_btn_shape_app_w = 2130837615;
- // aapt resource value: 0x7F080076
- public const int gd_btn_shape_app_w = 2131230838;
+ // aapt resource value: 0x7f020070
+ public const int gd_btn_shape_shadow_w = 2130837616;
- // aapt resource value: 0x7F080077
- public const int gd_btn_shape_shadow_w = 2131230839;
+ // aapt resource value: 0x7f020071
+ public const int gd_click_effect_select = 2130837617;
- // aapt resource value: 0x7F080078
- public const int gd_click_effect_select = 2131230840;
+ // aapt resource value: 0x7f020072
+ public const int hangup = 2130837618;
- // aapt resource value: 0x7F080079
- public const int hangup = 2131230841;
+ // aapt resource value: 0x7f020073
+ public const int ic_gdmap_add = 2130837619;
- // aapt resource value: 0x7F08009A
- public const int Icon = 2131230874;
+ // aapt resource value: 0x7f020074
+ public const int ic_gdmap_back = 2130837620;
- // aapt resource value: 0x7F08007A
- public const int ic_gdmap_add = 2131230842;
+ // aapt resource value: 0x7f020075
+ public const int ic_gdmap_delete = 2130837621;
- // aapt resource value: 0x7F08007B
- public const int ic_gdmap_back = 2131230843;
+ // aapt resource value: 0x7f020076
+ public const int ic_gdmap_home = 2130837622;
- // aapt resource value: 0x7F08007C
- public const int ic_gdmap_delete = 2131230844;
+ // aapt resource value: 0x7f020077
+ public const int ic_gdmap_mylocation = 2130837623;
- // aapt resource value: 0x7F08007D
- public const int ic_gdmap_home = 2131230845;
+ // aapt resource value: 0x7f020078
+ public const int ic_gdmap_now = 2130837624;
- // aapt resource value: 0x7F08007E
- public const int ic_gdmap_mylocation = 2131230846;
+ // aapt resource value: 0x7f020079
+ public const int ic_gdmap_search = 2130837625;
- // aapt resource value: 0x7F08007F
- public const int ic_gdmap_now = 2131230847;
+ // aapt resource value: 0x7f02007a
+ public const int ic_gdmap_zoom_out = 2130837626;
- // aapt resource value: 0x7F080080
- public const int ic_gdmap_search = 2131230848;
+ // aapt resource value: 0x7f02007b
+ public const int ic_gps_point = 2130837627;
- // aapt resource value: 0x7F080081
- public const int ic_gdmap_zoom_out = 2131230849;
+ // aapt resource value: 0x7f02007c
+ public const int ic_launcher_background = 2130837628;
- // aapt resource value: 0x7F080082
- public const int ic_gps_point = 2131230850;
+ // aapt resource value: 0x7f02007d
+ public const int ic_launcher_foreground = 2130837629;
- // aapt resource value: 0x7F080083
- public const int ic_launcher_background = 2131230851;
+ // aapt resource value: 0x7f0200b6
+ public const int ic_launcher_foreground_1 = 2130837686;
- // aapt resource value: 0x7F080084
- public const int ic_launcher_foreground = 2131230852;
+ // aapt resource value: 0x7f02007e
+ public const int ic_wd_arc_scale_bg = 2130837630;
- // aapt resource value: 0x7F080085
- public const int ic_wd_arc_scale_bg = 2131230853;
+ // aapt resource value: 0x7f02007f
+ public const int ic_wd_curtain_bg_top = 2130837631;
- // aapt resource value: 0x7F080086
- public const int ic_wd_curtain_bg_top = 2131230854;
+ // aapt resource value: 0x7f020080
+ public const int ic_wd_curtain_h_bg = 2130837632;
- // aapt resource value: 0x7F080087
- public const int ic_wd_curtain_h_bg = 2131230855;
+ // aapt resource value: 0x7f020081
+ public const int ic_wd_curtain_h_open = 2130837633;
- // aapt resource value: 0x7F080088
- public const int ic_wd_curtain_h_open = 2131230856;
+ // aapt resource value: 0x7f020082
+ public const int ic_wd_curtain_h_progress = 2130837634;
- // aapt resource value: 0x7F080089
- public const int ic_wd_curtain_h_progress = 2131230857;
+ // aapt resource value: 0x7f020083
+ public const int ic_wd_curtain_h_top = 2130837635;
- // aapt resource value: 0x7F08008A
- public const int ic_wd_curtain_h_top = 2131230858;
+ // aapt resource value: 0x7f020084
+ public const int ic_wd_curtain_open = 2130837636;
- // aapt resource value: 0x7F08008B
- public const int ic_wd_curtain_open = 2131230859;
+ // aapt resource value: 0x7f020085
+ public const int ic_wd_curtain_roll_bg = 2130837637;
- // aapt resource value: 0x7F08008C
- public const int ic_wd_curtain_roll_bg = 2131230860;
+ // aapt resource value: 0x7f020086
+ public const int ic_wd_curtain_roll_progress = 2130837638;
- // aapt resource value: 0x7F08008D
- public const int ic_wd_curtain_roll_progress = 2131230861;
+ // aapt resource value: 0x7f020087
+ public const int ic_wd_on_curtain_blinds_progress = 2130837639;
- // aapt resource value: 0x7F08008E
- public const int ic_wd_on_curtain_blinds_progress = 2131230862;
+ // aapt resource value: 0x7f020088
+ public const int ic_wd_on_curtain_blinds_progress2 = 2130837640;
- // aapt resource value: 0x7F08008F
- public const int ic_wd_on_curtain_blinds_progress2 = 2131230863;
+ // aapt resource value: 0x7f020089
+ public const int ic_wd_on_curtain_blinds_progress_close = 2130837641;
- // aapt resource value: 0x7F080090
- public const int ic_wd_on_curtain_blinds_progress_close = 2131230864;
+ // aapt resource value: 0x7f02008a
+ public const int ic_wd_on_curtain_blinds_progress_close2 = 2130837642;
- // aapt resource value: 0x7F080091
- public const int ic_wd_on_curtain_blinds_progress_close2 = 2131230865;
+ // aapt resource value: 0x7f02008b
+ public const int ic_wd_on_curtain_h_bg = 2130837643;
- // aapt resource value: 0x7F080092
- public const int ic_wd_on_curtain_h_bg = 2131230866;
+ // aapt resource value: 0x7f02008c
+ public const int ic_wd_on_curtain_h_open = 2130837644;
- // aapt resource value: 0x7F080093
- public const int ic_wd_on_curtain_h_open = 2131230867;
+ // aapt resource value: 0x7f02008d
+ public const int ic_wd_on_curtain_h_progress = 2130837645;
- // aapt resource value: 0x7F080094
- public const int ic_wd_on_curtain_h_progress = 2131230868;
+ // aapt resource value: 0x7f02008e
+ public const int ic_wd_on_curtain_h_progress_close = 2130837646;
- // aapt resource value: 0x7F080095
- public const int ic_wd_on_curtain_h_progress_close = 2131230869;
+ // aapt resource value: 0x7f02008f
+ public const int ic_wd_on_curtain_open = 2130837647;
- // aapt resource value: 0x7F080096
- public const int ic_wd_on_curtain_open = 2131230870;
+ // aapt resource value: 0x7f020090
+ public const int ic_wd_on_curtain_roll_bg = 2130837648;
- // aapt resource value: 0x7F080097
- public const int ic_wd_on_curtain_roll_bg = 2131230871;
+ // aapt resource value: 0x7f020091
+ public const int ic_wd_on_curtain_roll_progress = 2130837649;
- // aapt resource value: 0x7F080098
- public const int ic_wd_on_curtain_roll_progress = 2131230872;
+ // aapt resource value: 0x7f020092
+ public const int ic_wd_on_curtain_roll_progress_close = 2130837650;
- // aapt resource value: 0x7F080099
- public const int ic_wd_on_curtain_roll_progress_close = 2131230873;
+ // aapt resource value: 0x7f020093
+ public const int Icon = 2130837651;
- // aapt resource value: 0x7F08009B
- public const int Loading = 2131230875;
+ // aapt resource value: 0x7f020094
+ public const int Loading = 2130837652;
- // aapt resource value: 0x7F08009C
- public const int navigation_empty_icon = 2131230876;
+ // aapt resource value: 0x7f020095
+ public const int navigation_empty_icon = 2130837653;
- // aapt resource value: 0x7F08009D
- public const int notification_action_background = 2131230877;
+ // aapt resource value: 0x7f020096
+ public const int notification_action_background = 2130837654;
- // aapt resource value: 0x7F08009E
- public const int notification_bg = 2131230878;
+ // aapt resource value: 0x7f020097
+ public const int notification_bg = 2130837655;
- // aapt resource value: 0x7F08009F
- public const int notification_bg_low = 2131230879;
+ // aapt resource value: 0x7f020098
+ public const int notification_bg_low = 2130837656;
- // aapt resource value: 0x7F0800A0
- public const int notification_bg_low_normal = 2131230880;
+ // aapt resource value: 0x7f020099
+ public const int notification_bg_low_normal = 2130837657;
- // aapt resource value: 0x7F0800A1
- public const int notification_bg_low_pressed = 2131230881;
+ // aapt resource value: 0x7f02009a
+ public const int notification_bg_low_pressed = 2130837658;
- // aapt resource value: 0x7F0800A2
- public const int notification_bg_normal = 2131230882;
+ // aapt resource value: 0x7f02009b
+ public const int notification_bg_normal = 2130837659;
- // aapt resource value: 0x7F0800A3
- public const int notification_bg_normal_pressed = 2131230883;
+ // aapt resource value: 0x7f02009c
+ public const int notification_bg_normal_pressed = 2130837660;
- // aapt resource value: 0x7F0800A4
- public const int notification_icon_background = 2131230884;
+ // aapt resource value: 0x7f02009d
+ public const int notification_icon_background = 2130837661;
- // aapt resource value: 0x7F0800A5
- public const int notification_template_icon_bg = 2131230885;
+ // aapt resource value: 0x7f0200ae
+ public const int notification_template_icon_bg = 2130837678;
- // aapt resource value: 0x7F0800A6
- public const int notification_template_icon_low_bg = 2131230886;
+ // aapt resource value: 0x7f0200af
+ public const int notification_template_icon_low_bg = 2130837679;
- // aapt resource value: 0x7F0800A7
- public const int notification_tile_bg = 2131230887;
+ // aapt resource value: 0x7f02009e
+ public const int notification_tile_bg = 2130837662;
- // aapt resource value: 0x7F0800A8
- public const int notify_panel_notification_icon_bg = 2131230888;
+ // aapt resource value: 0x7f02009f
+ public const int notify_panel_notification_icon_bg = 2130837663;
- // aapt resource value: 0x7F0800A9
- public const int screenshot = 2131230889;
+ // aapt resource value: 0x7f0200a0
+ public const int screenshot = 2130837664;
- // aapt resource value: 0x7F0800AA
- public const int screenshot_def = 2131230890;
+ // aapt resource value: 0x7f0200a1
+ public const int screenshot_def = 2130837665;
- // aapt resource value: 0x7F0800AB
- public const int screenshot_sel = 2131230891;
+ // aapt resource value: 0x7f0200a2
+ public const int screenshot_sel = 2130837666;
- // aapt resource value: 0x7F0800AC
- public const int selector_pickerview_btn = 2131230892;
+ // aapt resource value: 0x7f0200a3
+ public const int selector_pickerview_btn = 2130837667;
- // aapt resource value: 0x7F0800AD
- public const int sure_background_def = 2131230893;
+ // aapt resource value: 0x7f0200a4
+ public const int sure_background_def = 2130837668;
- // aapt resource value: 0x7F0800AE
- public const int sure_background_sel = 2131230894;
+ // aapt resource value: 0x7f0200a5
+ public const int sure_background_sel = 2130837669;
- // aapt resource value: 0x7F0800AF
- public const int tip_background = 2131230895;
+ // aapt resource value: 0x7f0200a6
+ public const int tip_background = 2130837670;
- // aapt resource value: 0x7F0800B0
- public const int tooltip_frame_dark = 2131230896;
+ // aapt resource value: 0x7f0200a7
+ public const int tooltip_frame_dark = 2130837671;
- // aapt resource value: 0x7F0800B1
- public const int tooltip_frame_light = 2131230897;
+ // aapt resource value: 0x7f0200a8
+ public const int tooltip_frame_light = 2130837672;
- // aapt resource value: 0x7F0800B2
- public const int unlock = 2131230898;
+ // aapt resource value: 0x7f0200a9
+ public const int unlock = 2130837673;
- // aapt resource value: 0x7F0800B3
- public const int unlock_def = 2131230899;
+ // aapt resource value: 0x7f0200aa
+ public const int unlock_def = 2130837674;
- // aapt resource value: 0x7F0800B4
- public const int unlock_disable = 2131230900;
+ // aapt resource value: 0x7f0200ab
+ public const int unlock_disable = 2130837675;
- // aapt resource value: 0x7F0800B5
- public const int unlock_sel = 2131230901;
+ // aapt resource value: 0x7f0200ac
+ public const int unlock_sel = 2130837676;
- // aapt resource value: 0x7F0800B6
- public const int video_background = 2131230902;
+ // aapt resource value: 0x7f0200ad
+ public const int video_background = 2130837677;
static Drawable()
{
@@ -3090,869 +3111,902 @@
public partial class Id
{
- // aapt resource value: 0x7F09000E
- public const int action0 = 2131296270;
+ // aapt resource value: 0x7f090027
+ public const int ALT = 2131296295;
- // aapt resource value: 0x7F090020
- public const int actions = 2131296288;
+ // aapt resource value: 0x7f090028
+ public const int CTRL = 2131296296;
- // aapt resource value: 0x7F09000F
- public const int action_bar = 2131296271;
+ // aapt resource value: 0x7f09008e
+ public const int Custom = 2131296398;
- // aapt resource value: 0x7F090010
- public const int action_bar_activity_content = 2131296272;
+ // aapt resource value: 0x7f09008d
+ public const int CustomLabel = 2131296397;
- // aapt resource value: 0x7F090011
- public const int action_bar_container = 2131296273;
+ // aapt resource value: 0x7f090054
+ public const int FILL = 2131296340;
- // aapt resource value: 0x7F090012
- public const int action_bar_root = 2131296274;
+ // aapt resource value: 0x7f090055
+ public const int FILL_STROKE = 2131296341;
- // aapt resource value: 0x7F090013
- public const int action_bar_spinner = 2131296275;
+ // aapt resource value: 0x7f090029
+ public const int FUNCTION = 2131296297;
- // aapt resource value: 0x7F090014
- public const int action_bar_subtitle = 2131296276;
+ // aapt resource value: 0x7f09004f
+ public const int FixedBehind = 2131296335;
- // aapt resource value: 0x7F090015
- public const int action_bar_title = 2131296277;
+ // aapt resource value: 0x7f090050
+ public const int FixedFront = 2131296336;
- // aapt resource value: 0x7F090016
- public const int action_container = 2131296278;
+ // aapt resource value: 0x7f09002a
+ public const int META = 2131296298;
- // aapt resource value: 0x7F090017
- public const int action_context_bar = 2131296279;
+ // aapt resource value: 0x7f090051
+ public const int MatchLayout = 2131296337;
- // aapt resource value: 0x7F090018
- public const int action_divider = 2131296280;
+ // aapt resource value: 0x7f090088
+ public const int Notice = 2131296392;
- // aapt resource value: 0x7F090019
- public const int action_image = 2131296281;
+ // aapt resource value: 0x7f09008c
+ public const int Password = 2131296396;
- // aapt resource value: 0x7F09001A
- public const int action_menu_divider = 2131296282;
+ // aapt resource value: 0x7f09008b
+ public const int PasswordLabel = 2131296395;
- // aapt resource value: 0x7F09001B
- public const int action_menu_presenter = 2131296283;
+ // aapt resource value: 0x7f09002b
+ public const int SHIFT = 2131296299;
- // aapt resource value: 0x7F09001C
- public const int action_mode_bar = 2131296284;
+ // aapt resource value: 0x7f09008a
+ public const int SSID = 2131296394;
- // aapt resource value: 0x7F09001D
- public const int action_mode_bar_stub = 2131296285;
+ // aapt resource value: 0x7f090089
+ public const int SSIDLabel = 2131296393;
- // aapt resource value: 0x7F09001E
- public const int action_mode_close_button = 2131296286;
+ // aapt resource value: 0x7f090056
+ public const int STROKE = 2131296342;
- // aapt resource value: 0x7F09001F
- public const int action_text = 2131296287;
+ // aapt resource value: 0x7f09002c
+ public const int SYM = 2131296300;
- // aapt resource value: 0x7F090021
- public const int activity_chooser_view_content = 2131296289;
+ // aapt resource value: 0x7f090052
+ public const int Scale = 2131296338;
- // aapt resource value: 0x7F090022
- public const int add = 2131296290;
+ // aapt resource value: 0x7f090053
+ public const int Translate = 2131296339;
- // aapt resource value: 0x7F090023
- public const int alertTitle = 2131296291;
+ // aapt resource value: 0x7f0900e5
+ public const int action0 = 2131296485;
- // aapt resource value: 0x7F090024
- public const int all = 2131296292;
+ // aapt resource value: 0x7f090079
+ public const int action_bar = 2131296377;
- // aapt resource value: 0x7F090000
- public const int ALT = 2131296256;
+ // aapt resource value: 0x7f090001
+ public const int action_bar_activity_content = 2131296257;
- // aapt resource value: 0x7F090025
- public const int always = 2131296293;
+ // aapt resource value: 0x7f090078
+ public const int action_bar_container = 2131296376;
- // aapt resource value: 0x7F090026
- public const int async = 2131296294;
+ // aapt resource value: 0x7f090074
+ public const int action_bar_root = 2131296372;
- // aapt resource value: 0x7F090027
- public const int auto = 2131296295;
+ // aapt resource value: 0x7f090002
+ public const int action_bar_spinner = 2131296258;
- // aapt resource value: 0x7F090028
- public const int autoAccept = 2131296296;
+ // aapt resource value: 0x7f090058
+ public const int action_bar_subtitle = 2131296344;
- // aapt resource value: 0x7F090029
- public const int autoTest = 2131296297;
+ // aapt resource value: 0x7f090057
+ public const int action_bar_title = 2131296343;
- // aapt resource value: 0x7F09002A
- public const int beginning = 2131296298;
+ // aapt resource value: 0x7f0900e2
+ public const int action_container = 2131296482;
- // aapt resource value: 0x7F09002B
- public const int blocking = 2131296299;
+ // aapt resource value: 0x7f09007a
+ public const int action_context_bar = 2131296378;
- // aapt resource value: 0x7F09002C
- public const int bottom = 2131296300;
+ // aapt resource value: 0x7f0900e9
+ public const int action_divider = 2131296489;
- // aapt resource value: 0x7F09002D
- public const int btnCancel = 2131296301;
+ // aapt resource value: 0x7f0900e3
+ public const int action_image = 2131296483;
- // aapt resource value: 0x7F09002E
- public const int btnSubmit = 2131296302;
+ // aapt resource value: 0x7f090003
+ public const int action_menu_divider = 2131296259;
- // aapt resource value: 0x7F09002F
- public const int buttonPanel = 2131296303;
+ // aapt resource value: 0x7f090004
+ public const int action_menu_presenter = 2131296260;
- // aapt resource value: 0x7F090030
- public const int call_accept = 2131296304;
+ // aapt resource value: 0x7f090076
+ public const int action_mode_bar = 2131296374;
- // aapt resource value: 0x7F090031
- public const int camera0 = 2131296305;
+ // aapt resource value: 0x7f090075
+ public const int action_mode_bar_stub = 2131296373;
- // aapt resource value: 0x7F090032
- public const int camera1 = 2131296306;
+ // aapt resource value: 0x7f090059
+ public const int action_mode_close_button = 2131296345;
- // aapt resource value: 0x7F090033
- public const int cancel_action = 2131296307;
+ // aapt resource value: 0x7f0900e4
+ public const int action_text = 2131296484;
- // aapt resource value: 0x7F090034
- public const int center = 2131296308;
+ // aapt resource value: 0x7f0900f2
+ public const int actions = 2131296498;
- // aapt resource value: 0x7F090035
- public const int center_horizontal = 2131296309;
+ // aapt resource value: 0x7f09005a
+ public const int activity_chooser_view_content = 2131296346;
- // aapt resource value: 0x7F090036
- public const int center_vertical = 2131296310;
+ // aapt resource value: 0x7f090021
+ public const int add = 2131296289;
- // aapt resource value: 0x7F090037
- public const int checkbox = 2131296311;
+ // aapt resource value: 0x7f09006d
+ public const int alertTitle = 2131296365;
- // aapt resource value: 0x7F090038
- public const int chronometer = 2131296312;
+ // aapt resource value: 0x7f090047
+ public const int all = 2131296327;
- // aapt resource value: 0x7F090039
- public const int clip_horizontal = 2131296313;
+ // aapt resource value: 0x7f09002d
+ public const int always = 2131296301;
- // aapt resource value: 0x7F09003A
- public const int clip_vertical = 2131296314;
+ // aapt resource value: 0x7f09004b
+ public const int async = 2131296331;
- // aapt resource value: 0x7F09003B
- public const int collapseActionView = 2131296315;
+ // aapt resource value: 0x7f090039
+ public const int auto = 2131296313;
- // aapt resource value: 0x7F09003C
- public const int configAVMsg = 2131296316;
+ // aapt resource value: 0x7f0900fb
+ public const int autoAccept = 2131296507;
- // aapt resource value: 0x7F09003D
- public const int container = 2131296317;
+ // aapt resource value: 0x7f0900fc
+ public const int autoTest = 2131296508;
- // aapt resource value: 0x7F09003E
- public const int content = 2131296318;
+ // aapt resource value: 0x7f090024
+ public const int beginning = 2131296292;
- // aapt resource value: 0x7F09003F
- public const int contentPanel = 2131296319;
+ // aapt resource value: 0x7f09004c
+ public const int blocking = 2131296332;
- // aapt resource value: 0x7F090040
- public const int content_container = 2131296320;
+ // aapt resource value: 0x7f090032
+ public const int bottom = 2131296306;
- // aapt resource value: 0x7F090041
- public const int coordinator = 2131296321;
+ // aapt resource value: 0x7f0900cd
+ public const int btnCancel = 2131296461;
- // aapt resource value: 0x7F090001
- public const int CTRL = 2131296257;
+ // aapt resource value: 0x7f0900cf
+ public const int btnSubmit = 2131296463;
- // aapt resource value: 0x7F090042
- public const int custom = 2131296322;
+ // aapt resource value: 0x7f090060
+ public const int buttonPanel = 2131296352;
- // aapt resource value: 0x7F090043
- public const int customPanel = 2131296323;
+ // aapt resource value: 0x7f0900fd
+ public const int call_accept = 2131296509;
- // aapt resource value: 0x7F090044
- public const int day = 2131296324;
+ // aapt resource value: 0x7f090121
+ public const int camera0 = 2131296545;
- // aapt resource value: 0x7F090045
- public const int decor_content_parent = 2131296325;
+ // aapt resource value: 0x7f090122
+ public const int camera1 = 2131296546;
- // aapt resource value: 0x7F090046
- public const int default_activity_button = 2131296326;
+ // aapt resource value: 0x7f0900e6
+ public const int cancel_action = 2131296486;
- // aapt resource value: 0x7F090047
- public const int description = 2131296327;
+ // aapt resource value: 0x7f09003a
+ public const int center = 2131296314;
- // aapt resource value: 0x7F090048
- public const int design_bottom_sheet = 2131296328;
+ // aapt resource value: 0x7f09003b
+ public const int center_horizontal = 2131296315;
- // aapt resource value: 0x7F090049
- public const int design_menu_item_action_area = 2131296329;
+ // aapt resource value: 0x7f09003c
+ public const int center_vertical = 2131296316;
- // aapt resource value: 0x7F09004A
- public const int design_menu_item_action_area_stub = 2131296330;
+ // aapt resource value: 0x7f090070
+ public const int checkbox = 2131296368;
- // aapt resource value: 0x7F09004B
- public const int design_menu_item_text = 2131296331;
+ // aapt resource value: 0x7f0900ee
+ public const int chronometer = 2131296494;
- // aapt resource value: 0x7F09004C
- public const int design_navigation_view = 2131296332;
+ // aapt resource value: 0x7f090043
+ public const int clip_horizontal = 2131296323;
- // aapt resource value: 0x7F09004D
- public const int disableHome = 2131296333;
+ // aapt resource value: 0x7f090044
+ public const int clip_vertical = 2131296324;
- // aapt resource value: 0x7F09004E
- public const int disableReportBytes = 2131296334;
+ // aapt resource value: 0x7f09002e
+ public const int collapseActionView = 2131296302;
- // aapt resource value: 0x7F09004F
- public const int edit_query = 2131296335;
+ // aapt resource value: 0x7f090117
+ public const int configAVMsg = 2131296535;
- // aapt resource value: 0x7F090050
- public const int enableReportBytes = 2131296336;
+ // aapt resource value: 0x7f0900a3
+ public const int container = 2131296419;
- // aapt resource value: 0x7F090051
- public const int end = 2131296337;
+ // aapt resource value: 0x7f09009c
+ public const int content = 2131296412;
- // aapt resource value: 0x7F090052
- public const int end_padder = 2131296338;
+ // aapt resource value: 0x7f090063
+ public const int contentPanel = 2131296355;
- // aapt resource value: 0x7F090053
- public const int enterAlways = 2131296339;
+ // aapt resource value: 0x7f0900d1
+ public const int content_container = 2131296465;
- // aapt resource value: 0x7F090054
- public const int enterAlwaysCollapsed = 2131296340;
+ // aapt resource value: 0x7f0900a4
+ public const int coordinator = 2131296420;
- // aapt resource value: 0x7F090055
- public const int exitUntilCollapsed = 2131296341;
+ // aapt resource value: 0x7f09006a
+ public const int custom = 2131296362;
- // aapt resource value: 0x7F090057
- public const int expanded_menu = 2131296343;
+ // aapt resource value: 0x7f090069
+ public const int customPanel = 2131296361;
- // aapt resource value: 0x7F090056
- public const int expand_activities_button = 2131296342;
+ // aapt resource value: 0x7f0900dd
+ public const int day = 2131296477;
- // aapt resource value: 0x7F090058
- public const int fill = 2131296344;
+ // aapt resource value: 0x7f090077
+ public const int decor_content_parent = 2131296375;
- // aapt resource value: 0x7F090002
- public const int FILL = 2131296258;
+ // aapt resource value: 0x7f09005d
+ public const int default_activity_button = 2131296349;
- // aapt resource value: 0x7F090059
- public const int fill_horizontal = 2131296345;
+ // aapt resource value: 0x7f09009e
+ public const int description = 2131296414;
- // aapt resource value: 0x7F090003
- public const int FILL_STROKE = 2131296259;
+ // aapt resource value: 0x7f0900a6
+ public const int design_bottom_sheet = 2131296422;
- // aapt resource value: 0x7F09005A
- public const int fill_vertical = 2131296346;
+ // aapt resource value: 0x7f0900ad
+ public const int design_menu_item_action_area = 2131296429;
- // aapt resource value: 0x7F09005B
- public const int fingerprint_icon = 2131296347;
+ // aapt resource value: 0x7f0900ac
+ public const int design_menu_item_action_area_stub = 2131296428;
- // aapt resource value: 0x7F09005C
- public const int @fixed = 2131296348;
+ // aapt resource value: 0x7f0900ab
+ public const int design_menu_item_text = 2131296427;
- // aapt resource value: 0x7F090005
- public const int FixedBehind = 2131296261;
+ // aapt resource value: 0x7f0900aa
+ public const int design_navigation_view = 2131296426;
- // aapt resource value: 0x7F090006
- public const int FixedFront = 2131296262;
+ // aapt resource value: 0x7f090015
+ public const int disableHome = 2131296277;
- // aapt resource value: 0x7F09005D
- public const int forever = 2131296349;
+ // aapt resource value: 0x7f090116
+ public const int disableReportBytes = 2131296534;
- // aapt resource value: 0x7F090004
- public const int FUNCTION = 2131296260;
+ // aapt resource value: 0x7f09007b
+ public const int edit_query = 2131296379;
- // aapt resource value: 0x7F09005E
- public const int gd_btn_back = 2131296350;
+ // aapt resource value: 0x7f090115
+ public const int enableReportBytes = 2131296533;
- // aapt resource value: 0x7F09005F
- public const int gd_btn_myLocation = 2131296351;
+ // aapt resource value: 0x7f090025
+ public const int end = 2131296293;
- // aapt resource value: 0x7F090060
- public const int gd_btn_save = 2131296352;
+ // aapt resource value: 0x7f0900f4
+ public const int end_padder = 2131296500;
- // aapt resource value: 0x7F090061
- public const int gd_img_search_delete = 2131296353;
+ // aapt resource value: 0x7f090034
+ public const int enterAlways = 2131296308;
- // aapt resource value: 0x7F090062
- public const int gd_ll_myhome = 2131296354;
+ // aapt resource value: 0x7f090035
+ public const int enterAlwaysCollapsed = 2131296309;
- // aapt resource value: 0x7F090063
- public const int gd_ll_search = 2131296355;
+ // aapt resource value: 0x7f090036
+ public const int exitUntilCollapsed = 2131296310;
- // aapt resource value: 0x7F090064
- public const int gd_mapView = 2131296356;
+ // aapt resource value: 0x7f09005b
+ public const int expand_activities_button = 2131296347;
- // aapt resource value: 0x7F090065
- public const int gd_rl_topview = 2131296357;
+ // aapt resource value: 0x7f09006f
+ public const int expanded_menu = 2131296367;
- // aapt resource value: 0x7F090066
- public const int gd_tv_activity_title = 2131296358;
+ // aapt resource value: 0x7f090045
+ public const int fill = 2131296325;
- // aapt resource value: 0x7F090067
- public const int gd_tv_radius = 2131296359;
+ // aapt resource value: 0x7f090046
+ public const int fill_horizontal = 2131296326;
- // aapt resource value: 0x7F090068
- public const int gd_tv_search_title = 2131296360;
+ // aapt resource value: 0x7f09003d
+ public const int fill_vertical = 2131296317;
- // aapt resource value: 0x7F090069
- public const int hangup = 2131296361;
+ // aapt resource value: 0x7f09009f
+ public const int fingerprint_icon = 2131296415;
- // aapt resource value: 0x7F09006A
- public const int hangupMonitorIn = 2131296362;
+ // aapt resource value: 0x7f090049
+ public const int @fixed = 2131296329;
- // aapt resource value: 0x7F09006B
- public const int hdl_gallery_rootView = 2131296363;
+ // aapt resource value: 0x7f09004d
+ public const int forever = 2131296333;
- // aapt resource value: 0x7F09006C
- public const int hdl_gallery_viewPager = 2131296364;
+ // aapt resource value: 0x7f0900c2
+ public const int gd_btn_back = 2131296450;
- // aapt resource value: 0x7F09006D
- public const int hdl_options1 = 2131296365;
+ // aapt resource value: 0x7f0900cb
+ public const int gd_btn_myLocation = 2131296459;
- // aapt resource value: 0x7F09006E
- public const int hdl_options2 = 2131296366;
+ // aapt resource value: 0x7f0900ca
+ public const int gd_btn_save = 2131296458;
- // aapt resource value: 0x7F09006F
- public const int hdl_options3 = 2131296367;
+ // aapt resource value: 0x7f0900c7
+ public const int gd_img_search_delete = 2131296455;
- // aapt resource value: 0x7F090070
- public const int hdl_pickerview_ll = 2131296368;
+ // aapt resource value: 0x7f0900c9
+ public const int gd_ll_myhome = 2131296457;
- // aapt resource value: 0x7F090071
- public const int hide = 2131296369;
+ // aapt resource value: 0x7f0900c5
+ public const int gd_ll_search = 2131296453;
- // aapt resource value: 0x7F090072
- public const int home = 2131296370;
+ // aapt resource value: 0x7f0900c4
+ public const int gd_mapView = 2131296452;
- // aapt resource value: 0x7F090073
- public const int homeAsUp = 2131296371;
+ // aapt resource value: 0x7f0900c1
+ public const int gd_rl_topview = 2131296449;
- // aapt resource value: 0x7F090074
- public const int hour = 2131296372;
+ // aapt resource value: 0x7f0900c3
+ public const int gd_tv_activity_title = 2131296451;
- // aapt resource value: 0x7F090075
- public const int icon = 2131296373;
+ // aapt resource value: 0x7f0900c8
+ public const int gd_tv_radius = 2131296456;
- // aapt resource value: 0x7F090076
- public const int icon_back = 2131296374;
+ // aapt resource value: 0x7f0900c6
+ public const int gd_tv_search_title = 2131296454;
- // aapt resource value: 0x7F090077
- public const int icon_group = 2131296375;
+ // aapt resource value: 0x7f0900ff
+ public const int hangup = 2131296511;
- // aapt resource value: 0x7F090078
- public const int icon_screenshot = 2131296376;
+ // aapt resource value: 0x7f090101
+ public const int hangupMonitorIn = 2131296513;
- // aapt resource value: 0x7F090079
- public const int icon_unlock = 2131296377;
+ // aapt resource value: 0x7f0900bf
+ public const int hdl_gallery_rootView = 2131296447;
- // aapt resource value: 0x7F09007A
- public const int ifRoom = 2131296378;
+ // aapt resource value: 0x7f0900c0
+ public const int hdl_gallery_viewPager = 2131296448;
- // aapt resource value: 0x7F09007B
- public const int image = 2131296379;
+ // aapt resource value: 0x7f0900d3
+ public const int hdl_options1 = 2131296467;
- // aapt resource value: 0x7F09007C
- public const int img_call = 2131296380;
+ // aapt resource value: 0x7f0900d4
+ public const int hdl_options2 = 2131296468;
- // aapt resource value: 0x7F09007D
- public const int img_hangup = 2131296381;
+ // aapt resource value: 0x7f0900d5
+ public const int hdl_options3 = 2131296469;
- // aapt resource value: 0x7F09007E
- public const int info = 2131296382;
+ // aapt resource value: 0x7f0900d2
+ public const int hdl_pickerview_ll = 2131296466;
- // aapt resource value: 0x7F09007F
- public const int italic = 2131296383;
+ // aapt resource value: 0x7f090094
+ public const int hide = 2131296404;
- // aapt resource value: 0x7F090080
- public const int item_touch_helper_previous_elevation = 2131296384;
+ // aapt resource value: 0x7f090005
+ public const int home = 2131296261;
- // aapt resource value: 0x7F090081
- public const int largeLabel = 2131296385;
+ // aapt resource value: 0x7f090016
+ public const int homeAsUp = 2131296278;
- // aapt resource value: 0x7F090082
- public const int left = 2131296386;
+ // aapt resource value: 0x7f0900de
+ public const int hour = 2131296478;
- // aapt resource value: 0x7F090083
- public const int line1 = 2131296387;
+ // aapt resource value: 0x7f09005f
+ public const int icon = 2131296351;
- // aapt resource value: 0x7F090084
- public const int line3 = 2131296388;
+ // aapt resource value: 0x7f090098
+ public const int icon_back = 2131296408;
- // aapt resource value: 0x7F090085
- public const int listMode = 2131296389;
+ // aapt resource value: 0x7f0900f3
+ public const int icon_group = 2131296499;
- // aapt resource value: 0x7F090086
- public const int list_item = 2131296390;
+ // aapt resource value: 0x7f0900b2
+ public const int icon_screenshot = 2131296434;
- // aapt resource value: 0x7F090087
- public const int localDoorUnlock = 2131296391;
+ // aapt resource value: 0x7f0900b3
+ public const int icon_unlock = 2131296435;
- // aapt resource value: 0x7F090088
- public const int localVideo = 2131296392;
+ // aapt resource value: 0x7f09002f
+ public const int ifRoom = 2131296303;
- // aapt resource value: 0x7F090089
- public const int masked = 2131296393;
+ // aapt resource value: 0x7f09005c
+ public const int image = 2131296348;
- // aapt resource value: 0x7F090008
- public const int MatchLayout = 2131296264;
+ // aapt resource value: 0x7f0900b9
+ public const int img_call = 2131296441;
- // aapt resource value: 0x7F09008A
- public const int media_actions = 2131296394;
+ // aapt resource value: 0x7f0900b6
+ public const int img_hangup = 2131296438;
- // aapt resource value: 0x7F09008B
- public const int message = 2131296395;
+ // aapt resource value: 0x7f0900ef
+ public const int info = 2131296495;
- // aapt resource value: 0x7F090007
- public const int META = 2131296263;
+ // aapt resource value: 0x7f09004e
+ public const int italic = 2131296334;
- // aapt resource value: 0x7F09008C
- public const int middle = 2131296396;
+ // aapt resource value: 0x7f090000
+ public const int item_touch_helper_previous_elevation = 2131296256;
- // aapt resource value: 0x7F09008D
- public const int min = 2131296397;
+ // aapt resource value: 0x7f0900a2
+ public const int largeLabel = 2131296418;
- // aapt resource value: 0x7F09008E
- public const int mini = 2131296398;
+ // aapt resource value: 0x7f09003e
+ public const int left = 2131296318;
- // aapt resource value: 0x7F09008F
- public const int monitor = 2131296399;
+ // aapt resource value: 0x7f09000d
+ public const int line1 = 2131296269;
- // aapt resource value: 0x7F090090
- public const int month = 2131296400;
+ // aapt resource value: 0x7f09000e
+ public const int line3 = 2131296270;
- // aapt resource value: 0x7F090091
- public const int multiply = 2131296401;
+ // aapt resource value: 0x7f090012
+ public const int listMode = 2131296274;
+
+ // aapt resource value: 0x7f09005e
+ public const int list_item = 2131296350;
+
+ // aapt resource value: 0x7f090113
+ public const int localDoorUnlock = 2131296531;
+
+ // aapt resource value: 0x7f09009a
+ public const int localVideo = 2131296410;
+
+ // aapt resource value: 0x7f09012a
+ public const int masked = 2131296554;
+
+ // aapt resource value: 0x7f0900e8
+ public const int media_actions = 2131296488;
+
+ // aapt resource value: 0x7f09011f
+ public const int message = 2131296543;
+
+ // aapt resource value: 0x7f090026
+ public const int middle = 2131296294;
+
+ // aapt resource value: 0x7f0900df
+ public const int min = 2131296479;
+
+ // aapt resource value: 0x7f090048
+ public const int mini = 2131296328;
+
+ // aapt resource value: 0x7f090100
+ public const int monitor = 2131296512;
+
+ // aapt resource value: 0x7f0900dc
+ public const int month = 2131296476;
- // aapt resource value: 0x7F090092
- public const int myButton = 2131296402;
+ // aapt resource value: 0x7f09001c
+ public const int multiply = 2131296284;
- // aapt resource value: 0x7F090093
- public const int navigation_header_container = 2131296403;
+ // aapt resource value: 0x7f0900e1
+ public const int myButton = 2131296481;
- // aapt resource value: 0x7F090094
- public const int never = 2131296404;
+ // aapt resource value: 0x7f0900a9
+ public const int navigation_header_container = 2131296425;
- // aapt resource value: 0x7F090095
- public const int none = 2131296405;
+ // aapt resource value: 0x7f090030
+ public const int never = 2131296304;
- // aapt resource value: 0x7F090096
- public const int normal = 2131296406;
+ // aapt resource value: 0x7f090017
+ public const int none = 2131296279;
- // aapt resource value: 0x7F090097
- public const int notification_background = 2131296407;
+ // aapt resource value: 0x7f090013
+ public const int normal = 2131296275;
- // aapt resource value: 0x7F090098
- public const int notification_main_column = 2131296408;
+ // aapt resource value: 0x7f0900f1
+ public const int notification_background = 2131296497;
- // aapt resource value: 0x7F090099
- public const int notification_main_column_container = 2131296409;
+ // aapt resource value: 0x7f0900eb
+ public const int notification_main_column = 2131296491;
- // aapt resource value: 0x7F09009A
- public const int options1 = 2131296410;
+ // aapt resource value: 0x7f0900ea
+ public const int notification_main_column_container = 2131296490;
- // aapt resource value: 0x7F09009B
- public const int options2 = 2131296411;
+ // aapt resource value: 0x7f0900d7
+ public const int options1 = 2131296471;
- // aapt resource value: 0x7F09009C
- public const int options3 = 2131296412;
+ // aapt resource value: 0x7f0900d8
+ public const int options2 = 2131296472;
- // aapt resource value: 0x7F09009D
- public const int optionspicker = 2131296413;
+ // aapt resource value: 0x7f0900d9
+ public const int options3 = 2131296473;
- // aapt resource value: 0x7F09009E
- public const int outmost_container = 2131296414;
+ // aapt resource value: 0x7f0900d6
+ public const int optionspicker = 2131296470;
- // aapt resource value: 0x7F09009F
- public const int parallax = 2131296415;
+ // aapt resource value: 0x7f0900d0
+ public const int outmost_container = 2131296464;
- // aapt resource value: 0x7F0900A0
- public const int parentPanel = 2131296416;
+ // aapt resource value: 0x7f090041
+ public const int parallax = 2131296321;
- // aapt resource value: 0x7F0900A1
- public const int peerAddress = 2131296417;
+ // aapt resource value: 0x7f090062
+ public const int parentPanel = 2131296354;
- // aapt resource value: 0x7F0900A2
- public const int pin = 2131296418;
+ // aapt resource value: 0x7f0900fe
+ public const int peerAddress = 2131296510;
- // aapt resource value: 0x7F0900A3
- public const int progress_circular = 2131296419;
+ // aapt resource value: 0x7f090042
+ public const int pin = 2131296322;
- // aapt resource value: 0x7F0900A4
- public const int progress_horizontal = 2131296420;
+ // aapt resource value: 0x7f090006
+ public const int progress_circular = 2131296262;
- // aapt resource value: 0x7F0900A5
- public const int radio = 2131296421;
+ // aapt resource value: 0x7f090007
+ public const int progress_horizontal = 2131296263;
- // aapt resource value: 0x7F0900A6
- public const int remoteFrame = 2131296422;
+ // aapt resource value: 0x7f090072
+ public const int radio = 2131296370;
- // aapt resource value: 0x7F0900A7
- public const int remoteFrameContainer = 2131296423;
+ // aapt resource value: 0x7f090096
+ public const int remoteFrame = 2131296406;
- // aapt resource value: 0x7F0900A8
- public const int remoteVideo = 2131296424;
+ // aapt resource value: 0x7f090095
+ public const int remoteFrameContainer = 2131296405;
- // aapt resource value: 0x7F0900A9
- public const int requestA = 2131296425;
+ // aapt resource value: 0x7f090097
+ public const int remoteVideo = 2131296407;
- // aapt resource value: 0x7F0900AA
- public const int requestMasterAudio = 2131296426;
+ // aapt resource value: 0x7f0900f7
+ public const int requestA = 2131296503;
- // aapt resource value: 0x7F0900AB
- public const int requestMasterVideo = 2131296427;
+ // aapt resource value: 0x7f09010c
+ public const int requestMasterAudio = 2131296524;
- // aapt resource value: 0x7F0900AC
- public const int requestV = 2131296428;
+ // aapt resource value: 0x7f09010d
+ public const int requestMasterVideo = 2131296525;
- // aapt resource value: 0x7F0900AD
- public const int reverseCall = 2131296429;
+ // aapt resource value: 0x7f0900f8
+ public const int requestV = 2131296504;
- // aapt resource value: 0x7F0900AE
- public const int reverseCallInfo = 2131296430;
+ // aapt resource value: 0x7f09010e
+ public const int reverseCall = 2131296526;
- // aapt resource value: 0x7F0900AF
- public const int right = 2131296431;
+ // aapt resource value: 0x7f09010f
+ public const int reverseCallInfo = 2131296527;
- // aapt resource value: 0x7F0900B0
- public const int right_icon = 2131296432;
+ // aapt resource value: 0x7f09003f
+ public const int right = 2131296319;
- // aapt resource value: 0x7F0900B1
- public const int right_side = 2131296433;
+ // aapt resource value: 0x7f0900f0
+ public const int right_icon = 2131296496;
- // aapt resource value: 0x7F0900B2
- public const int rl_call = 2131296434;
+ // aapt resource value: 0x7f0900ec
+ public const int right_side = 2131296492;
- // aapt resource value: 0x7F0900B3
- public const int rl_hangup = 2131296435;
+ // aapt resource value: 0x7f0900b8
+ public const int rl_call = 2131296440;
- // aapt resource value: 0x7F0900B4
- public const int rl_sceenshot = 2131296436;
+ // aapt resource value: 0x7f0900b5
+ public const int rl_hangup = 2131296437;
- // aapt resource value: 0x7F0900B5
- public const int rl_unlock = 2131296437;
+ // aapt resource value: 0x7f0900bb
+ public const int rl_sceenshot = 2131296443;
- // aapt resource value: 0x7F0900B6
- public const int rv_topbar = 2131296438;
+ // aapt resource value: 0x7f0900bd
+ public const int rl_unlock = 2131296445;
- // aapt resource value: 0x7F09000C
- public const int Scale = 2131296268;
+ // aapt resource value: 0x7f0900cc
+ public const int rv_topbar = 2131296460;
- // aapt resource value: 0x7F0900B7
- public const int screen = 2131296439;
+ // aapt resource value: 0x7f09001d
+ public const int screen = 2131296285;
- // aapt resource value: 0x7F0900B8
- public const int scroll = 2131296440;
+ // aapt resource value: 0x7f090037
+ public const int scroll = 2131296311;
- // aapt resource value: 0x7F0900BC
- public const int scrollable = 2131296444;
+ // aapt resource value: 0x7f090068
+ public const int scrollIndicatorDown = 2131296360;
- // aapt resource value: 0x7F0900B9
- public const int scrollIndicatorDown = 2131296441;
+ // aapt resource value: 0x7f090064
+ public const int scrollIndicatorUp = 2131296356;
- // aapt resource value: 0x7F0900BA
- public const int scrollIndicatorUp = 2131296442;
+ // aapt resource value: 0x7f090065
+ public const int scrollView = 2131296357;
- // aapt resource value: 0x7F0900BB
- public const int scrollView = 2131296443;
+ // aapt resource value: 0x7f09004a
+ public const int scrollable = 2131296330;
- // aapt resource value: 0x7F0900BD
- public const int search_badge = 2131296445;
+ // aapt resource value: 0x7f09007d
+ public const int search_badge = 2131296381;
- // aapt resource value: 0x7F0900BE
- public const int search_bar = 2131296446;
+ // aapt resource value: 0x7f09007c
+ public const int search_bar = 2131296380;
- // aapt resource value: 0x7F0900BF
- public const int search_button = 2131296447;
+ // aapt resource value: 0x7f09007e
+ public const int search_button = 2131296382;
- // aapt resource value: 0x7F0900C0
- public const int search_close_btn = 2131296448;
+ // aapt resource value: 0x7f090083
+ public const int search_close_btn = 2131296387;
- // aapt resource value: 0x7F0900C1
- public const int search_edit_frame = 2131296449;
+ // aapt resource value: 0x7f09007f
+ public const int search_edit_frame = 2131296383;
- // aapt resource value: 0x7F0900C2
- public const int search_go_btn = 2131296450;
+ // aapt resource value: 0x7f090085
+ public const int search_go_btn = 2131296389;
- // aapt resource value: 0x7F0900C3
- public const int search_mag_icon = 2131296451;
+ // aapt resource value: 0x7f090080
+ public const int search_mag_icon = 2131296384;
- // aapt resource value: 0x7F0900C4
- public const int search_plate = 2131296452;
+ // aapt resource value: 0x7f090081
+ public const int search_plate = 2131296385;
- // aapt resource value: 0x7F0900C5
- public const int search_src_text = 2131296453;
+ // aapt resource value: 0x7f090082
+ public const int search_src_text = 2131296386;
- // aapt resource value: 0x7F0900C6
- public const int search_voice_btn = 2131296454;
+ // aapt resource value: 0x7f090086
+ public const int search_voice_btn = 2131296390;
- // aapt resource value: 0x7F0900C7
- public const int second = 2131296455;
+ // aapt resource value: 0x7f0900e0
+ public const int second = 2131296480;
- // aapt resource value: 0x7F0900C8
- public const int select_dialog_listview = 2131296456;
+ // aapt resource value: 0x7f090087
+ public const int select_dialog_listview = 2131296391;
- // aapt resource value: 0x7F0900C9
- public const int sendA = 2131296457;
+ // aapt resource value: 0x7f0900f9
+ public const int sendA = 2131296505;
- // aapt resource value: 0x7F0900CA
- public const int sendCustomData = 2131296458;
+ // aapt resource value: 0x7f09010b
+ public const int sendCustomData = 2131296523;
- // aapt resource value: 0x7F0900CB
- public const int sendV = 2131296459;
+ // aapt resource value: 0x7f0900fa
+ public const int sendV = 2131296506;
- // aapt resource value: 0x7F090009
- public const int SHIFT = 2131296265;
+ // aapt resource value: 0x7f090071
+ public const int shortcut = 2131296369;
- // aapt resource value: 0x7F0900CC
- public const int shortcut = 2131296460;
+ // aapt resource value: 0x7f090093
+ public const int show = 2131296403;
- // aapt resource value: 0x7F0900CD
- public const int show = 2131296461;
+ // aapt resource value: 0x7f090018
+ public const int showCustom = 2131296280;
- // aapt resource value: 0x7F0900CE
- public const int showCustom = 2131296462;
+ // aapt resource value: 0x7f090019
+ public const int showHome = 2131296281;
- // aapt resource value: 0x7F0900CF
- public const int showHome = 2131296463;
+ // aapt resource value: 0x7f09001a
+ public const int showTitle = 2131296282;
- // aapt resource value: 0x7F0900D0
- public const int showTitle = 2131296464;
+ // aapt resource value: 0x7f0900a1
+ public const int smallLabel = 2131296417;
- // aapt resource value: 0x7F0900D1
- public const int smallLabel = 2131296465;
+ // aapt resource value: 0x7f0900a8
+ public const int snackbar_action = 2131296424;
- // aapt resource value: 0x7F0900D2
- public const int snackbar_action = 2131296466;
+ // aapt resource value: 0x7f0900a7
+ public const int snackbar_text = 2131296423;
- // aapt resource value: 0x7F0900D3
- public const int snackbar_text = 2131296467;
+ // aapt resource value: 0x7f090038
+ public const int snap = 2131296312;
- // aapt resource value: 0x7F0900D4
- public const int snap = 2131296468;
+ // aapt resource value: 0x7f09010a
+ public const int snapshot = 2131296522;
- // aapt resource value: 0x7F0900D5
- public const int snapshot = 2131296469;
+ // aapt resource value: 0x7f090061
+ public const int spacer = 2131296353;
- // aapt resource value: 0x7F0900D6
- public const int spacer = 2131296470;
+ // aapt resource value: 0x7f090008
+ public const int split_action_bar = 2131296264;
- // aapt resource value: 0x7F0900D7
- public const int split_action_bar = 2131296471;
+ // aapt resource value: 0x7f09001e
+ public const int src_atop = 2131296286;
- // aapt resource value: 0x7F0900D8
- public const int src_atop = 2131296472;
+ // aapt resource value: 0x7f09001f
+ public const int src_in = 2131296287;
- // aapt resource value: 0x7F0900D9
- public const int src_in = 2131296473;
+ // aapt resource value: 0x7f090020
+ public const int src_over = 2131296288;
- // aapt resource value: 0x7F0900DA
- public const int src_over = 2131296474;
+ // aapt resource value: 0x7f09011a
+ public const int srl_classics_arrow = 2131296538;
- // aapt resource value: 0x7F0900DB
- public const int srl_classics_arrow = 2131296475;
+ // aapt resource value: 0x7f09011d
+ public const int srl_classics_center = 2131296541;
- // aapt resource value: 0x7F0900DC
- public const int srl_classics_center = 2131296476;
+ // aapt resource value: 0x7f09011c
+ public const int srl_classics_progress = 2131296540;
- // aapt resource value: 0x7F0900DD
- public const int srl_classics_progress = 2131296477;
+ // aapt resource value: 0x7f09011b
+ public const int srl_classics_title = 2131296539;
- // aapt resource value: 0x7F0900DE
- public const int srl_classics_title = 2131296478;
+ // aapt resource value: 0x7f09011e
+ public const int srl_classics_update = 2131296542;
- // aapt resource value: 0x7F0900DF
- public const int srl_classics_update = 2131296479;
+ // aapt resource value: 0x7f090040
+ public const int start = 2131296320;
- // aapt resource value: 0x7F0900E0
- public const int start = 2131296480;
+ // aapt resource value: 0x7f090118
+ public const int startAVMsg = 2131296536;
- // aapt resource value: 0x7F0900E1
- public const int startAVMsg = 2131296481;
+ // aapt resource value: 0x7f090112
+ public const int startDoorKey = 2131296530;
- // aapt resource value: 0x7F0900E2
- public const int startDoorKey = 2131296482;
+ // aapt resource value: 0x7f090106
+ public const int startLocalRecord = 2131296518;
- // aapt resource value: 0x7F0900E3
- public const int startLocalRecord = 2131296483;
+ // aapt resource value: 0x7f090110
+ public const int startReadCard = 2131296528;
- // aapt resource value: 0x7F0900E4
- public const int startReadCard = 2131296484;
+ // aapt resource value: 0x7f090104
+ public const int startRecord = 2131296516;
- // aapt resource value: 0x7F0900E5
- public const int startRecord = 2131296485;
+ // aapt resource value: 0x7f090108
+ public const int startRecordLocalAudio = 2131296520;
- // aapt resource value: 0x7F0900E6
- public const int startRecordLocalAudio = 2131296486;
+ // aapt resource value: 0x7f090102
+ public const int startRecordPeerAudio = 2131296514;
- // aapt resource value: 0x7F0900E7
- public const int startRecordPeerAudio = 2131296487;
+ // aapt resource value: 0x7f090124
+ public const int startStream = 2131296548;
- // aapt resource value: 0x7F0900E8
- public const int startStream = 2131296488;
+ // aapt resource value: 0x7f09008f
+ public const int startV1 = 2131296399;
- // aapt resource value: 0x7F0900E9
- public const int start_stop = 2131296489;
+ // aapt resource value: 0x7f090091
+ public const int startV1V4 = 2131296401;
- // aapt resource value: 0x7F0900EA
- public const int start_stop_stream = 2131296490;
+ // aapt resource value: 0x7f090090
+ public const int startV4 = 2131296400;
- // aapt resource value: 0x7F0900EB
- public const int status = 2131296491;
+ // aapt resource value: 0x7f0900f5
+ public const int start_stop = 2131296501;
- // aapt resource value: 0x7F0900EC
- public const int status_bar_latest_event_content = 2131296492;
+ // aapt resource value: 0x7f0900f6
+ public const int start_stop_stream = 2131296502;
- // aapt resource value: 0x7F0900ED
- public const int stopAVMsg = 2131296493;
+ // aapt resource value: 0x7f0900a0
+ public const int status = 2131296416;
- // aapt resource value: 0x7F0900EE
- public const int stopDoorKey = 2131296494;
+ // aapt resource value: 0x7f0900e7
+ public const int status_bar_latest_event_content = 2131296487;
- // aapt resource value: 0x7F0900EF
- public const int stopLocalRecord = 2131296495;
+ // aapt resource value: 0x7f090092
+ public const int stop = 2131296402;
- // aapt resource value: 0x7F0900F0
- public const int stopReadCard = 2131296496;
+ // aapt resource value: 0x7f090119
+ public const int stopAVMsg = 2131296537;
- // aapt resource value: 0x7F0900F1
- public const int stopRecord = 2131296497;
+ // aapt resource value: 0x7f090114
+ public const int stopDoorKey = 2131296532;
- // aapt resource value: 0x7F0900F2
- public const int stopRecordLocalAudio = 2131296498;
+ // aapt resource value: 0x7f090107
+ public const int stopLocalRecord = 2131296519;
- // aapt resource value: 0x7F0900F3
- public const int stopRecordPeerAudio = 2131296499;
+ // aapt resource value: 0x7f090111
+ public const int stopReadCard = 2131296529;
- // aapt resource value: 0x7F0900F4
- public const int stopStream = 2131296500;
+ // aapt resource value: 0x7f090105
+ public const int stopRecord = 2131296517;
- // aapt resource value: 0x7F09000A
- public const int STROKE = 2131296266;
+ // aapt resource value: 0x7f090109
+ public const int stopRecordLocalAudio = 2131296521;
- // aapt resource value: 0x7F0900F5
- public const int submenuarrow = 2131296501;
+ // aapt resource value: 0x7f090103
+ public const int stopRecordPeerAudio = 2131296515;
- // aapt resource value: 0x7F0900F6
- public const int submit_area = 2131296502;
+ // aapt resource value: 0x7f090125
+ public const int stopStream = 2131296549;
- // aapt resource value: 0x7F0900F7
- public const int subtitle = 2131296503;
+ // aapt resource value: 0x7f090073
+ public const int submenuarrow = 2131296371;
- // aapt resource value: 0x7F09000B
- public const int SYM = 2131296267;
+ // aapt resource value: 0x7f090084
+ public const int submit_area = 2131296388;
- // aapt resource value: 0x7F0900F8
- public const int tabMode = 2131296504;
+ // aapt resource value: 0x7f09009d
+ public const int subtitle = 2131296413;
- // aapt resource value: 0x7F0900F9
- public const int text = 2131296505;
+ // aapt resource value: 0x7f090014
+ public const int tabMode = 2131296276;
- // aapt resource value: 0x7F0900FA
- public const int text2 = 2131296506;
+ // aapt resource value: 0x7f09000f
+ public const int text = 2131296271;
- // aapt resource value: 0x7F0900FE
- public const int textinput_counter = 2131296510;
+ // aapt resource value: 0x7f090010
+ public const int text2 = 2131296272;
- // aapt resource value: 0x7F0900FF
- public const int textinput_error = 2131296511;
+ // aapt resource value: 0x7f090067
+ public const int textSpacerNoButtons = 2131296359;
- // aapt resource value: 0x7F0900FB
- public const int textSpacerNoButtons = 2131296507;
+ // aapt resource value: 0x7f090066
+ public const int textSpacerNoTitle = 2131296358;
- // aapt resource value: 0x7F0900FC
- public const int textSpacerNoTitle = 2131296508;
+ // aapt resource value: 0x7f0900ae
+ public const int text_input_password_toggle = 2131296430;
- // aapt resource value: 0x7F0900FD
- public const int text_input_password_toggle = 2131296509;
+ // aapt resource value: 0x7f09000a
+ public const int textinput_counter = 2131296266;
- // aapt resource value: 0x7F090100
- public const int time = 2131296512;
+ // aapt resource value: 0x7f09000b
+ public const int textinput_error = 2131296267;
- // aapt resource value: 0x7F090101
- public const int timepicker = 2131296513;
+ // aapt resource value: 0x7f0900ed
+ public const int time = 2131296493;
- // aapt resource value: 0x7F090102
- public const int title = 2131296514;
+ // aapt resource value: 0x7f0900da
+ public const int timepicker = 2131296474;
- // aapt resource value: 0x7F090103
- public const int titleDividerNoCustom = 2131296515;
+ // aapt resource value: 0x7f090011
+ public const int title = 2131296273;
- // aapt resource value: 0x7F090104
- public const int title_template = 2131296516;
+ // aapt resource value: 0x7f09006e
+ public const int titleDividerNoCustom = 2131296366;
- // aapt resource value: 0x7F090105
- public const int top = 2131296517;
+ // aapt resource value: 0x7f09006c
+ public const int title_template = 2131296364;
- // aapt resource value: 0x7F090106
- public const int topPanel = 2131296518;
+ // aapt resource value: 0x7f090033
+ public const int top = 2131296307;
- // aapt resource value: 0x7F090107
- public const int touch_outside = 2131296519;
+ // aapt resource value: 0x7f09006b
+ public const int topPanel = 2131296363;
- // aapt resource value: 0x7F09000D
- public const int Translate = 2131296269;
+ // aapt resource value: 0x7f0900a5
+ public const int touch_outside = 2131296421;
- // aapt resource value: 0x7F090108
- public const int tvTitle = 2131296520;
+ // aapt resource value: 0x7f0900ce
+ public const int tvTitle = 2131296462;
- // aapt resource value: 0x7F090109
- public const int tv_call = 2131296521;
+ // aapt resource value: 0x7f0900ba
+ public const int tv_call = 2131296442;
- // aapt resource value: 0x7F09010A
- public const int tv_content = 2131296522;
+ // aapt resource value: 0x7f0900b0
+ public const int tv_content = 2131296432;
- // aapt resource value: 0x7F09010B
- public const int tv_hangup = 2131296523;
+ // aapt resource value: 0x7f0900b7
+ public const int tv_hangup = 2131296439;
- // aapt resource value: 0x7F09010C
- public const int tv_name = 2131296524;
+ // aapt resource value: 0x7f090099
+ public const int tv_name = 2131296409;
- // aapt resource value: 0x7F09010D
- public const int tv_ok = 2131296525;
+ // aapt resource value: 0x7f0900b1
+ public const int tv_ok = 2131296433;
- // aapt resource value: 0x7F09010E
- public const int tv_roomName = 2131296526;
+ // aapt resource value: 0x7f09009b
+ public const int tv_roomName = 2131296411;
- // aapt resource value: 0x7F09010F
- public const int tv_screenshot = 2131296527;
+ // aapt resource value: 0x7f0900bc
+ public const int tv_screenshot = 2131296444;
- // aapt resource value: 0x7F090110
- public const int tv_tip = 2131296528;
+ // aapt resource value: 0x7f0900b4
+ public const int tv_tip = 2131296436;
- // aapt resource value: 0x7F090111
- public const int tv_title = 2131296529;
+ // aapt resource value: 0x7f0900af
+ public const int tv_title = 2131296431;
- // aapt resource value: 0x7F090112
- public const int tv_unlock = 2131296530;
+ // aapt resource value: 0x7f0900be
+ public const int tv_unlock = 2131296446;
- // aapt resource value: 0x7F090113
- public const int tv_zxing_back = 2131296531;
+ // aapt resource value: 0x7f090127
+ public const int tv_zxing_back = 2131296551;
- // aapt resource value: 0x7F090114
- public const int tv_zxing_flash = 2131296532;
+ // aapt resource value: 0x7f090128
+ public const int tv_zxing_flash = 2131296552;
- // aapt resource value: 0x7F090115
- public const int tv_zxing_scan = 2131296533;
+ // aapt resource value: 0x7f090126
+ public const int tv_zxing_scan = 2131296550;
- // aapt resource value: 0x7F090116
- public const int uniform = 2131296534;
+ // aapt resource value: 0x7f090022
+ public const int uniform = 2131296290;
- // aapt resource value: 0x7F090117
- public const int up = 2131296535;
+ // aapt resource value: 0x7f090009
+ public const int up = 2131296265;
- // aapt resource value: 0x7F090118
- public const int useLogo = 2131296536;
+ // aapt resource value: 0x7f09001b
+ public const int useLogo = 2131296283;
- // aapt resource value: 0x7F090119
- public const int uvc = 2131296537;
+ // aapt resource value: 0x7f090123
+ public const int uvc = 2131296547;
- // aapt resource value: 0x7F09011A
- public const int videoParent = 2131296538;
+ // aapt resource value: 0x7f090120
+ public const int videoParent = 2131296544;
- // aapt resource value: 0x7F09011B
- public const int view_offset_helper = 2131296539;
+ // aapt resource value: 0x7f09000c
+ public const int view_offset_helper = 2131296268;
- // aapt resource value: 0x7F09011C
- public const int visible = 2131296540;
+ // aapt resource value: 0x7f090129
+ public const int visible = 2131296553;
- // aapt resource value: 0x7F09011D
- public const int withText = 2131296541;
+ // aapt resource value: 0x7f090031
+ public const int withText = 2131296305;
- // aapt resource value: 0x7F09011E
- public const int wrap_content = 2131296542;
+ // aapt resource value: 0x7f090023
+ public const int wrap_content = 2131296291;
- // aapt resource value: 0x7F09011F
- public const int year = 2131296543;
+ // aapt resource value: 0x7f0900db
+ public const int year = 2131296475;
static Id()
{
@@ -3967,38 +4021,38 @@
public partial class Integer
{
- // aapt resource value: 0x7F0A0000
- public const int abc_config_activityDefaultDur = 2131361792;
+ // aapt resource value: 0x7f0e0000
+ public const int abc_config_activityDefaultDur = 2131623936;
- // aapt resource value: 0x7F0A0001
- public const int abc_config_activityShortDur = 2131361793;
+ // aapt resource value: 0x7f0e0001
+ public const int abc_config_activityShortDur = 2131623937;
- // aapt resource value: 0x7F0A0002
- public const int animation_default_duration = 2131361794;
+ // aapt resource value: 0x7f0e000a
+ public const int animation_default_duration = 2131623946;
- // aapt resource value: 0x7F0A0003
- public const int app_bar_elevation_anim_duration = 2131361795;
+ // aapt resource value: 0x7f0e0005
+ public const int app_bar_elevation_anim_duration = 2131623941;
- // aapt resource value: 0x7F0A0004
- public const int bottom_sheet_slide_duration = 2131361796;
+ // aapt resource value: 0x7f0e0006
+ public const int bottom_sheet_slide_duration = 2131623942;
- // aapt resource value: 0x7F0A0005
- public const int cancel_button_image_alpha = 2131361797;
+ // aapt resource value: 0x7f0e0002
+ public const int cancel_button_image_alpha = 2131623938;
- // aapt resource value: 0x7F0A0006
- public const int config_tooltipAnimTime = 2131361798;
+ // aapt resource value: 0x7f0e0003
+ public const int config_tooltipAnimTime = 2131623939;
- // aapt resource value: 0x7F0A0007
- public const int design_snackbar_text_max_lines = 2131361799;
+ // aapt resource value: 0x7f0e0004
+ public const int design_snackbar_text_max_lines = 2131623940;
- // aapt resource value: 0x7F0A0008
- public const int hide_password_duration = 2131361800;
+ // aapt resource value: 0x7f0e0007
+ public const int hide_password_duration = 2131623943;
- // aapt resource value: 0x7F0A0009
- public const int show_password_duration = 2131361801;
+ // aapt resource value: 0x7f0e0008
+ public const int show_password_duration = 2131623944;
- // aapt resource value: 0x7F0A000A
- public const int status_bar_notification_info_maxnum = 2131361802;
+ // aapt resource value: 0x7f0e0009
+ public const int status_bar_notification_info_maxnum = 2131623945;
static Integer()
{
@@ -4013,254 +4067,257 @@
public partial class Layout
{
- // aapt resource value: 0x7F0B0000
- public const int abc_action_bar_title_item = 2131427328;
+ // aapt resource value: 0x7f040000
+ public const int abc_action_bar_title_item = 2130968576;
- // aapt resource value: 0x7F0B0001
- public const int abc_action_bar_up_container = 2131427329;
+ // aapt resource value: 0x7f040001
+ public const int abc_action_bar_up_container = 2130968577;
- // aapt resource value: 0x7F0B0002
- public const int abc_action_bar_view_list_nav_layout = 2131427330;
+ // aapt resource value: 0x7f040002
+ public const int abc_action_bar_view_list_nav_layout = 2130968578;
- // aapt resource value: 0x7F0B0003
- public const int abc_action_menu_item_layout = 2131427331;
+ // aapt resource value: 0x7f040003
+ public const int abc_action_menu_item_layout = 2130968579;
- // aapt resource value: 0x7F0B0004
- public const int abc_action_menu_layout = 2131427332;
+ // aapt resource value: 0x7f040004
+ public const int abc_action_menu_layout = 2130968580;
- // aapt resource value: 0x7F0B0005
- public const int abc_action_mode_bar = 2131427333;
+ // aapt resource value: 0x7f040005
+ public const int abc_action_mode_bar = 2130968581;
- // aapt resource value: 0x7F0B0006
- public const int abc_action_mode_close_item_material = 2131427334;
+ // aapt resource value: 0x7f040006
+ public const int abc_action_mode_close_item_material = 2130968582;
- // aapt resource value: 0x7F0B0007
- public const int abc_activity_chooser_view = 2131427335;
+ // aapt resource value: 0x7f040007
+ public const int abc_activity_chooser_view = 2130968583;
- // aapt resource value: 0x7F0B0008
- public const int abc_activity_chooser_view_list_item = 2131427336;
+ // aapt resource value: 0x7f040008
+ public const int abc_activity_chooser_view_list_item = 2130968584;
- // aapt resource value: 0x7F0B0009
- public const int abc_alert_dialog_button_bar_material = 2131427337;
+ // aapt resource value: 0x7f040009
+ public const int abc_alert_dialog_button_bar_material = 2130968585;
- // aapt resource value: 0x7F0B000A
- public const int abc_alert_dialog_material = 2131427338;
+ // aapt resource value: 0x7f04000a
+ public const int abc_alert_dialog_material = 2130968586;
- // aapt resource value: 0x7F0B000B
- public const int abc_alert_dialog_title_material = 2131427339;
+ // aapt resource value: 0x7f04000b
+ public const int abc_alert_dialog_title_material = 2130968587;
- // aapt resource value: 0x7F0B000C
- public const int abc_dialog_title_material = 2131427340;
+ // aapt resource value: 0x7f04000c
+ public const int abc_dialog_title_material = 2130968588;
- // aapt resource value: 0x7F0B000D
- public const int abc_expanded_menu_layout = 2131427341;
+ // aapt resource value: 0x7f04000d
+ public const int abc_expanded_menu_layout = 2130968589;
- // aapt resource value: 0x7F0B000E
- public const int abc_list_menu_item_checkbox = 2131427342;
+ // aapt resource value: 0x7f04000e
+ public const int abc_list_menu_item_checkbox = 2130968590;
- // aapt resource value: 0x7F0B000F
- public const int abc_list_menu_item_icon = 2131427343;
+ // aapt resource value: 0x7f04000f
+ public const int abc_list_menu_item_icon = 2130968591;
- // aapt resource value: 0x7F0B0010
- public const int abc_list_menu_item_layout = 2131427344;
+ // aapt resource value: 0x7f040010
+ public const int abc_list_menu_item_layout = 2130968592;
- // aapt resource value: 0x7F0B0011
- public const int abc_list_menu_item_radio = 2131427345;
+ // aapt resource value: 0x7f040011
+ public const int abc_list_menu_item_radio = 2130968593;
- // aapt resource value: 0x7F0B0012
- public const int abc_popup_menu_header_item_layout = 2131427346;
+ // aapt resource value: 0x7f040012
+ public const int abc_popup_menu_header_item_layout = 2130968594;
- // aapt resource value: 0x7F0B0013
- public const int abc_popup_menu_item_layout = 2131427347;
+ // aapt resource value: 0x7f040013
+ public const int abc_popup_menu_item_layout = 2130968595;
- // aapt resource value: 0x7F0B0014
- public const int abc_screen_content_include = 2131427348;
+ // aapt resource value: 0x7f040014
+ public const int abc_screen_content_include = 2130968596;
- // aapt resource value: 0x7F0B0015
- public const int abc_screen_simple = 2131427349;
+ // aapt resource value: 0x7f040015
+ public const int abc_screen_simple = 2130968597;
- // aapt resource value: 0x7F0B0016
- public const int abc_screen_simple_overlay_action_mode = 2131427350;
+ // aapt resource value: 0x7f040016
+ public const int abc_screen_simple_overlay_action_mode = 2130968598;
- // aapt resource value: 0x7F0B0017
- public const int abc_screen_toolbar = 2131427351;
+ // aapt resource value: 0x7f040017
+ public const int abc_screen_toolbar = 2130968599;
- // aapt resource value: 0x7F0B0018
- public const int abc_search_dropdown_item_icons_2line = 2131427352;
+ // aapt resource value: 0x7f040018
+ public const int abc_search_dropdown_item_icons_2line = 2130968600;
- // aapt resource value: 0x7F0B0019
- public const int abc_search_view = 2131427353;
+ // aapt resource value: 0x7f040019
+ public const int abc_search_view = 2130968601;
- // aapt resource value: 0x7F0B001A
- public const int abc_select_dialog_material = 2131427354;
+ // aapt resource value: 0x7f04001a
+ public const int abc_select_dialog_material = 2130968602;
- // aapt resource value: 0x7F0B001B
- public const int activity_main = 2131427355;
+ // aapt resource value: 0x7f04001b
+ public const int activity_elian = 2130968603;
- // aapt resource value: 0x7F0B001C
- public const int activity_video_phone = 2131427356;
+ // aapt resource value: 0x7f04001c
+ public const int activity_main = 2130968604;
- // aapt resource value: 0x7F0B001D
- public const int biometric_prompt_dialog_content = 2131427357;
+ // aapt resource value: 0x7f04001d
+ public const int activity_video_phone = 2130968605;
- // aapt resource value: 0x7F0B001E
- public const int design_bottom_navigation_item = 2131427358;
+ // aapt resource value: 0x7f04001e
+ public const int biometric_prompt_dialog_content = 2130968606;
- // aapt resource value: 0x7F0B001F
- public const int design_bottom_sheet_dialog = 2131427359;
+ // aapt resource value: 0x7f04001f
+ public const int design_bottom_navigation_item = 2130968607;
- // aapt resource value: 0x7F0B0020
- public const int design_layout_snackbar = 2131427360;
+ // aapt resource value: 0x7f040020
+ public const int design_bottom_sheet_dialog = 2130968608;
- // aapt resource value: 0x7F0B0021
- public const int design_layout_snackbar_include = 2131427361;
+ // aapt resource value: 0x7f040021
+ public const int design_layout_snackbar = 2130968609;
- // aapt resource value: 0x7F0B0022
- public const int design_layout_tab_icon = 2131427362;
+ // aapt resource value: 0x7f040022
+ public const int design_layout_snackbar_include = 2130968610;
- // aapt resource value: 0x7F0B0023
- public const int design_layout_tab_text = 2131427363;
+ // aapt resource value: 0x7f040023
+ public const int design_layout_tab_icon = 2130968611;
- // aapt resource value: 0x7F0B0024
- public const int design_menu_item_action_area = 2131427364;
+ // aapt resource value: 0x7f040024
+ public const int design_layout_tab_text = 2130968612;
- // aapt resource value: 0x7F0B0025
- public const int design_navigation_item = 2131427365;
+ // aapt resource value: 0x7f040025
+ public const int design_menu_item_action_area = 2130968613;
- // aapt resource value: 0x7F0B0026
- public const int design_navigation_item_header = 2131427366;
+ // aapt resource value: 0x7f040026
+ public const int design_navigation_item = 2130968614;
- // aapt resource value: 0x7F0B0027
- public const int design_navigation_item_separator = 2131427367;
+ // aapt resource value: 0x7f040027
+ public const int design_navigation_item_header = 2130968615;
- // aapt resource value: 0x7F0B0028
- public const int design_navigation_item_subheader = 2131427368;
+ // aapt resource value: 0x7f040028
+ public const int design_navigation_item_separator = 2130968616;
- // aapt resource value: 0x7F0B0029
- public const int design_navigation_menu = 2131427369;
+ // aapt resource value: 0x7f040029
+ public const int design_navigation_item_subheader = 2130968617;
+
+ // aapt resource value: 0x7f04002a
+ public const int design_navigation_menu = 2130968618;
- // aapt resource value: 0x7F0B002A
- public const int design_navigation_menu_item = 2131427370;
+ // aapt resource value: 0x7f04002b
+ public const int design_navigation_menu_item = 2130968619;
- // aapt resource value: 0x7F0B002B
- public const int design_text_input_password_icon = 2131427371;
+ // aapt resource value: 0x7f04002c
+ public const int design_text_input_password_icon = 2130968620;
- // aapt resource value: 0x7F0B002C
- public const int dialog_tip = 2131427372;
+ // aapt resource value: 0x7f04002d
+ public const int dialog_tip = 2130968621;
- // aapt resource value: 0x7F0B002D
- public const int fragment_call = 2131427373;
+ // aapt resource value: 0x7f04002e
+ public const int fragment_call = 2130968622;
- // aapt resource value: 0x7F0B002E
- public const int fragment_monitor = 2131427374;
+ // aapt resource value: 0x7f04002f
+ public const int fragment_monitor = 2130968623;
- // aapt resource value: 0x7F0B002F
- public const int hdl_gallery_banner_view_layout = 2131427375;
+ // aapt resource value: 0x7f040030
+ public const int hdl_gallery_banner_view_layout = 2130968624;
- // aapt resource value: 0x7F0B0030
- public const int hdl_widget_activity_crop_image = 2131427376;
+ // aapt resource value: 0x7f040031
+ public const int hdl_widget_activity_crop_image = 2130968625;
- // aapt resource value: 0x7F0B0031
- public const int hdl_widget_activity_geofence_round = 2131427377;
+ // aapt resource value: 0x7f040032
+ public const int hdl_widget_activity_geofence_round = 2130968626;
- // aapt resource value: 0x7F0B0032
- public const int hdl_widget_air_button = 2131427378;
+ // aapt resource value: 0x7f040033
+ public const int hdl_widget_air_button = 2130968627;
- // aapt resource value: 0x7F0B0033
- public const int hdl_widget_include_pickerview_topbar = 2131427379;
+ // aapt resource value: 0x7f040034
+ public const int hdl_widget_include_pickerview_topbar = 2130968628;
- // aapt resource value: 0x7F0B0034
- public const int hdl_widget_layout_basepickerview = 2131427380;
+ // aapt resource value: 0x7f040035
+ public const int hdl_widget_layout_basepickerview = 2130968629;
- // aapt resource value: 0x7F0B0035
- public const int hdl_widget_pickerview = 2131427381;
+ // aapt resource value: 0x7f040036
+ public const int hdl_widget_pickerview = 2130968630;
- // aapt resource value: 0x7F0B0036
- public const int hdl_widget_pickerview_options = 2131427382;
+ // aapt resource value: 0x7f040037
+ public const int hdl_widget_pickerview_options = 2130968631;
- // aapt resource value: 0x7F0B0037
- public const int hdl_widget_pickerview_time = 2131427383;
+ // aapt resource value: 0x7f040038
+ public const int hdl_widget_pickerview_time = 2130968632;
- // aapt resource value: 0x7F0B0038
- public const int Main = 2131427384;
+ // aapt resource value: 0x7f040039
+ public const int Main = 2130968633;
- // aapt resource value: 0x7F0B0039
- public const int notification_action = 2131427385;
+ // aapt resource value: 0x7f04003a
+ public const int notification_action = 2130968634;
- // aapt resource value: 0x7F0B003A
- public const int notification_action_tombstone = 2131427386;
+ // aapt resource value: 0x7f04003b
+ public const int notification_action_tombstone = 2130968635;
- // aapt resource value: 0x7F0B003B
- public const int notification_media_action = 2131427387;
+ // aapt resource value: 0x7f04003c
+ public const int notification_media_action = 2130968636;
- // aapt resource value: 0x7F0B003C
- public const int notification_media_cancel_action = 2131427388;
+ // aapt resource value: 0x7f04003d
+ public const int notification_media_cancel_action = 2130968637;
- // aapt resource value: 0x7F0B003D
- public const int notification_template_big_media = 2131427389;
+ // aapt resource value: 0x7f04003e
+ public const int notification_template_big_media = 2130968638;
- // aapt resource value: 0x7F0B003E
- public const int notification_template_big_media_custom = 2131427390;
+ // aapt resource value: 0x7f04003f
+ public const int notification_template_big_media_custom = 2130968639;
- // aapt resource value: 0x7F0B003F
- public const int notification_template_big_media_narrow = 2131427391;
+ // aapt resource value: 0x7f040040
+ public const int notification_template_big_media_narrow = 2130968640;
- // aapt resource value: 0x7F0B0040
- public const int notification_template_big_media_narrow_custom = 2131427392;
+ // aapt resource value: 0x7f040041
+ public const int notification_template_big_media_narrow_custom = 2130968641;
- // aapt resource value: 0x7F0B0041
- public const int notification_template_custom_big = 2131427393;
+ // aapt resource value: 0x7f040042
+ public const int notification_template_custom_big = 2130968642;
- // aapt resource value: 0x7F0B0042
- public const int notification_template_icon_group = 2131427394;
+ // aapt resource value: 0x7f040043
+ public const int notification_template_icon_group = 2130968643;
- // aapt resource value: 0x7F0B0043
- public const int notification_template_lines_media = 2131427395;
+ // aapt resource value: 0x7f040044
+ public const int notification_template_lines_media = 2130968644;
- // aapt resource value: 0x7F0B0044
- public const int notification_template_media = 2131427396;
+ // aapt resource value: 0x7f040045
+ public const int notification_template_media = 2130968645;
- // aapt resource value: 0x7F0B0045
- public const int notification_template_media_custom = 2131427397;
+ // aapt resource value: 0x7f040046
+ public const int notification_template_media_custom = 2130968646;
- // aapt resource value: 0x7F0B0046
- public const int notification_template_part_chronometer = 2131427398;
+ // aapt resource value: 0x7f040047
+ public const int notification_template_part_chronometer = 2130968647;
- // aapt resource value: 0x7F0B0047
- public const int notification_template_part_time = 2131427399;
+ // aapt resource value: 0x7f040048
+ public const int notification_template_part_time = 2130968648;
- // aapt resource value: 0x7F0B0048
- public const int select_dialog_item_material = 2131427400;
+ // aapt resource value: 0x7f040049
+ public const int select_dialog_item_material = 2130968649;
- // aapt resource value: 0x7F0B0049
- public const int select_dialog_multichoice_material = 2131427401;
+ // aapt resource value: 0x7f04004a
+ public const int select_dialog_multichoice_material = 2130968650;
- // aapt resource value: 0x7F0B004A
- public const int select_dialog_singlechoice_material = 2131427402;
+ // aapt resource value: 0x7f04004b
+ public const int select_dialog_singlechoice_material = 2130968651;
- // aapt resource value: 0x7F0B004B
- public const int simple_demo = 2131427403;
+ // aapt resource value: 0x7f04004c
+ public const int simple_demo = 2130968652;
- // aapt resource value: 0x7F0B004C
- public const int srl_classics_footer = 2131427404;
+ // aapt resource value: 0x7f04004d
+ public const int srl_classics_footer = 2130968653;
- // aapt resource value: 0x7F0B004D
- public const int srl_classics_header = 2131427405;
+ // aapt resource value: 0x7f04004e
+ public const int srl_classics_header = 2130968654;
- // aapt resource value: 0x7F0B004E
- public const int support_simple_spinner_dropdown_item = 2131427406;
+ // aapt resource value: 0x7f04004f
+ public const int support_simple_spinner_dropdown_item = 2130968655;
- // aapt resource value: 0x7F0B004F
- public const int test_surfaceview = 2131427407;
+ // aapt resource value: 0x7f040050
+ public const int test_surfaceview = 2130968656;
- // aapt resource value: 0x7F0B0050
- public const int tooltip = 2131427408;
+ // aapt resource value: 0x7f040051
+ public const int tooltip = 2130968657;
- // aapt resource value: 0x7F0B0051
- public const int video_device = 2131427409;
+ // aapt resource value: 0x7f040052
+ public const int video_device = 2130968658;
- // aapt resource value: 0x7F0B0052
- public const int zxing_layout = 2131427410;
+ // aapt resource value: 0x7f040053
+ public const int zxing_layout = 2130968659;
static Layout()
{
@@ -4275,14 +4332,14 @@
public partial class Mipmap
{
- // aapt resource value: 0x7F0C0002
- public const int Icon = 2131492866;
+ // aapt resource value: 0x7f030000
+ public const int ic_launcher = 2130903040;
- // aapt resource value: 0x7F0C0000
- public const int ic_launcher = 2131492864;
+ // aapt resource value: 0x7f030001
+ public const int ic_launcher_round = 2130903041;
- // aapt resource value: 0x7F0C0001
- public const int ic_launcher_round = 2131492865;
+ // aapt resource value: 0x7f030002
+ public const int Icon = 2130903042;
static Mipmap()
{
@@ -4297,242 +4354,242 @@
public partial class String
{
- // aapt resource value: 0x7F0D0000
- public const int abc_action_bar_home_description = 2131558400;
+ // aapt resource value: 0x7f0a0000
+ public const int abc_action_bar_home_description = 2131361792;
- // aapt resource value: 0x7F0D0001
- public const int abc_action_bar_home_description_format = 2131558401;
+ // aapt resource value: 0x7f0a0001
+ public const int abc_action_bar_home_description_format = 2131361793;
- // aapt resource value: 0x7F0D0002
- public const int abc_action_bar_home_subtitle_description_format = 2131558402;
+ // aapt resource value: 0x7f0a0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131361794;
- // aapt resource value: 0x7F0D0003
- public const int abc_action_bar_up_description = 2131558403;
+ // aapt resource value: 0x7f0a0003
+ public const int abc_action_bar_up_description = 2131361795;
- // aapt resource value: 0x7F0D0004
- public const int abc_action_menu_overflow_description = 2131558404;
+ // aapt resource value: 0x7f0a0004
+ public const int abc_action_menu_overflow_description = 2131361796;
- // aapt resource value: 0x7F0D0005
- public const int abc_action_mode_done = 2131558405;
+ // aapt resource value: 0x7f0a0005
+ public const int abc_action_mode_done = 2131361797;
- // aapt resource value: 0x7F0D0007
- public const int abc_activitychooserview_choose_application = 2131558407;
+ // aapt resource value: 0x7f0a0006
+ public const int abc_activity_chooser_view_see_all = 2131361798;
- // aapt resource value: 0x7F0D0006
- public const int abc_activity_chooser_view_see_all = 2131558406;
+ // aapt resource value: 0x7f0a0007
+ public const int abc_activitychooserview_choose_application = 2131361799;
- // aapt resource value: 0x7F0D0008
- public const int abc_capital_off = 2131558408;
+ // aapt resource value: 0x7f0a0008
+ public const int abc_capital_off = 2131361800;
- // aapt resource value: 0x7F0D0009
- public const int abc_capital_on = 2131558409;
+ // aapt resource value: 0x7f0a0009
+ public const int abc_capital_on = 2131361801;
- // aapt resource value: 0x7F0D000A
- public const int abc_font_family_body_1_material = 2131558410;
+ // aapt resource value: 0x7f0a0015
+ public const int abc_font_family_body_1_material = 2131361813;
- // aapt resource value: 0x7F0D000B
- public const int abc_font_family_body_2_material = 2131558411;
+ // aapt resource value: 0x7f0a0016
+ public const int abc_font_family_body_2_material = 2131361814;
- // aapt resource value: 0x7F0D000C
- public const int abc_font_family_button_material = 2131558412;
+ // aapt resource value: 0x7f0a0017
+ public const int abc_font_family_button_material = 2131361815;
- // aapt resource value: 0x7F0D000D
- public const int abc_font_family_caption_material = 2131558413;
+ // aapt resource value: 0x7f0a0018
+ public const int abc_font_family_caption_material = 2131361816;
- // aapt resource value: 0x7F0D000E
- public const int abc_font_family_display_1_material = 2131558414;
+ // aapt resource value: 0x7f0a0019
+ public const int abc_font_family_display_1_material = 2131361817;
- // aapt resource value: 0x7F0D000F
- public const int abc_font_family_display_2_material = 2131558415;
+ // aapt resource value: 0x7f0a001a
+ public const int abc_font_family_display_2_material = 2131361818;
- // aapt resource value: 0x7F0D0010
- public const int abc_font_family_display_3_material = 2131558416;
+ // aapt resource value: 0x7f0a001b
+ public const int abc_font_family_display_3_material = 2131361819;
- // aapt resource value: 0x7F0D0011
- public const int abc_font_family_display_4_material = 2131558417;
+ // aapt resource value: 0x7f0a001c
+ public const int abc_font_family_display_4_material = 2131361820;
- // aapt resource value: 0x7F0D0012
- public const int abc_font_family_headline_material = 2131558418;
+ // aapt resource value: 0x7f0a001d
+ public const int abc_font_family_headline_material = 2131361821;
- // aapt resource value: 0x7F0D0013
- public const int abc_font_family_menu_material = 2131558419;
+ // aapt resource value: 0x7f0a001e
+ public const int abc_font_family_menu_material = 2131361822;
- // aapt resource value: 0x7F0D0014
- public const int abc_font_family_subhead_material = 2131558420;
+ // aapt resource value: 0x7f0a001f
+ public const int abc_font_family_subhead_material = 2131361823;
- // aapt resource value: 0x7F0D0015
- public const int abc_font_family_title_material = 2131558421;
+ // aapt resource value: 0x7f0a0020
+ public const int abc_font_family_title_material = 2131361824;
- // aapt resource value: 0x7F0D0017
- public const int abc_searchview_description_clear = 2131558423;
+ // aapt resource value: 0x7f0a000a
+ public const int abc_search_hint = 2131361802;
- // aapt resource value: 0x7F0D0018
- public const int abc_searchview_description_query = 2131558424;
+ // aapt resource value: 0x7f0a000b
+ public const int abc_searchview_description_clear = 2131361803;
- // aapt resource value: 0x7F0D0019
- public const int abc_searchview_description_search = 2131558425;
+ // aapt resource value: 0x7f0a000c
+ public const int abc_searchview_description_query = 2131361804;
- // aapt resource value: 0x7F0D001A
- public const int abc_searchview_description_submit = 2131558426;
+ // aapt resource value: 0x7f0a000d
+ public const int abc_searchview_description_search = 2131361805;
- // aapt resource value: 0x7F0D001B
- public const int abc_searchview_description_voice = 2131558427;
+ // aapt resource value: 0x7f0a000e
+ public const int abc_searchview_description_submit = 2131361806;
- // aapt resource value: 0x7F0D0016
- public const int abc_search_hint = 2131558422;
+ // aapt resource value: 0x7f0a000f
+ public const int abc_searchview_description_voice = 2131361807;
- // aapt resource value: 0x7F0D001C
- public const int abc_shareactionprovider_share_with = 2131558428;
+ // aapt resource value: 0x7f0a0010
+ public const int abc_shareactionprovider_share_with = 2131361808;
- // aapt resource value: 0x7F0D001D
- public const int abc_shareactionprovider_share_with_application = 2131558429;
+ // aapt resource value: 0x7f0a0011
+ public const int abc_shareactionprovider_share_with_application = 2131361809;
- // aapt resource value: 0x7F0D001E
- public const int abc_toolbar_collapse_description = 2131558430;
+ // aapt resource value: 0x7f0a0012
+ public const int abc_toolbar_collapse_description = 2131361810;
- // aapt resource value: 0x7F0D0020
- public const int appbar_scrolling_view_behavior = 2131558432;
+ // aapt resource value: 0x7f0a0029
+ public const int app_name = 2131361833;
- // aapt resource value: 0x7F0D001F
- public const int app_name = 2131558431;
+ // aapt resource value: 0x7f0a0021
+ public const int appbar_scrolling_view_behavior = 2131361825;
- // aapt resource value: 0x7F0D0021
- public const int bottom_sheet_behavior = 2131558433;
+ // aapt resource value: 0x7f0a0022
+ public const int bottom_sheet_behavior = 2131361826;
- // aapt resource value: 0x7F0D0022
- public const int character_counter_pattern = 2131558434;
+ // aapt resource value: 0x7f0a0023
+ public const int character_counter_pattern = 2131361827;
- // aapt resource value: 0x7F0D0023
- public const int gd_activity_title = 2131558435;
+ // aapt resource value: 0x7f0a003d
+ public const int gd_activity_title = 2131361853;
- // aapt resource value: 0x7F0D0024
- public const int gd_cancel = 2131558436;
+ // aapt resource value: 0x7f0a003e
+ public const int gd_cancel = 2131361854;
- // aapt resource value: 0x7F0D0025
- public const int gd_myhome = 2131558437;
+ // aapt resource value: 0x7f0a003f
+ public const int gd_myhome = 2131361855;
- // aapt resource value: 0x7F0D0026
- public const int gd_notifyMsg = 2131558438;
+ // aapt resource value: 0x7f0a0040
+ public const int gd_notifyMsg = 2131361856;
- // aapt resource value: 0x7F0D0027
- public const int gd_notifyTitle = 2131558439;
+ // aapt resource value: 0x7f0a0041
+ public const int gd_notifyTitle = 2131361857;
- // aapt resource value: 0x7F0D0028
- public const int gd_save = 2131558440;
+ // aapt resource value: 0x7f0a0042
+ public const int gd_save = 2131361858;
- // aapt resource value: 0x7F0D0029
- public const int gd_search_tip = 2131558441;
+ // aapt resource value: 0x7f0a0043
+ public const int gd_search_tip = 2131361859;
- // aapt resource value: 0x7F0D002A
- public const int gd_select_distance = 2131558442;
+ // aapt resource value: 0x7f0a0044
+ public const int gd_select_distance = 2131361860;
- // aapt resource value: 0x7F0D002B
- public const int gd_setting = 2131558443;
+ // aapt resource value: 0x7f0a0045
+ public const int gd_setting = 2131361861;
- // aapt resource value: 0x7F0D002C
- public const int hello = 2131558444;
+ // aapt resource value: 0x7f0a004e
+ public const int hello = 2131361870;
- // aapt resource value: 0x7F0D002D
- public const int not_recognized_fingerprint_hint = 2131558445;
+ // aapt resource value: 0x7f0a002a
+ public const int not_recognized_fingerprint_hint = 2131361834;
- // aapt resource value: 0x7F0D002E
- public const int password_toggle_content_description = 2131558446;
+ // aapt resource value: 0x7f0a0024
+ public const int password_toggle_content_description = 2131361828;
- // aapt resource value: 0x7F0D002F
- public const int path_password_eye = 2131558447;
+ // aapt resource value: 0x7f0a0025
+ public const int path_password_eye = 2131361829;
- // aapt resource value: 0x7F0D0030
- public const int path_password_eye_mask_strike_through = 2131558448;
+ // aapt resource value: 0x7f0a0026
+ public const int path_password_eye_mask_strike_through = 2131361830;
- // aapt resource value: 0x7F0D0031
- public const int path_password_eye_mask_visible = 2131558449;
+ // aapt resource value: 0x7f0a0027
+ public const int path_password_eye_mask_visible = 2131361831;
- // aapt resource value: 0x7F0D0032
- public const int path_password_strike_through = 2131558450;
+ // aapt resource value: 0x7f0a0028
+ public const int path_password_strike_through = 2131361832;
- // aapt resource value: 0x7F0D0033
- public const int pickerview_cancel = 2131558451;
+ // aapt resource value: 0x7f0a0046
+ public const int pickerview_cancel = 2131361862;
- // aapt resource value: 0x7F0D0034
- public const int pickerview_day = 2131558452;
+ // aapt resource value: 0x7f0a0047
+ public const int pickerview_day = 2131361863;
- // aapt resource value: 0x7F0D0035
- public const int pickerview_hours = 2131558453;
+ // aapt resource value: 0x7f0a0048
+ public const int pickerview_hours = 2131361864;
- // aapt resource value: 0x7F0D0036
- public const int pickerview_minutes = 2131558454;
+ // aapt resource value: 0x7f0a0049
+ public const int pickerview_minutes = 2131361865;
- // aapt resource value: 0x7F0D0037
- public const int pickerview_month = 2131558455;
+ // aapt resource value: 0x7f0a004a
+ public const int pickerview_month = 2131361866;
- // aapt resource value: 0x7F0D0038
- public const int pickerview_seconds = 2131558456;
+ // aapt resource value: 0x7f0a004b
+ public const int pickerview_seconds = 2131361867;
- // aapt resource value: 0x7F0D0039
- public const int pickerview_submit = 2131558457;
+ // aapt resource value: 0x7f0a004c
+ public const int pickerview_submit = 2131361868;
- // aapt resource value: 0x7F0D003A
- public const int pickerview_year = 2131558458;
+ // aapt resource value: 0x7f0a004d
+ public const int pickerview_year = 2131361869;
- // aapt resource value: 0x7F0D003B
- public const int search_menu_title = 2131558459;
+ // aapt resource value: 0x7f0a0013
+ public const int search_menu_title = 2131361811;
- // aapt resource value: 0x7F0D003C
- public const int srl_component_falsify = 2131558460;
+ // aapt resource value: 0x7f0a002c
+ public const int srl_component_falsify = 2131361836;
- // aapt resource value: 0x7F0D003D
- public const int srl_content_empty = 2131558461;
+ // aapt resource value: 0x7f0a002d
+ public const int srl_content_empty = 2131361837;
- // aapt resource value: 0x7F0D003E
- public const int srl_footer_failed = 2131558462;
+ // aapt resource value: 0x7f0a002e
+ public const int srl_footer_failed = 2131361838;
- // aapt resource value: 0x7F0D003F
- public const int srl_footer_finish = 2131558463;
+ // aapt resource value: 0x7f0a002f
+ public const int srl_footer_finish = 2131361839;
- // aapt resource value: 0x7F0D0040
- public const int srl_footer_loading = 2131558464;
+ // aapt resource value: 0x7f0a0030
+ public const int srl_footer_loading = 2131361840;
- // aapt resource value: 0x7F0D0041
- public const int srl_footer_nothing = 2131558465;
+ // aapt resource value: 0x7f0a0031
+ public const int srl_footer_nothing = 2131361841;
- // aapt resource value: 0x7F0D0042
- public const int srl_footer_pulling = 2131558466;
+ // aapt resource value: 0x7f0a0032
+ public const int srl_footer_pulling = 2131361842;
- // aapt resource value: 0x7F0D0043
- public const int srl_footer_refreshing = 2131558467;
+ // aapt resource value: 0x7f0a0033
+ public const int srl_footer_refreshing = 2131361843;
- // aapt resource value: 0x7F0D0044
- public const int srl_footer_release = 2131558468;
+ // aapt resource value: 0x7f0a0034
+ public const int srl_footer_release = 2131361844;
- // aapt resource value: 0x7F0D0045
- public const int srl_header_failed = 2131558469;
+ // aapt resource value: 0x7f0a0035
+ public const int srl_header_failed = 2131361845;
- // aapt resource value: 0x7F0D0046
- public const int srl_header_finish = 2131558470;
+ // aapt resource value: 0x7f0a0036
+ public const int srl_header_finish = 2131361846;
- // aapt resource value: 0x7F0D0047
- public const int srl_header_loading = 2131558471;
+ // aapt resource value: 0x7f0a0037
+ public const int srl_header_loading = 2131361847;
- // aapt resource value: 0x7F0D0048
- public const int srl_header_pulling = 2131558472;
+ // aapt resource value: 0x7f0a0038
+ public const int srl_header_pulling = 2131361848;
- // aapt resource value: 0x7F0D0049
- public const int srl_header_refreshing = 2131558473;
+ // aapt resource value: 0x7f0a0039
+ public const int srl_header_refreshing = 2131361849;
- // aapt resource value: 0x7F0D004A
- public const int srl_header_release = 2131558474;
+ // aapt resource value: 0x7f0a003a
+ public const int srl_header_release = 2131361850;
- // aapt resource value: 0x7F0D004B
- public const int srl_header_secondary = 2131558475;
+ // aapt resource value: 0x7f0a003b
+ public const int srl_header_secondary = 2131361851;
- // aapt resource value: 0x7F0D004C
- public const int srl_header_update = 2131558476;
+ // aapt resource value: 0x7f0a003c
+ public const int srl_header_update = 2131361852;
- // aapt resource value: 0x7F0D004D
- public const int status_bar_notification_info_overflow = 2131558477;
+ // aapt resource value: 0x7f0a0014
+ public const int status_bar_notification_info_overflow = 2131361812;
- // aapt resource value: 0x7F0D004E
- public const int touch_fingerprint_sensor_hint = 2131558478;
+ // aapt resource value: 0x7f0a002b
+ public const int touch_fingerprint_sensor_hint = 2131361835;
static String()
{
@@ -4547,1214 +4604,1214 @@
public partial class Style
{
- // aapt resource value: 0x7F0E0000
- public const int AlertDialog_AppCompat = 2131623936;
+ // aapt resource value: 0x7f0b009d
+ public const int AlertDialog_AppCompat = 2131427485;
- // aapt resource value: 0x7F0E0001
- public const int AlertDialog_AppCompat_Light = 2131623937;
+ // aapt resource value: 0x7f0b009e
+ public const int AlertDialog_AppCompat_Light = 2131427486;
- // aapt resource value: 0x7F0E0002
- public const int Animation_AppCompat_Dialog = 2131623938;
+ // aapt resource value: 0x7f0b009f
+ public const int Animation_AppCompat_Dialog = 2131427487;
- // aapt resource value: 0x7F0E0003
- public const int Animation_AppCompat_DropDownUp = 2131623939;
+ // aapt resource value: 0x7f0b00a0
+ public const int Animation_AppCompat_DropDownUp = 2131427488;
- // aapt resource value: 0x7F0E0004
- public const int Animation_AppCompat_Tooltip = 2131623940;
+ // aapt resource value: 0x7f0b00a1
+ public const int Animation_AppCompat_Tooltip = 2131427489;
- // aapt resource value: 0x7F0E0005
- public const int Animation_Design_BottomSheetDialog = 2131623941;
+ // aapt resource value: 0x7f0b0169
+ public const int Animation_Design_BottomSheetDialog = 2131427689;
- // aapt resource value: 0x7F0E0006
- public const int AppTheme = 2131623942;
+ // aapt resource value: 0x7f0b018a
+ public const int AppTheme = 2131427722;
- // aapt resource value: 0x7F0E0007
- public const int Base_AlertDialog_AppCompat = 2131623943;
+ // aapt resource value: 0x7f0b00a2
+ public const int Base_AlertDialog_AppCompat = 2131427490;
- // aapt resource value: 0x7F0E0008
- public const int Base_AlertDialog_AppCompat_Light = 2131623944;
+ // aapt resource value: 0x7f0b00a3
+ public const int Base_AlertDialog_AppCompat_Light = 2131427491;
- // aapt resource value: 0x7F0E0009
- public const int Base_Animation_AppCompat_Dialog = 2131623945;
+ // aapt resource value: 0x7f0b00a4
+ public const int Base_Animation_AppCompat_Dialog = 2131427492;
- // aapt resource value: 0x7F0E000A
- public const int Base_Animation_AppCompat_DropDownUp = 2131623946;
+ // aapt resource value: 0x7f0b00a5
+ public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
- // aapt resource value: 0x7F0E000B
- public const int Base_Animation_AppCompat_Tooltip = 2131623947;
+ // aapt resource value: 0x7f0b00a6
+ public const int Base_Animation_AppCompat_Tooltip = 2131427494;
- // aapt resource value: 0x7F0E000D
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131623949;
+ // aapt resource value: 0x7f0b00a7
+ public const int Base_DialogWindowTitle_AppCompat = 2131427495;
- // aapt resource value: 0x7F0E000C
- public const int Base_DialogWindowTitle_AppCompat = 2131623948;
+ // aapt resource value: 0x7f0b00a8
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
- // aapt resource value: 0x7F0E000E
- public const int Base_TextAppearance_AppCompat = 2131623950;
+ // aapt resource value: 0x7f0b0039
+ public const int Base_TextAppearance_AppCompat = 2131427385;
- // aapt resource value: 0x7F0E000F
- public const int Base_TextAppearance_AppCompat_Body1 = 2131623951;
+ // aapt resource value: 0x7f0b003a
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
- // aapt resource value: 0x7F0E0010
- public const int Base_TextAppearance_AppCompat_Body2 = 2131623952;
+ // aapt resource value: 0x7f0b003b
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
- // aapt resource value: 0x7F0E0011
- public const int Base_TextAppearance_AppCompat_Button = 2131623953;
+ // aapt resource value: 0x7f0b0027
+ public const int Base_TextAppearance_AppCompat_Button = 2131427367;
- // aapt resource value: 0x7F0E0012
- public const int Base_TextAppearance_AppCompat_Caption = 2131623954;
+ // aapt resource value: 0x7f0b003c
+ public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
- // aapt resource value: 0x7F0E0013
- public const int Base_TextAppearance_AppCompat_Display1 = 2131623955;
+ // aapt resource value: 0x7f0b003d
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
- // aapt resource value: 0x7F0E0014
- public const int Base_TextAppearance_AppCompat_Display2 = 2131623956;
+ // aapt resource value: 0x7f0b003e
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
- // aapt resource value: 0x7F0E0015
- public const int Base_TextAppearance_AppCompat_Display3 = 2131623957;
+ // aapt resource value: 0x7f0b003f
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
- // aapt resource value: 0x7F0E0016
- public const int Base_TextAppearance_AppCompat_Display4 = 2131623958;
+ // aapt resource value: 0x7f0b0040
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
- // aapt resource value: 0x7F0E0017
- public const int Base_TextAppearance_AppCompat_Headline = 2131623959;
+ // aapt resource value: 0x7f0b0041
+ public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
- // aapt resource value: 0x7F0E0018
- public const int Base_TextAppearance_AppCompat_Inverse = 2131623960;
+ // aapt resource value: 0x7f0b000b
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
- // aapt resource value: 0x7F0E0019
- public const int Base_TextAppearance_AppCompat_Large = 2131623961;
+ // aapt resource value: 0x7f0b0042
+ public const int Base_TextAppearance_AppCompat_Large = 2131427394;
- // aapt resource value: 0x7F0E001A
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623962;
+ // aapt resource value: 0x7f0b000c
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
- // aapt resource value: 0x7F0E001B
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623963;
+ // aapt resource value: 0x7f0b0043
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
- // aapt resource value: 0x7F0E001C
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623964;
+ // aapt resource value: 0x7f0b0044
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
- // aapt resource value: 0x7F0E001D
- public const int Base_TextAppearance_AppCompat_Medium = 2131623965;
+ // aapt resource value: 0x7f0b0045
+ public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
- // aapt resource value: 0x7F0E001E
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623966;
+ // aapt resource value: 0x7f0b000d
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
- // aapt resource value: 0x7F0E001F
- public const int Base_TextAppearance_AppCompat_Menu = 2131623967;
+ // aapt resource value: 0x7f0b0046
+ public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
- // aapt resource value: 0x7F0E0020
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131623968;
+ // aapt resource value: 0x7f0b00a9
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
- // aapt resource value: 0x7F0E0021
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623969;
+ // aapt resource value: 0x7f0b0047
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
- // aapt resource value: 0x7F0E0022
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623970;
+ // aapt resource value: 0x7f0b0048
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
- // aapt resource value: 0x7F0E0023
- public const int Base_TextAppearance_AppCompat_Small = 2131623971;
+ // aapt resource value: 0x7f0b0049
+ public const int Base_TextAppearance_AppCompat_Small = 2131427401;
- // aapt resource value: 0x7F0E0024
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623972;
+ // aapt resource value: 0x7f0b000e
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
- // aapt resource value: 0x7F0E0025
- public const int Base_TextAppearance_AppCompat_Subhead = 2131623973;
+ // aapt resource value: 0x7f0b004a
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
- // aapt resource value: 0x7F0E0026
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623974;
+ // aapt resource value: 0x7f0b000f
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
- // aapt resource value: 0x7F0E0027
- public const int Base_TextAppearance_AppCompat_Title = 2131623975;
+ // aapt resource value: 0x7f0b004b
+ public const int Base_TextAppearance_AppCompat_Title = 2131427403;
- // aapt resource value: 0x7F0E0028
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623976;
+ // aapt resource value: 0x7f0b0010
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
- // aapt resource value: 0x7F0E0029
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131623977;
+ // aapt resource value: 0x7f0b00aa
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
- // aapt resource value: 0x7F0E002A
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623978;
+ // aapt resource value: 0x7f0b008e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
- // aapt resource value: 0x7F0E002B
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623979;
+ // aapt resource value: 0x7f0b004c
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
- // aapt resource value: 0x7F0E002C
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623980;
+ // aapt resource value: 0x7f0b004d
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
- // aapt resource value: 0x7F0E002D
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623981;
+ // aapt resource value: 0x7f0b004e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
- // aapt resource value: 0x7F0E002E
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623982;
+ // aapt resource value: 0x7f0b004f
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
- // aapt resource value: 0x7F0E002F
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623983;
+ // aapt resource value: 0x7f0b0050
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
- // aapt resource value: 0x7F0E0030
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623984;
+ // aapt resource value: 0x7f0b0051
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
- // aapt resource value: 0x7F0E0031
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623985;
+ // aapt resource value: 0x7f0b0052
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
- // aapt resource value: 0x7F0E0032
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623986;
+ // aapt resource value: 0x7f0b0095
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
- // aapt resource value: 0x7F0E0033
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623987;
+ // aapt resource value: 0x7f0b0096
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
- // aapt resource value: 0x7F0E0034
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623988;
+ // aapt resource value: 0x7f0b008f
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
- // aapt resource value: 0x7F0E0035
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623989;
+ // aapt resource value: 0x7f0b00ab
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
- // aapt resource value: 0x7F0E0036
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623990;
+ // aapt resource value: 0x7f0b0053
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
- // aapt resource value: 0x7F0E0037
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623991;
+ // aapt resource value: 0x7f0b0054
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
- // aapt resource value: 0x7F0E0038
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623992;
+ // aapt resource value: 0x7f0b0055
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
- // aapt resource value: 0x7F0E0039
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623993;
+ // aapt resource value: 0x7f0b0056
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
- // aapt resource value: 0x7F0E003A
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623994;
+ // aapt resource value: 0x7f0b0057
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
- // aapt resource value: 0x7F0E003B
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623995;
+ // aapt resource value: 0x7f0b00ac
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
- // aapt resource value: 0x7F0E003C
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623996;
+ // aapt resource value: 0x7f0b0058
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
- // aapt resource value: 0x7F0E003D
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623997;
+ // aapt resource value: 0x7f0b0059
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
- // aapt resource value: 0x7F0E004C
- public const int Base_ThemeOverlay_AppCompat = 2131624012;
+ // aapt resource value: 0x7f0b005a
+ public const int Base_Theme_AppCompat = 2131427418;
- // aapt resource value: 0x7F0E004D
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624013;
+ // aapt resource value: 0x7f0b00ad
+ public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
- // aapt resource value: 0x7F0E004E
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131624014;
+ // aapt resource value: 0x7f0b0011
+ public const int Base_Theme_AppCompat_Dialog = 2131427345;
- // aapt resource value: 0x7F0E004F
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624015;
+ // aapt resource value: 0x7f0b0012
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
- // aapt resource value: 0x7F0E0050
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624016;
+ // aapt resource value: 0x7f0b00ae
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
- // aapt resource value: 0x7F0E0051
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624017;
+ // aapt resource value: 0x7f0b0013
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
- // aapt resource value: 0x7F0E0052
- public const int Base_ThemeOverlay_AppCompat_Light = 2131624018;
+ // aapt resource value: 0x7f0b0001
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
- // aapt resource value: 0x7F0E003E
- public const int Base_Theme_AppCompat = 2131623998;
+ // aapt resource value: 0x7f0b005b
+ public const int Base_Theme_AppCompat_Light = 2131427419;
- // aapt resource value: 0x7F0E003F
- public const int Base_Theme_AppCompat_CompactMenu = 2131623999;
+ // aapt resource value: 0x7f0b00af
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
- // aapt resource value: 0x7F0E0040
- public const int Base_Theme_AppCompat_Dialog = 2131624000;
+ // aapt resource value: 0x7f0b0014
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
- // aapt resource value: 0x7F0E0044
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624004;
+ // aapt resource value: 0x7f0b0015
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
- // aapt resource value: 0x7F0E0041
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131624001;
+ // aapt resource value: 0x7f0b00b0
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
- // aapt resource value: 0x7F0E0042
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624002;
+ // aapt resource value: 0x7f0b0016
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
- // aapt resource value: 0x7F0E0043
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624003;
+ // aapt resource value: 0x7f0b0002
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
- // aapt resource value: 0x7F0E0045
- public const int Base_Theme_AppCompat_Light = 2131624005;
+ // aapt resource value: 0x7f0b00b1
+ public const int Base_ThemeOverlay_AppCompat = 2131427505;
- // aapt resource value: 0x7F0E0046
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624006;
+ // aapt resource value: 0x7f0b00b2
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
- // aapt resource value: 0x7F0E0047
- public const int Base_Theme_AppCompat_Light_Dialog = 2131624007;
+ // aapt resource value: 0x7f0b00b3
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
- // aapt resource value: 0x7F0E004B
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624011;
+ // aapt resource value: 0x7f0b00b4
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
- // aapt resource value: 0x7F0E0048
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624008;
+ // aapt resource value: 0x7f0b0017
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
- // aapt resource value: 0x7F0E0049
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624009;
+ // aapt resource value: 0x7f0b0018
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
- // aapt resource value: 0x7F0E004A
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624010;
+ // aapt resource value: 0x7f0b00b5
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
- // aapt resource value: 0x7F0E0055
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624021;
+ // aapt resource value: 0x7f0b0019
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
- // aapt resource value: 0x7F0E0053
- public const int Base_V11_Theme_AppCompat_Dialog = 2131624019;
+ // aapt resource value: 0x7f0b001a
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
- // aapt resource value: 0x7F0E0054
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624020;
+ // aapt resource value: 0x7f0b001b
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
- // aapt resource value: 0x7F0E0056
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624022;
+ // aapt resource value: 0x7f0b0023
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
- // aapt resource value: 0x7F0E0057
- public const int Base_V12_Widget_AppCompat_EditText = 2131624023;
+ // aapt resource value: 0x7f0b0024
+ public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
- // aapt resource value: 0x7F0E0058
- public const int Base_V14_Widget_Design_AppBarLayout = 2131624024;
+ // aapt resource value: 0x7f0b016a
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
- // aapt resource value: 0x7F0E005D
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624029;
+ // aapt resource value: 0x7f0b005c
+ public const int Base_V21_Theme_AppCompat = 2131427420;
- // aapt resource value: 0x7F0E0059
- public const int Base_V21_Theme_AppCompat = 2131624025;
+ // aapt resource value: 0x7f0b005d
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
- // aapt resource value: 0x7F0E005A
- public const int Base_V21_Theme_AppCompat_Dialog = 2131624026;
+ // aapt resource value: 0x7f0b005e
+ public const int Base_V21_Theme_AppCompat_Light = 2131427422;
- // aapt resource value: 0x7F0E005B
- public const int Base_V21_Theme_AppCompat_Light = 2131624027;
+ // aapt resource value: 0x7f0b005f
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
- // aapt resource value: 0x7F0E005C
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624028;
+ // aapt resource value: 0x7f0b0060
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
- // aapt resource value: 0x7F0E005E
- public const int Base_V21_Widget_Design_AppBarLayout = 2131624030;
+ // aapt resource value: 0x7f0b0166
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
- // aapt resource value: 0x7F0E005F
- public const int Base_V22_Theme_AppCompat = 2131624031;
+ // aapt resource value: 0x7f0b008c
+ public const int Base_V22_Theme_AppCompat = 2131427468;
- // aapt resource value: 0x7F0E0060
- public const int Base_V22_Theme_AppCompat_Light = 2131624032;
+ // aapt resource value: 0x7f0b008d
+ public const int Base_V22_Theme_AppCompat_Light = 2131427469;
- // aapt resource value: 0x7F0E0061
- public const int Base_V23_Theme_AppCompat = 2131624033;
+ // aapt resource value: 0x7f0b0090
+ public const int Base_V23_Theme_AppCompat = 2131427472;
- // aapt resource value: 0x7F0E0062
- public const int Base_V23_Theme_AppCompat_Light = 2131624034;
+ // aapt resource value: 0x7f0b0091
+ public const int Base_V23_Theme_AppCompat_Light = 2131427473;
- // aapt resource value: 0x7F0E0063
- public const int Base_V26_Theme_AppCompat = 2131624035;
+ // aapt resource value: 0x7f0b0099
+ public const int Base_V26_Theme_AppCompat = 2131427481;
- // aapt resource value: 0x7F0E0064
- public const int Base_V26_Theme_AppCompat_Light = 2131624036;
+ // aapt resource value: 0x7f0b009a
+ public const int Base_V26_Theme_AppCompat_Light = 2131427482;
- // aapt resource value: 0x7F0E0065
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131624037;
+ // aapt resource value: 0x7f0b009b
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
- // aapt resource value: 0x7F0E0066
- public const int Base_V26_Widget_Design_AppBarLayout = 2131624038;
+ // aapt resource value: 0x7f0b0168
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
- // aapt resource value: 0x7F0E006B
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624043;
+ // aapt resource value: 0x7f0b00b6
+ public const int Base_V7_Theme_AppCompat = 2131427510;
- // aapt resource value: 0x7F0E0067
- public const int Base_V7_Theme_AppCompat = 2131624039;
+ // aapt resource value: 0x7f0b00b7
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
- // aapt resource value: 0x7F0E0068
- public const int Base_V7_Theme_AppCompat_Dialog = 2131624040;
+ // aapt resource value: 0x7f0b00b8
+ public const int Base_V7_Theme_AppCompat_Light = 2131427512;
- // aapt resource value: 0x7F0E0069
- public const int Base_V7_Theme_AppCompat_Light = 2131624041;
+ // aapt resource value: 0x7f0b00b9
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
- // aapt resource value: 0x7F0E006A
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624042;
+ // aapt resource value: 0x7f0b00ba
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
- // aapt resource value: 0x7F0E006C
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624044;
+ // aapt resource value: 0x7f0b00bb
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
- // aapt resource value: 0x7F0E006D
- public const int Base_V7_Widget_AppCompat_EditText = 2131624045;
+ // aapt resource value: 0x7f0b00bc
+ public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
- // aapt resource value: 0x7F0E006E
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131624046;
+ // aapt resource value: 0x7f0b00bd
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
- // aapt resource value: 0x7F0E006F
- public const int Base_Widget_AppCompat_ActionBar = 2131624047;
+ // aapt resource value: 0x7f0b00be
+ public const int Base_Widget_AppCompat_ActionBar = 2131427518;
- // aapt resource value: 0x7F0E0070
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624048;
+ // aapt resource value: 0x7f0b00bf
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
- // aapt resource value: 0x7F0E0071
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624049;
+ // aapt resource value: 0x7f0b00c0
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
- // aapt resource value: 0x7F0E0072
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624050;
+ // aapt resource value: 0x7f0b0061
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
- // aapt resource value: 0x7F0E0073
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624051;
+ // aapt resource value: 0x7f0b0062
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
- // aapt resource value: 0x7F0E0074
- public const int Base_Widget_AppCompat_ActionButton = 2131624052;
+ // aapt resource value: 0x7f0b0063
+ public const int Base_Widget_AppCompat_ActionButton = 2131427427;
- // aapt resource value: 0x7F0E0075
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624053;
+ // aapt resource value: 0x7f0b0064
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
- // aapt resource value: 0x7F0E0076
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624054;
+ // aapt resource value: 0x7f0b0065
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
- // aapt resource value: 0x7F0E0077
- public const int Base_Widget_AppCompat_ActionMode = 2131624055;
+ // aapt resource value: 0x7f0b00c1
+ public const int Base_Widget_AppCompat_ActionMode = 2131427521;
- // aapt resource value: 0x7F0E0078
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131624056;
+ // aapt resource value: 0x7f0b00c2
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
- // aapt resource value: 0x7F0E0079
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624057;
+ // aapt resource value: 0x7f0b0025
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
- // aapt resource value: 0x7F0E007A
- public const int Base_Widget_AppCompat_Button = 2131624058;
+ // aapt resource value: 0x7f0b0066
+ public const int Base_Widget_AppCompat_Button = 2131427430;
- // aapt resource value: 0x7F0E0080
- public const int Base_Widget_AppCompat_ButtonBar = 2131624064;
+ // aapt resource value: 0x7f0b0067
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
- // aapt resource value: 0x7F0E0081
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624065;
+ // aapt resource value: 0x7f0b0068
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
- // aapt resource value: 0x7F0E007B
- public const int Base_Widget_AppCompat_Button_Borderless = 2131624059;
+ // aapt resource value: 0x7f0b00c3
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
- // aapt resource value: 0x7F0E007C
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624060;
+ // aapt resource value: 0x7f0b0092
+ public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
- // aapt resource value: 0x7F0E007D
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624061;
+ // aapt resource value: 0x7f0b0069
+ public const int Base_Widget_AppCompat_Button_Small = 2131427433;
- // aapt resource value: 0x7F0E007E
- public const int Base_Widget_AppCompat_Button_Colored = 2131624062;
+ // aapt resource value: 0x7f0b006a
+ public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
- // aapt resource value: 0x7F0E007F
- public const int Base_Widget_AppCompat_Button_Small = 2131624063;
+ // aapt resource value: 0x7f0b00c4
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
- // aapt resource value: 0x7F0E0082
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624066;
+ // aapt resource value: 0x7f0b006b
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
- // aapt resource value: 0x7F0E0083
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624067;
+ // aapt resource value: 0x7f0b006c
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
- // aapt resource value: 0x7F0E0084
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624068;
+ // aapt resource value: 0x7f0b00c5
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
- // aapt resource value: 0x7F0E0085
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624069;
+ // aapt resource value: 0x7f0b0000
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
- // aapt resource value: 0x7F0E0086
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624070;
+ // aapt resource value: 0x7f0b00c6
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
- // aapt resource value: 0x7F0E0087
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624071;
+ // aapt resource value: 0x7f0b006d
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
- // aapt resource value: 0x7F0E0088
- public const int Base_Widget_AppCompat_EditText = 2131624072;
+ // aapt resource value: 0x7f0b0026
+ public const int Base_Widget_AppCompat_EditText = 2131427366;
- // aapt resource value: 0x7F0E0089
- public const int Base_Widget_AppCompat_ImageButton = 2131624073;
+ // aapt resource value: 0x7f0b006e
+ public const int Base_Widget_AppCompat_ImageButton = 2131427438;
- // aapt resource value: 0x7F0E008A
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131624074;
+ // aapt resource value: 0x7f0b00c7
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
- // aapt resource value: 0x7F0E008B
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624075;
+ // aapt resource value: 0x7f0b00c8
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
- // aapt resource value: 0x7F0E008C
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624076;
+ // aapt resource value: 0x7f0b00c9
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
- // aapt resource value: 0x7F0E008D
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624077;
+ // aapt resource value: 0x7f0b006f
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
- // aapt resource value: 0x7F0E008E
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624078;
+ // aapt resource value: 0x7f0b0070
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
- // aapt resource value: 0x7F0E008F
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624079;
+ // aapt resource value: 0x7f0b0071
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
- // aapt resource value: 0x7F0E0090
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624080;
+ // aapt resource value: 0x7f0b0072
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
- // aapt resource value: 0x7F0E0091
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624081;
+ // aapt resource value: 0x7f0b0073
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
- // aapt resource value: 0x7F0E0092
- public const int Base_Widget_AppCompat_ListMenuView = 2131624082;
+ // aapt resource value: 0x7f0b00ca
+ public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
- // aapt resource value: 0x7F0E0093
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131624083;
+ // aapt resource value: 0x7f0b0074
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
- // aapt resource value: 0x7F0E0094
- public const int Base_Widget_AppCompat_ListView = 2131624084;
+ // aapt resource value: 0x7f0b0075
+ public const int Base_Widget_AppCompat_ListView = 2131427445;
- // aapt resource value: 0x7F0E0095
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131624085;
+ // aapt resource value: 0x7f0b0076
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
- // aapt resource value: 0x7F0E0096
- public const int Base_Widget_AppCompat_ListView_Menu = 2131624086;
+ // aapt resource value: 0x7f0b0077
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
- // aapt resource value: 0x7F0E0097
- public const int Base_Widget_AppCompat_PopupMenu = 2131624087;
+ // aapt resource value: 0x7f0b0078
+ public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
- // aapt resource value: 0x7F0E0098
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624088;
+ // aapt resource value: 0x7f0b0079
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
- // aapt resource value: 0x7F0E0099
- public const int Base_Widget_AppCompat_PopupWindow = 2131624089;
+ // aapt resource value: 0x7f0b00cb
+ public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
- // aapt resource value: 0x7F0E009A
- public const int Base_Widget_AppCompat_ProgressBar = 2131624090;
+ // aapt resource value: 0x7f0b001c
+ public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
- // aapt resource value: 0x7F0E009B
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624091;
+ // aapt resource value: 0x7f0b001d
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
- // aapt resource value: 0x7F0E009C
- public const int Base_Widget_AppCompat_RatingBar = 2131624092;
+ // aapt resource value: 0x7f0b007a
+ public const int Base_Widget_AppCompat_RatingBar = 2131427450;
- // aapt resource value: 0x7F0E009D
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624093;
+ // aapt resource value: 0x7f0b0093
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
- // aapt resource value: 0x7F0E009E
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131624094;
+ // aapt resource value: 0x7f0b0094
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
- // aapt resource value: 0x7F0E009F
- public const int Base_Widget_AppCompat_SearchView = 2131624095;
+ // aapt resource value: 0x7f0b00cc
+ public const int Base_Widget_AppCompat_SearchView = 2131427532;
- // aapt resource value: 0x7F0E00A0
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624096;
+ // aapt resource value: 0x7f0b00cd
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
- // aapt resource value: 0x7F0E00A1
- public const int Base_Widget_AppCompat_SeekBar = 2131624097;
+ // aapt resource value: 0x7f0b007b
+ public const int Base_Widget_AppCompat_SeekBar = 2131427451;
- // aapt resource value: 0x7F0E00A2
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624098;
+ // aapt resource value: 0x7f0b00ce
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
- // aapt resource value: 0x7F0E00A3
- public const int Base_Widget_AppCompat_Spinner = 2131624099;
+ // aapt resource value: 0x7f0b007c
+ public const int Base_Widget_AppCompat_Spinner = 2131427452;
- // aapt resource value: 0x7F0E00A4
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624100;
+ // aapt resource value: 0x7f0b0003
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
- // aapt resource value: 0x7F0E00A5
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624101;
+ // aapt resource value: 0x7f0b007d
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
- // aapt resource value: 0x7F0E00A6
- public const int Base_Widget_AppCompat_Toolbar = 2131624102;
+ // aapt resource value: 0x7f0b009c
+ public const int Base_Widget_AppCompat_Toolbar = 2131427484;
- // aapt resource value: 0x7F0E00A7
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624103;
+ // aapt resource value: 0x7f0b007e
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
- // aapt resource value: 0x7F0E00A8
- public const int Base_Widget_Design_AppBarLayout = 2131624104;
+ // aapt resource value: 0x7f0b0167
+ public const int Base_Widget_Design_AppBarLayout = 2131427687;
- // aapt resource value: 0x7F0E00A9
- public const int Base_Widget_Design_TabLayout = 2131624105;
+ // aapt resource value: 0x7f0b016b
+ public const int Base_Widget_Design_TabLayout = 2131427691;
- // aapt resource value: 0x7F0E00AA
- public const int BottomSheetDialogAnimation = 2131624106;
+ // aapt resource value: 0x7f0b018b
+ public const int BottomSheetDialogAnimation = 2131427723;
- // aapt resource value: 0x7F0E0190
- public const int custom_dialog2 = 2131624336;
+ // aapt resource value: 0x7f0b0192
+ public const int DialogTheme = 2131427730;
- // aapt resource value: 0x7F0E00AB
- public const int DialogTheme = 2131624107;
+ // aapt resource value: 0x7f0b0190
+ public const int MyTheme = 2131427728;
- // aapt resource value: 0x7F0E00AC
- public const int MyTheme = 2131624108;
+ // aapt resource value: 0x7f0b0191
+ public const int MyTheme1 = 2131427729;
- // aapt resource value: 0x7F0E00AD
- public const int MyTheme1 = 2131624109;
+ // aapt resource value: 0x7f0b001e
+ public const int Platform_AppCompat = 2131427358;
- // aapt resource value: 0x7F0E0191
- public const int picker_view_scale_anim = 2131624337;
+ // aapt resource value: 0x7f0b001f
+ public const int Platform_AppCompat_Light = 2131427359;
- // aapt resource value: 0x7F0E0192
- public const int picker_view_slide_anim = 2131624338;
+ // aapt resource value: 0x7f0b007f
+ public const int Platform_ThemeOverlay_AppCompat = 2131427455;
- // aapt resource value: 0x7F0E00AE
- public const int Platform_AppCompat = 2131624110;
+ // aapt resource value: 0x7f0b0080
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
- // aapt resource value: 0x7F0E00AF
- public const int Platform_AppCompat_Light = 2131624111;
+ // aapt resource value: 0x7f0b0081
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
- // aapt resource value: 0x7F0E00B0
- public const int Platform_ThemeOverlay_AppCompat = 2131624112;
+ // aapt resource value: 0x7f0b0020
+ public const int Platform_V11_AppCompat = 2131427360;
- // aapt resource value: 0x7F0E00B1
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624113;
+ // aapt resource value: 0x7f0b0021
+ public const int Platform_V11_AppCompat_Light = 2131427361;
- // aapt resource value: 0x7F0E00B2
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131624114;
+ // aapt resource value: 0x7f0b0028
+ public const int Platform_V14_AppCompat = 2131427368;
- // aapt resource value: 0x7F0E00B3
- public const int Platform_V11_AppCompat = 2131624115;
+ // aapt resource value: 0x7f0b0029
+ public const int Platform_V14_AppCompat_Light = 2131427369;
- // aapt resource value: 0x7F0E00B4
- public const int Platform_V11_AppCompat_Light = 2131624116;
+ // aapt resource value: 0x7f0b0082
+ public const int Platform_V21_AppCompat = 2131427458;
- // aapt resource value: 0x7F0E00B5
- public const int Platform_V14_AppCompat = 2131624117;
+ // aapt resource value: 0x7f0b0083
+ public const int Platform_V21_AppCompat_Light = 2131427459;
- // aapt resource value: 0x7F0E00B6
- public const int Platform_V14_AppCompat_Light = 2131624118;
+ // aapt resource value: 0x7f0b0097
+ public const int Platform_V25_AppCompat = 2131427479;
- // aapt resource value: 0x7F0E00B7
- public const int Platform_V21_AppCompat = 2131624119;
+ // aapt resource value: 0x7f0b0098
+ public const int Platform_V25_AppCompat_Light = 2131427480;
- // aapt resource value: 0x7F0E00B8
- public const int Platform_V21_AppCompat_Light = 2131624120;
+ // aapt resource value: 0x7f0b0022
+ public const int Platform_Widget_AppCompat_Spinner = 2131427362;
- // aapt resource value: 0x7F0E00B9
- public const int Platform_V25_AppCompat = 2131624121;
+ // aapt resource value: 0x7f0b002b
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
- // aapt resource value: 0x7F0E00BA
- public const int Platform_V25_AppCompat_Light = 2131624122;
+ // aapt resource value: 0x7f0b002c
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
- // aapt resource value: 0x7F0E00BB
- public const int Platform_Widget_AppCompat_Spinner = 2131624123;
+ // aapt resource value: 0x7f0b002d
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
- // aapt resource value: 0x7F0E00BC
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624124;
+ // aapt resource value: 0x7f0b002e
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
- // aapt resource value: 0x7F0E00BD
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624125;
+ // aapt resource value: 0x7f0b002f
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
- // aapt resource value: 0x7F0E00BE
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624126;
+ // aapt resource value: 0x7f0b0030
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
- // aapt resource value: 0x7F0E00BF
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624127;
+ // aapt resource value: 0x7f0b0031
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
- // aapt resource value: 0x7F0E00C0
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624128;
+ // aapt resource value: 0x7f0b0032
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
- // aapt resource value: 0x7F0E00C1
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624129;
+ // aapt resource value: 0x7f0b0033
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
- // aapt resource value: 0x7F0E00C7
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624135;
+ // aapt resource value: 0x7f0b0034
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
- // aapt resource value: 0x7F0E00C2
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624130;
+ // aapt resource value: 0x7f0b0035
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
- // aapt resource value: 0x7F0E00C3
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624131;
+ // aapt resource value: 0x7f0b0036
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
- // aapt resource value: 0x7F0E00C4
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624132;
+ // aapt resource value: 0x7f0b0037
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
- // aapt resource value: 0x7F0E00C5
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624133;
+ // aapt resource value: 0x7f0b0038
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
- // aapt resource value: 0x7F0E00C6
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624134;
+ // aapt resource value: 0x7f0b00cf
+ public const int TextAppearance_AppCompat = 2131427535;
- // aapt resource value: 0x7F0E00C8
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624136;
+ // aapt resource value: 0x7f0b00d0
+ public const int TextAppearance_AppCompat_Body1 = 2131427536;
- // aapt resource value: 0x7F0E00C9
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624137;
+ // aapt resource value: 0x7f0b00d1
+ public const int TextAppearance_AppCompat_Body2 = 2131427537;
- // aapt resource value: 0x7F0E00CA
- public const int TextAppearance_AppCompat = 2131624138;
+ // aapt resource value: 0x7f0b00d2
+ public const int TextAppearance_AppCompat_Button = 2131427538;
- // aapt resource value: 0x7F0E00CB
- public const int TextAppearance_AppCompat_Body1 = 2131624139;
+ // aapt resource value: 0x7f0b00d3
+ public const int TextAppearance_AppCompat_Caption = 2131427539;
- // aapt resource value: 0x7F0E00CC
- public const int TextAppearance_AppCompat_Body2 = 2131624140;
+ // aapt resource value: 0x7f0b00d4
+ public const int TextAppearance_AppCompat_Display1 = 2131427540;
- // aapt resource value: 0x7F0E00CD
- public const int TextAppearance_AppCompat_Button = 2131624141;
+ // aapt resource value: 0x7f0b00d5
+ public const int TextAppearance_AppCompat_Display2 = 2131427541;
- // aapt resource value: 0x7F0E00CE
- public const int TextAppearance_AppCompat_Caption = 2131624142;
+ // aapt resource value: 0x7f0b00d6
+ public const int TextAppearance_AppCompat_Display3 = 2131427542;
- // aapt resource value: 0x7F0E00CF
- public const int TextAppearance_AppCompat_Display1 = 2131624143;
+ // aapt resource value: 0x7f0b00d7
+ public const int TextAppearance_AppCompat_Display4 = 2131427543;
- // aapt resource value: 0x7F0E00D0
- public const int TextAppearance_AppCompat_Display2 = 2131624144;
+ // aapt resource value: 0x7f0b00d8
+ public const int TextAppearance_AppCompat_Headline = 2131427544;
- // aapt resource value: 0x7F0E00D1
- public const int TextAppearance_AppCompat_Display3 = 2131624145;
+ // aapt resource value: 0x7f0b00d9
+ public const int TextAppearance_AppCompat_Inverse = 2131427545;
- // aapt resource value: 0x7F0E00D2
- public const int TextAppearance_AppCompat_Display4 = 2131624146;
+ // aapt resource value: 0x7f0b00da
+ public const int TextAppearance_AppCompat_Large = 2131427546;
- // aapt resource value: 0x7F0E00D3
- public const int TextAppearance_AppCompat_Headline = 2131624147;
+ // aapt resource value: 0x7f0b00db
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
- // aapt resource value: 0x7F0E00D4
- public const int TextAppearance_AppCompat_Inverse = 2131624148;
+ // aapt resource value: 0x7f0b00dc
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
- // aapt resource value: 0x7F0E00D5
- public const int TextAppearance_AppCompat_Large = 2131624149;
+ // aapt resource value: 0x7f0b00dd
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
- // aapt resource value: 0x7F0E00D6
- public const int TextAppearance_AppCompat_Large_Inverse = 2131624150;
+ // aapt resource value: 0x7f0b00de
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
- // aapt resource value: 0x7F0E00D7
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624151;
+ // aapt resource value: 0x7f0b00df
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
- // aapt resource value: 0x7F0E00D8
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624152;
+ // aapt resource value: 0x7f0b00e0
+ public const int TextAppearance_AppCompat_Medium = 2131427552;
- // aapt resource value: 0x7F0E00D9
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624153;
+ // aapt resource value: 0x7f0b00e1
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
- // aapt resource value: 0x7F0E00DA
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624154;
+ // aapt resource value: 0x7f0b00e2
+ public const int TextAppearance_AppCompat_Menu = 2131427554;
- // aapt resource value: 0x7F0E00DB
- public const int TextAppearance_AppCompat_Medium = 2131624155;
+ // aapt resource value: 0x7f0b0084
+ public const int TextAppearance_AppCompat_Notification = 2131427460;
- // aapt resource value: 0x7F0E00DC
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131624156;
+ // aapt resource value: 0x7f0b0085
+ public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
- // aapt resource value: 0x7F0E00DD
- public const int TextAppearance_AppCompat_Menu = 2131624157;
+ // aapt resource value: 0x7f0b0086
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
- // aapt resource value: 0x7F0E00DE
- public const int TextAppearance_AppCompat_Notification = 2131624158;
+ // aapt resource value: 0x7f0b00e3
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
- // aapt resource value: 0x7F0E00DF
- public const int TextAppearance_AppCompat_Notification_Info = 2131624159;
+ // aapt resource value: 0x7f0b00e4
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
- // aapt resource value: 0x7F0E00E0
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624160;
+ // aapt resource value: 0x7f0b0087
+ public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
- // aapt resource value: 0x7F0E00E1
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131624161;
+ // aapt resource value: 0x7f0b0088
+ public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
- // aapt resource value: 0x7F0E00E2
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624162;
+ // aapt resource value: 0x7f0b0089
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
- // aapt resource value: 0x7F0E00E3
- public const int TextAppearance_AppCompat_Notification_Media = 2131624163;
+ // aapt resource value: 0x7f0b008a
+ public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
- // aapt resource value: 0x7F0E00E4
- public const int TextAppearance_AppCompat_Notification_Time = 2131624164;
+ // aapt resource value: 0x7f0b008b
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
- // aapt resource value: 0x7F0E00E5
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624165;
+ // aapt resource value: 0x7f0b00e5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
- // aapt resource value: 0x7F0E00E6
- public const int TextAppearance_AppCompat_Notification_Title = 2131624166;
+ // aapt resource value: 0x7f0b00e6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
- // aapt resource value: 0x7F0E00E7
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624167;
+ // aapt resource value: 0x7f0b00e7
+ public const int TextAppearance_AppCompat_Small = 2131427559;
- // aapt resource value: 0x7F0E00E8
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624168;
+ // aapt resource value: 0x7f0b00e8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
- // aapt resource value: 0x7F0E00E9
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131624169;
+ // aapt resource value: 0x7f0b00e9
+ public const int TextAppearance_AppCompat_Subhead = 2131427561;
- // aapt resource value: 0x7F0E00EA
- public const int TextAppearance_AppCompat_Small = 2131624170;
+ // aapt resource value: 0x7f0b00ea
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
- // aapt resource value: 0x7F0E00EB
- public const int TextAppearance_AppCompat_Small_Inverse = 2131624171;
+ // aapt resource value: 0x7f0b00eb
+ public const int TextAppearance_AppCompat_Title = 2131427563;
- // aapt resource value: 0x7F0E00EC
- public const int TextAppearance_AppCompat_Subhead = 2131624172;
+ // aapt resource value: 0x7f0b00ec
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
- // aapt resource value: 0x7F0E00ED
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624173;
+ // aapt resource value: 0x7f0b002a
+ public const int TextAppearance_AppCompat_Tooltip = 2131427370;
- // aapt resource value: 0x7F0E00EE
- public const int TextAppearance_AppCompat_Title = 2131624174;
+ // aapt resource value: 0x7f0b00ed
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
- // aapt resource value: 0x7F0E00EF
- public const int TextAppearance_AppCompat_Title_Inverse = 2131624175;
+ // aapt resource value: 0x7f0b00ee
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
- // aapt resource value: 0x7F0E00F0
- public const int TextAppearance_AppCompat_Tooltip = 2131624176;
+ // aapt resource value: 0x7f0b00ef
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
- // aapt resource value: 0x7F0E00F1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624177;
+ // aapt resource value: 0x7f0b00f0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
- // aapt resource value: 0x7F0E00F2
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624178;
+ // aapt resource value: 0x7f0b00f1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
- // aapt resource value: 0x7F0E00F3
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624179;
+ // aapt resource value: 0x7f0b00f2
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
- // aapt resource value: 0x7F0E00F4
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624180;
+ // aapt resource value: 0x7f0b00f3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
- // aapt resource value: 0x7F0E00F5
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624181;
+ // aapt resource value: 0x7f0b00f4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
- // aapt resource value: 0x7F0E00F6
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624182;
+ // aapt resource value: 0x7f0b00f5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
- // aapt resource value: 0x7F0E00F7
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624183;
+ // aapt resource value: 0x7f0b00f6
+ public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
- // aapt resource value: 0x7F0E00F8
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624184;
+ // aapt resource value: 0x7f0b00f7
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
- // aapt resource value: 0x7F0E00F9
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624185;
+ // aapt resource value: 0x7f0b00f8
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
- // aapt resource value: 0x7F0E00FA
- public const int TextAppearance_AppCompat_Widget_Button = 2131624186;
+ // aapt resource value: 0x7f0b00f9
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
- // aapt resource value: 0x7F0E00FB
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624187;
+ // aapt resource value: 0x7f0b00fa
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
- // aapt resource value: 0x7F0E00FC
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624188;
+ // aapt resource value: 0x7f0b00fb
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
- // aapt resource value: 0x7F0E00FD
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624189;
+ // aapt resource value: 0x7f0b00fc
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
- // aapt resource value: 0x7F0E00FE
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624190;
+ // aapt resource value: 0x7f0b00fd
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
- // aapt resource value: 0x7F0E00FF
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624191;
+ // aapt resource value: 0x7f0b00fe
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
- // aapt resource value: 0x7F0E0100
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624192;
+ // aapt resource value: 0x7f0b00ff
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
- // aapt resource value: 0x7F0E0101
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624193;
+ // aapt resource value: 0x7f0b0183
+ public const int TextAppearance_Compat_Notification = 2131427715;
- // aapt resource value: 0x7F0E0102
- public const int TextAppearance_AppCompat_Widget_Switch = 2131624194;
+ // aapt resource value: 0x7f0b0184
+ public const int TextAppearance_Compat_Notification_Info = 2131427716;
- // aapt resource value: 0x7F0E0103
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624195;
+ // aapt resource value: 0x7f0b0160
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
- // aapt resource value: 0x7F0E0104
- public const int TextAppearance_Compat_Notification = 2131624196;
+ // aapt resource value: 0x7f0b0189
+ public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
- // aapt resource value: 0x7F0E0105
- public const int TextAppearance_Compat_Notification_Info = 2131624197;
+ // aapt resource value: 0x7f0b0164
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
- // aapt resource value: 0x7F0E0106
- public const int TextAppearance_Compat_Notification_Info_Media = 2131624198;
+ // aapt resource value: 0x7f0b0161
+ public const int TextAppearance_Compat_Notification_Media = 2131427681;
- // aapt resource value: 0x7F0E0107
- public const int TextAppearance_Compat_Notification_Line2 = 2131624199;
+ // aapt resource value: 0x7f0b0185
+ public const int TextAppearance_Compat_Notification_Time = 2131427717;
- // aapt resource value: 0x7F0E0108
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131624200;
+ // aapt resource value: 0x7f0b0162
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
- // aapt resource value: 0x7F0E0109
- public const int TextAppearance_Compat_Notification_Media = 2131624201;
+ // aapt resource value: 0x7f0b0186
+ public const int TextAppearance_Compat_Notification_Title = 2131427718;
- // aapt resource value: 0x7F0E010A
- public const int TextAppearance_Compat_Notification_Time = 2131624202;
+ // aapt resource value: 0x7f0b0163
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
- // aapt resource value: 0x7F0E010B
- public const int TextAppearance_Compat_Notification_Time_Media = 2131624203;
+ // aapt resource value: 0x7f0b016c
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
- // aapt resource value: 0x7F0E010C
- public const int TextAppearance_Compat_Notification_Title = 2131624204;
+ // aapt resource value: 0x7f0b016d
+ public const int TextAppearance_Design_Counter = 2131427693;
- // aapt resource value: 0x7F0E010D
- public const int TextAppearance_Compat_Notification_Title_Media = 2131624205;
+ // aapt resource value: 0x7f0b016e
+ public const int TextAppearance_Design_Counter_Overflow = 2131427694;
- // aapt resource value: 0x7F0E010E
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624206;
+ // aapt resource value: 0x7f0b016f
+ public const int TextAppearance_Design_Error = 2131427695;
- // aapt resource value: 0x7F0E010F
- public const int TextAppearance_Design_Counter = 2131624207;
+ // aapt resource value: 0x7f0b0170
+ public const int TextAppearance_Design_Hint = 2131427696;
- // aapt resource value: 0x7F0E0110
- public const int TextAppearance_Design_Counter_Overflow = 2131624208;
+ // aapt resource value: 0x7f0b0171
+ public const int TextAppearance_Design_Snackbar_Message = 2131427697;
- // aapt resource value: 0x7F0E0111
- public const int TextAppearance_Design_Error = 2131624209;
+ // aapt resource value: 0x7f0b0172
+ public const int TextAppearance_Design_Tab = 2131427698;
- // aapt resource value: 0x7F0E0112
- public const int TextAppearance_Design_Hint = 2131624210;
+ // aapt resource value: 0x7f0b0100
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
- // aapt resource value: 0x7F0E0113
- public const int TextAppearance_Design_Snackbar_Message = 2131624211;
+ // aapt resource value: 0x7f0b0101
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
- // aapt resource value: 0x7F0E0114
- public const int TextAppearance_Design_Tab = 2131624212;
+ // aapt resource value: 0x7f0b0102
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
- // aapt resource value: 0x7F0E0115
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624213;
+ // aapt resource value: 0x7f0b0103
+ public const int Theme_AppCompat = 2131427587;
- // aapt resource value: 0x7F0E0116
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624214;
+ // aapt resource value: 0x7f0b0104
+ public const int Theme_AppCompat_CompactMenu = 2131427588;
- // aapt resource value: 0x7F0E0117
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624215;
+ // aapt resource value: 0x7f0b0004
+ public const int Theme_AppCompat_DayNight = 2131427332;
- // aapt resource value: 0x7F0E0134
- public const int ThemeOverlay_AppCompat = 2131624244;
+ // aapt resource value: 0x7f0b0005
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
- // aapt resource value: 0x7F0E0135
- public const int ThemeOverlay_AppCompat_ActionBar = 2131624245;
+ // aapt resource value: 0x7f0b0006
+ public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
- // aapt resource value: 0x7F0E0136
- public const int ThemeOverlay_AppCompat_Dark = 2131624246;
+ // aapt resource value: 0x7f0b0007
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
- // aapt resource value: 0x7F0E0137
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624247;
+ // aapt resource value: 0x7f0b0008
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
- // aapt resource value: 0x7F0E0138
- public const int ThemeOverlay_AppCompat_Dialog = 2131624248;
+ // aapt resource value: 0x7f0b0009
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
- // aapt resource value: 0x7F0E0139
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624249;
+ // aapt resource value: 0x7f0b000a
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
- // aapt resource value: 0x7F0E013A
- public const int ThemeOverlay_AppCompat_Light = 2131624250;
+ // aapt resource value: 0x7f0b0105
+ public const int Theme_AppCompat_Dialog = 2131427589;
- // aapt resource value: 0x7F0E0118
- public const int Theme_AppCompat = 2131624216;
+ // aapt resource value: 0x7f0b0106
+ public const int Theme_AppCompat_Dialog_Alert = 2131427590;
- // aapt resource value: 0x7F0E0119
- public const int Theme_AppCompat_CompactMenu = 2131624217;
+ // aapt resource value: 0x7f0b0107
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
- // aapt resource value: 0x7F0E011A
- public const int Theme_AppCompat_DayNight = 2131624218;
+ // aapt resource value: 0x7f0b0108
+ public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
- // aapt resource value: 0x7F0E011B
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624219;
+ // aapt resource value: 0x7f0b0109
+ public const int Theme_AppCompat_Light = 2131427593;
- // aapt resource value: 0x7F0E011C
- public const int Theme_AppCompat_DayNight_Dialog = 2131624220;
+ // aapt resource value: 0x7f0b010a
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
- // aapt resource value: 0x7F0E011F
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624223;
+ // aapt resource value: 0x7f0b010b
+ public const int Theme_AppCompat_Light_Dialog = 2131427595;
- // aapt resource value: 0x7F0E011D
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624221;
+ // aapt resource value: 0x7f0b010c
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
- // aapt resource value: 0x7F0E011E
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624222;
+ // aapt resource value: 0x7f0b010d
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
- // aapt resource value: 0x7F0E0120
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131624224;
+ // aapt resource value: 0x7f0b010e
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
- // aapt resource value: 0x7F0E0121
- public const int Theme_AppCompat_Dialog = 2131624225;
+ // aapt resource value: 0x7f0b010f
+ public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
- // aapt resource value: 0x7F0E0124
- public const int Theme_AppCompat_DialogWhenLarge = 2131624228;
+ // aapt resource value: 0x7f0b0110
+ public const int Theme_AppCompat_NoActionBar = 2131427600;
- // aapt resource value: 0x7F0E0122
- public const int Theme_AppCompat_Dialog_Alert = 2131624226;
+ // aapt resource value: 0x7f0b018c
+ public const int Theme_BiometricPromptDialog = 2131427724;
- // aapt resource value: 0x7F0E0123
- public const int Theme_AppCompat_Dialog_MinWidth = 2131624227;
+ // aapt resource value: 0x7f0b0173
+ public const int Theme_Design = 2131427699;
- // aapt resource value: 0x7F0E0125
- public const int Theme_AppCompat_Light = 2131624229;
+ // aapt resource value: 0x7f0b0174
+ public const int Theme_Design_BottomSheetDialog = 2131427700;
- // aapt resource value: 0x7F0E0126
- public const int Theme_AppCompat_Light_DarkActionBar = 2131624230;
+ // aapt resource value: 0x7f0b0175
+ public const int Theme_Design_Light = 2131427701;
- // aapt resource value: 0x7F0E0127
- public const int Theme_AppCompat_Light_Dialog = 2131624231;
+ // aapt resource value: 0x7f0b0176
+ public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
- // aapt resource value: 0x7F0E012A
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624234;
+ // aapt resource value: 0x7f0b0177
+ public const int Theme_Design_Light_NoActionBar = 2131427703;
- // aapt resource value: 0x7F0E0128
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131624232;
+ // aapt resource value: 0x7f0b0178
+ public const int Theme_Design_NoActionBar = 2131427704;
- // aapt resource value: 0x7F0E0129
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624233;
+ // aapt resource value: 0x7f0b0111
+ public const int ThemeOverlay_AppCompat = 2131427601;
- // aapt resource value: 0x7F0E012B
- public const int Theme_AppCompat_Light_NoActionBar = 2131624235;
+ // aapt resource value: 0x7f0b0112
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
- // aapt resource value: 0x7F0E012C
- public const int Theme_AppCompat_NoActionBar = 2131624236;
+ // aapt resource value: 0x7f0b0113
+ public const int ThemeOverlay_AppCompat_Dark = 2131427603;
- // aapt resource value: 0x7F0E012D
- public const int Theme_BiometricPromptDialog = 2131624237;
+ // aapt resource value: 0x7f0b0114
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
- // aapt resource value: 0x7F0E012E
- public const int Theme_Design = 2131624238;
+ // aapt resource value: 0x7f0b0115
+ public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
- // aapt resource value: 0x7F0E012F
- public const int Theme_Design_BottomSheetDialog = 2131624239;
+ // aapt resource value: 0x7f0b0116
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
- // aapt resource value: 0x7F0E0130
- public const int Theme_Design_Light = 2131624240;
+ // aapt resource value: 0x7f0b0117
+ public const int ThemeOverlay_AppCompat_Light = 2131427607;
- // aapt resource value: 0x7F0E0131
- public const int Theme_Design_Light_BottomSheetDialog = 2131624241;
+ // aapt resource value: 0x7f0b0118
+ public const int Widget_AppCompat_ActionBar = 2131427608;
- // aapt resource value: 0x7F0E0132
- public const int Theme_Design_Light_NoActionBar = 2131624242;
+ // aapt resource value: 0x7f0b0119
+ public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
- // aapt resource value: 0x7F0E0133
- public const int Theme_Design_NoActionBar = 2131624243;
+ // aapt resource value: 0x7f0b011a
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
- // aapt resource value: 0x7F0E013B
- public const int Widget_AppCompat_ActionBar = 2131624251;
+ // aapt resource value: 0x7f0b011b
+ public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
- // aapt resource value: 0x7F0E013C
- public const int Widget_AppCompat_ActionBar_Solid = 2131624252;
+ // aapt resource value: 0x7f0b011c
+ public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
- // aapt resource value: 0x7F0E013D
- public const int Widget_AppCompat_ActionBar_TabBar = 2131624253;
+ // aapt resource value: 0x7f0b011d
+ public const int Widget_AppCompat_ActionButton = 2131427613;
- // aapt resource value: 0x7F0E013E
- public const int Widget_AppCompat_ActionBar_TabText = 2131624254;
+ // aapt resource value: 0x7f0b011e
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
- // aapt resource value: 0x7F0E013F
- public const int Widget_AppCompat_ActionBar_TabView = 2131624255;
+ // aapt resource value: 0x7f0b011f
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
- // aapt resource value: 0x7F0E0140
- public const int Widget_AppCompat_ActionButton = 2131624256;
+ // aapt resource value: 0x7f0b0120
+ public const int Widget_AppCompat_ActionMode = 2131427616;
- // aapt resource value: 0x7F0E0141
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131624257;
+ // aapt resource value: 0x7f0b0121
+ public const int Widget_AppCompat_ActivityChooserView = 2131427617;
- // aapt resource value: 0x7F0E0142
- public const int Widget_AppCompat_ActionButton_Overflow = 2131624258;
+ // aapt resource value: 0x7f0b0122
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
- // aapt resource value: 0x7F0E0143
- public const int Widget_AppCompat_ActionMode = 2131624259;
+ // aapt resource value: 0x7f0b0123
+ public const int Widget_AppCompat_Button = 2131427619;
- // aapt resource value: 0x7F0E0144
- public const int Widget_AppCompat_ActivityChooserView = 2131624260;
+ // aapt resource value: 0x7f0b0124
+ public const int Widget_AppCompat_Button_Borderless = 2131427620;
- // aapt resource value: 0x7F0E0145
- public const int Widget_AppCompat_AutoCompleteTextView = 2131624261;
+ // aapt resource value: 0x7f0b0125
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
- // aapt resource value: 0x7F0E0146
- public const int Widget_AppCompat_Button = 2131624262;
+ // aapt resource value: 0x7f0b0126
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
- // aapt resource value: 0x7F0E014C
- public const int Widget_AppCompat_ButtonBar = 2131624268;
+ // aapt resource value: 0x7f0b0127
+ public const int Widget_AppCompat_Button_Colored = 2131427623;
- // aapt resource value: 0x7F0E014D
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624269;
+ // aapt resource value: 0x7f0b0128
+ public const int Widget_AppCompat_Button_Small = 2131427624;
- // aapt resource value: 0x7F0E0147
- public const int Widget_AppCompat_Button_Borderless = 2131624263;
+ // aapt resource value: 0x7f0b0129
+ public const int Widget_AppCompat_ButtonBar = 2131427625;
- // aapt resource value: 0x7F0E0148
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131624264;
+ // aapt resource value: 0x7f0b012a
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
- // aapt resource value: 0x7F0E0149
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624265;
+ // aapt resource value: 0x7f0b012b
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
- // aapt resource value: 0x7F0E014A
- public const int Widget_AppCompat_Button_Colored = 2131624266;
+ // aapt resource value: 0x7f0b012c
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
- // aapt resource value: 0x7F0E014B
- public const int Widget_AppCompat_Button_Small = 2131624267;
+ // aapt resource value: 0x7f0b012d
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
- // aapt resource value: 0x7F0E014E
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624270;
+ // aapt resource value: 0x7f0b012e
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
- // aapt resource value: 0x7F0E014F
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624271;
+ // aapt resource value: 0x7f0b012f
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
- // aapt resource value: 0x7F0E0150
- public const int Widget_AppCompat_CompoundButton_Switch = 2131624272;
+ // aapt resource value: 0x7f0b0130
+ public const int Widget_AppCompat_EditText = 2131427632;
- // aapt resource value: 0x7F0E0151
- public const int Widget_AppCompat_DrawerArrowToggle = 2131624273;
+ // aapt resource value: 0x7f0b0131
+ public const int Widget_AppCompat_ImageButton = 2131427633;
- // aapt resource value: 0x7F0E0152
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131624274;
+ // aapt resource value: 0x7f0b0132
+ public const int Widget_AppCompat_Light_ActionBar = 2131427634;
- // aapt resource value: 0x7F0E0153
- public const int Widget_AppCompat_EditText = 2131624275;
+ // aapt resource value: 0x7f0b0133
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
- // aapt resource value: 0x7F0E0154
- public const int Widget_AppCompat_ImageButton = 2131624276;
+ // aapt resource value: 0x7f0b0134
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
- // aapt resource value: 0x7F0E0155
- public const int Widget_AppCompat_Light_ActionBar = 2131624277;
+ // aapt resource value: 0x7f0b0135
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
- // aapt resource value: 0x7F0E0156
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624278;
+ // aapt resource value: 0x7f0b0136
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
- // aapt resource value: 0x7F0E0157
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624279;
+ // aapt resource value: 0x7f0b0137
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
- // aapt resource value: 0x7F0E0158
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624280;
+ // aapt resource value: 0x7f0b0138
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
- // aapt resource value: 0x7F0E0159
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624281;
+ // aapt resource value: 0x7f0b0139
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
- // aapt resource value: 0x7F0E015A
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624282;
+ // aapt resource value: 0x7f0b013a
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
- // aapt resource value: 0x7F0E015B
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624283;
+ // aapt resource value: 0x7f0b013b
+ public const int Widget_AppCompat_Light_ActionButton = 2131427643;
- // aapt resource value: 0x7F0E015C
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624284;
+ // aapt resource value: 0x7f0b013c
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
- // aapt resource value: 0x7F0E015D
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624285;
+ // aapt resource value: 0x7f0b013d
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
- // aapt resource value: 0x7F0E015E
- public const int Widget_AppCompat_Light_ActionButton = 2131624286;
+ // aapt resource value: 0x7f0b013e
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
- // aapt resource value: 0x7F0E015F
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624287;
+ // aapt resource value: 0x7f0b013f
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
- // aapt resource value: 0x7F0E0160
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624288;
+ // aapt resource value: 0x7f0b0140
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
- // aapt resource value: 0x7F0E0161
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624289;
+ // aapt resource value: 0x7f0b0141
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
- // aapt resource value: 0x7F0E0162
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131624290;
+ // aapt resource value: 0x7f0b0142
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
- // aapt resource value: 0x7F0E0163
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624291;
+ // aapt resource value: 0x7f0b0143
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
- // aapt resource value: 0x7F0E0164
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624292;
+ // aapt resource value: 0x7f0b0144
+ public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
- // aapt resource value: 0x7F0E0165
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131624293;
+ // aapt resource value: 0x7f0b0145
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
- // aapt resource value: 0x7F0E0166
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131624294;
+ // aapt resource value: 0x7f0b0146
+ public const int Widget_AppCompat_Light_SearchView = 2131427654;
- // aapt resource value: 0x7F0E0167
- public const int Widget_AppCompat_Light_PopupMenu = 2131624295;
+ // aapt resource value: 0x7f0b0147
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
- // aapt resource value: 0x7F0E0168
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624296;
+ // aapt resource value: 0x7f0b0148
+ public const int Widget_AppCompat_ListMenuView = 2131427656;
- // aapt resource value: 0x7F0E0169
- public const int Widget_AppCompat_Light_SearchView = 2131624297;
+ // aapt resource value: 0x7f0b0149
+ public const int Widget_AppCompat_ListPopupWindow = 2131427657;
- // aapt resource value: 0x7F0E016A
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624298;
+ // aapt resource value: 0x7f0b014a
+ public const int Widget_AppCompat_ListView = 2131427658;
- // aapt resource value: 0x7F0E016B
- public const int Widget_AppCompat_ListMenuView = 2131624299;
+ // aapt resource value: 0x7f0b014b
+ public const int Widget_AppCompat_ListView_DropDown = 2131427659;
- // aapt resource value: 0x7F0E016C
- public const int Widget_AppCompat_ListPopupWindow = 2131624300;
+ // aapt resource value: 0x7f0b014c
+ public const int Widget_AppCompat_ListView_Menu = 2131427660;
- // aapt resource value: 0x7F0E016D
- public const int Widget_AppCompat_ListView = 2131624301;
+ // aapt resource value: 0x7f0b014d
+ public const int Widget_AppCompat_PopupMenu = 2131427661;
- // aapt resource value: 0x7F0E016E
- public const int Widget_AppCompat_ListView_DropDown = 2131624302;
+ // aapt resource value: 0x7f0b014e
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
- // aapt resource value: 0x7F0E016F
- public const int Widget_AppCompat_ListView_Menu = 2131624303;
+ // aapt resource value: 0x7f0b014f
+ public const int Widget_AppCompat_PopupWindow = 2131427663;
- // aapt resource value: 0x7F0E0170
- public const int Widget_AppCompat_PopupMenu = 2131624304;
+ // aapt resource value: 0x7f0b0150
+ public const int Widget_AppCompat_ProgressBar = 2131427664;
- // aapt resource value: 0x7F0E0171
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131624305;
+ // aapt resource value: 0x7f0b0151
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
- // aapt resource value: 0x7F0E0172
- public const int Widget_AppCompat_PopupWindow = 2131624306;
+ // aapt resource value: 0x7f0b0152
+ public const int Widget_AppCompat_RatingBar = 2131427666;
- // aapt resource value: 0x7F0E0173
- public const int Widget_AppCompat_ProgressBar = 2131624307;
+ // aapt resource value: 0x7f0b0153
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
- // aapt resource value: 0x7F0E0174
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624308;
+ // aapt resource value: 0x7f0b0154
+ public const int Widget_AppCompat_RatingBar_Small = 2131427668;
- // aapt resource value: 0x7F0E0175
- public const int Widget_AppCompat_RatingBar = 2131624309;
+ // aapt resource value: 0x7f0b0155
+ public const int Widget_AppCompat_SearchView = 2131427669;
- // aapt resource value: 0x7F0E0176
- public const int Widget_AppCompat_RatingBar_Indicator = 2131624310;
+ // aapt resource value: 0x7f0b0156
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
- // aapt resource value: 0x7F0E0177
- public const int Widget_AppCompat_RatingBar_Small = 2131624311;
+ // aapt resource value: 0x7f0b0157
+ public const int Widget_AppCompat_SeekBar = 2131427671;
- // aapt resource value: 0x7F0E0178
- public const int Widget_AppCompat_SearchView = 2131624312;
+ // aapt resource value: 0x7f0b0158
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
- // aapt resource value: 0x7F0E0179
- public const int Widget_AppCompat_SearchView_ActionBar = 2131624313;
+ // aapt resource value: 0x7f0b0159
+ public const int Widget_AppCompat_Spinner = 2131427673;
- // aapt resource value: 0x7F0E017A
- public const int Widget_AppCompat_SeekBar = 2131624314;
+ // aapt resource value: 0x7f0b015a
+ public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
- // aapt resource value: 0x7F0E017B
- public const int Widget_AppCompat_SeekBar_Discrete = 2131624315;
+ // aapt resource value: 0x7f0b015b
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
- // aapt resource value: 0x7F0E017C
- public const int Widget_AppCompat_Spinner = 2131624316;
+ // aapt resource value: 0x7f0b015c
+ public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
- // aapt resource value: 0x7F0E017D
- public const int Widget_AppCompat_Spinner_DropDown = 2131624317;
+ // aapt resource value: 0x7f0b015d
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
- // aapt resource value: 0x7F0E017E
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624318;
+ // aapt resource value: 0x7f0b015e
+ public const int Widget_AppCompat_Toolbar = 2131427678;
- // aapt resource value: 0x7F0E017F
- public const int Widget_AppCompat_Spinner_Underlined = 2131624319;
+ // aapt resource value: 0x7f0b015f
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
- // aapt resource value: 0x7F0E0180
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131624320;
+ // aapt resource value: 0x7f0b0187
+ public const int Widget_Compat_NotificationActionContainer = 2131427719;
- // aapt resource value: 0x7F0E0181
- public const int Widget_AppCompat_Toolbar = 2131624321;
+ // aapt resource value: 0x7f0b0188
+ public const int Widget_Compat_NotificationActionText = 2131427720;
- // aapt resource value: 0x7F0E0182
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624322;
+ // aapt resource value: 0x7f0b0179
+ public const int Widget_Design_AppBarLayout = 2131427705;
- // aapt resource value: 0x7F0E0183
- public const int Widget_Compat_NotificationActionContainer = 2131624323;
+ // aapt resource value: 0x7f0b017a
+ public const int Widget_Design_BottomNavigationView = 2131427706;
- // aapt resource value: 0x7F0E0184
- public const int Widget_Compat_NotificationActionText = 2131624324;
+ // aapt resource value: 0x7f0b017b
+ public const int Widget_Design_BottomSheet_Modal = 2131427707;
- // aapt resource value: 0x7F0E0185
- public const int Widget_Design_AppBarLayout = 2131624325;
+ // aapt resource value: 0x7f0b017c
+ public const int Widget_Design_CollapsingToolbar = 2131427708;
- // aapt resource value: 0x7F0E0186
- public const int Widget_Design_BottomNavigationView = 2131624326;
+ // aapt resource value: 0x7f0b017d
+ public const int Widget_Design_CoordinatorLayout = 2131427709;
- // aapt resource value: 0x7F0E0187
- public const int Widget_Design_BottomSheet_Modal = 2131624327;
+ // aapt resource value: 0x7f0b017e
+ public const int Widget_Design_FloatingActionButton = 2131427710;
- // aapt resource value: 0x7F0E0188
- public const int Widget_Design_CollapsingToolbar = 2131624328;
+ // aapt resource value: 0x7f0b017f
+ public const int Widget_Design_NavigationView = 2131427711;
- // aapt resource value: 0x7F0E0189
- public const int Widget_Design_CoordinatorLayout = 2131624329;
+ // aapt resource value: 0x7f0b0180
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
- // aapt resource value: 0x7F0E018A
- public const int Widget_Design_FloatingActionButton = 2131624330;
+ // aapt resource value: 0x7f0b0181
+ public const int Widget_Design_Snackbar = 2131427713;
- // aapt resource value: 0x7F0E018B
- public const int Widget_Design_NavigationView = 2131624331;
+ // aapt resource value: 0x7f0b0165
+ public const int Widget_Design_TabLayout = 2131427685;
- // aapt resource value: 0x7F0E018C
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131624332;
+ // aapt resource value: 0x7f0b0182
+ public const int Widget_Design_TextInputLayout = 2131427714;
- // aapt resource value: 0x7F0E018D
- public const int Widget_Design_Snackbar = 2131624333;
+ // aapt resource value: 0x7f0b018d
+ public const int custom_dialog2 = 2131427725;
- // aapt resource value: 0x7F0E018E
- public const int Widget_Design_TabLayout = 2131624334;
+ // aapt resource value: 0x7f0b018e
+ public const int picker_view_scale_anim = 2131427726;
- // aapt resource value: 0x7F0E018F
- public const int Widget_Design_TextInputLayout = 2131624335;
+ // aapt resource value: 0x7f0b018f
+ public const int picker_view_slide_anim = 2131427727;
static Style()
{
@@ -5766,193 +5823,204 @@
}
}
+ public partial class Xml
+ {
+
+ // aapt resource value: 0x7f070000
+ public const int file_paths = 2131165184;
+
+ // aapt resource value: 0x7f070001
+ public const int hdl_filepaths = 2131165185;
+
+ static Xml()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Xml()
+ {
+ }
+ }
+
public partial class Styleable
{
- // aapt resource value: { 0x7F040042,0x7F040043,0x7F040044,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F040083,0x7F040087,0x7F040088,0x7F040093,0x7F0400B4,0x7F0400B5,0x7F0400B9,0x7F0400BA,0x7F0400BB,0x7F0400C0,0x7F0400C6,0x7F0400E3,0x7F0400EC,0x7F0400FC,0x7F040100,0x7F040101,0x7F040168,0x7F04016B,0x7F040197,0x7F0401A1 }
public static int[] ActionBar = new int[] {
- 2130968642,
- 2130968643,
- 2130968644,
- 2130968690,
- 2130968691,
- 2130968692,
- 2130968693,
- 2130968694,
- 2130968695,
- 2130968707,
- 2130968711,
- 2130968712,
- 2130968723,
- 2130968756,
- 2130968757,
- 2130968761,
- 2130968762,
- 2130968763,
- 2130968768,
- 2130968774,
- 2130968803,
- 2130968812,
- 2130968828,
- 2130968832,
- 2130968833,
- 2130968936,
- 2130968939,
- 2130968983,
- 2130968993};
+ 2130771978,
+ 2130771980,
+ 2130771981,
+ 2130771982,
+ 2130771983,
+ 2130771984,
+ 2130771985,
+ 2130771986,
+ 2130771987,
+ 2130771988,
+ 2130771989,
+ 2130771990,
+ 2130771991,
+ 2130771992,
+ 2130771993,
+ 2130771994,
+ 2130771995,
+ 2130771996,
+ 2130771997,
+ 2130771998,
+ 2130771999,
+ 2130772000,
+ 2130772001,
+ 2130772002,
+ 2130772003,
+ 2130772004,
+ 2130772005,
+ 2130772006,
+ 2130772076};
- // aapt resource value: { 0x10100B3 }
+ // aapt resource value: 10
+ public const int ActionBar_background = 10;
+
+ // aapt resource value: 12
+ public const int ActionBar_backgroundSplit = 12;
+
+ // aapt resource value: 11
+ public const int ActionBar_backgroundStacked = 11;
+
+ // aapt resource value: 21
+ public const int ActionBar_contentInsetEnd = 21;
+
+ // aapt resource value: 25
+ public const int ActionBar_contentInsetEndWithActions = 25;
+
+ // aapt resource value: 22
+ public const int ActionBar_contentInsetLeft = 22;
+
+ // aapt resource value: 23
+ public const int ActionBar_contentInsetRight = 23;
+
+ // aapt resource value: 20
+ public const int ActionBar_contentInsetStart = 20;
+
+ // aapt resource value: 24
+ public const int ActionBar_contentInsetStartWithNavigation = 24;
+
+ // aapt resource value: 13
+ public const int ActionBar_customNavigationLayout = 13;
+
+ // aapt resource value: 3
+ public const int ActionBar_displayOptions = 3;
+
+ // aapt resource value: 9
+ public const int ActionBar_divider = 9;
+
+ // aapt resource value: 26
+ public const int ActionBar_elevation = 26;
+
+ // aapt resource value: 0
+ public const int ActionBar_height = 0;
+
+ // aapt resource value: 19
+ public const int ActionBar_hideOnContentScroll = 19;
+
+ // aapt resource value: 28
+ public const int ActionBar_homeAsUpIndicator = 28;
+
+ // aapt resource value: 14
+ public const int ActionBar_homeLayout = 14;
+
+ // aapt resource value: 7
+ public const int ActionBar_icon = 7;
+
+ // aapt resource value: 16
+ public const int ActionBar_indeterminateProgressStyle = 16;
+
+ // aapt resource value: 18
+ public const int ActionBar_itemPadding = 18;
+
+ // aapt resource value: 8
+ public const int ActionBar_logo = 8;
+
+ // aapt resource value: 2
+ public const int ActionBar_navigationMode = 2;
+
+ // aapt resource value: 27
+ public const int ActionBar_popupTheme = 27;
+
+ // aapt resource value: 17
+ public const int ActionBar_progressBarPadding = 17;
+
+ // aapt resource value: 15
+ public const int ActionBar_progressBarStyle = 15;
+
+ // aapt resource value: 4
+ public const int ActionBar_subtitle = 4;
+
+ // aapt resource value: 6
+ public const int ActionBar_subtitleTextStyle = 6;
+
+ // aapt resource value: 1
+ public const int ActionBar_title = 1;
+
+ // aapt resource value: 5
+ public const int ActionBar_titleTextStyle = 5;
+
public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
- // aapt resource value: 0
- public const int ActionBar_background = 0;
-
- // aapt resource value: 1
- public const int ActionBar_backgroundSplit = 1;
-
- // aapt resource value: 2
- public const int ActionBar_backgroundStacked = 2;
-
- // aapt resource value: 3
- public const int ActionBar_contentInsetEnd = 3;
-
- // aapt resource value: 4
- public const int ActionBar_contentInsetEndWithActions = 4;
-
- // aapt resource value: 5
- public const int ActionBar_contentInsetLeft = 5;
-
- // aapt resource value: 6
- public const int ActionBar_contentInsetRight = 6;
-
- // aapt resource value: 7
- public const int ActionBar_contentInsetStart = 7;
-
- // aapt resource value: 8
- public const int ActionBar_contentInsetStartWithNavigation = 8;
-
- // aapt resource value: 9
- public const int ActionBar_customNavigationLayout = 9;
-
- // aapt resource value: 10
- public const int ActionBar_displayOptions = 10;
-
- // aapt resource value: 11
- public const int ActionBar_divider = 11;
-
- // aapt resource value: 12
- public const int ActionBar_elevation = 12;
-
- // aapt resource value: 13
- public const int ActionBar_height = 13;
-
- // aapt resource value: 14
- public const int ActionBar_hideOnContentScroll = 14;
-
- // aapt resource value: 15
- public const int ActionBar_homeAsUpIndicator = 15;
-
- // aapt resource value: 16
- public const int ActionBar_homeLayout = 16;
-
- // aapt resource value: 17
- public const int ActionBar_icon = 17;
-
- // aapt resource value: 18
- public const int ActionBar_indeterminateProgressStyle = 18;
-
- // aapt resource value: 19
- public const int ActionBar_itemPadding = 19;
-
- // aapt resource value: 20
- public const int ActionBar_logo = 20;
-
- // aapt resource value: 21
- public const int ActionBar_navigationMode = 21;
-
- // aapt resource value: 22
- public const int ActionBar_popupTheme = 22;
-
- // aapt resource value: 23
- public const int ActionBar_progressBarPadding = 23;
-
- // aapt resource value: 24
- public const int ActionBar_progressBarStyle = 24;
-
- // aapt resource value: 25
- public const int ActionBar_subtitle = 25;
-
- // aapt resource value: 26
- public const int ActionBar_subtitleTextStyle = 26;
-
- // aapt resource value: 27
- public const int ActionBar_title = 27;
-
- // aapt resource value: 28
- public const int ActionBar_titleTextStyle = 28;
-
- // aapt resource value: { 0x101013F }
public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
public const int ActionMenuItemView_android_minWidth = 0;
- // aapt resource value: { 0xFFFFFFFF }
- public static int[] ActionMenuView = new int[] {
- -1};
+ public static int[] ActionMenuView;
- // aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
public static int[] ActionMode = new int[] {
- 2130968642,
- 2130968643,
- 2130968672,
- 2130968756,
- 2130968939,
- 2130968993};
-
- // aapt resource value: 0
- public const int ActionMode_background = 0;
-
- // aapt resource value: 1
- public const int ActionMode_backgroundSplit = 1;
-
- // aapt resource value: 2
- public const int ActionMode_closeItemLayout = 2;
+ 2130771978,
+ 2130771984,
+ 2130771985,
+ 2130771989,
+ 2130771991,
+ 2130772007};
// aapt resource value: 3
- public const int ActionMode_height = 3;
+ public const int ActionMode_background = 3;
// aapt resource value: 4
- public const int ActionMode_subtitleTextStyle = 4;
+ public const int ActionMode_backgroundSplit = 4;
// aapt resource value: 5
- public const int ActionMode_titleTextStyle = 5;
-
- // aapt resource value: { 0x7F040096,0x7F0400C1 }
- public static int[] ActivityChooserView = new int[] {
- 2130968726,
- 2130968769};
+ 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,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
+ public static int[] ActivityChooserView = new int[] {
+ 2130772008,
+ 2130772009};
+
+ // aapt resource value: 1
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+
+ // aapt resource value: 0
+ public const int ActivityChooserView_initialActivityCount = 0;
+
public static int[] AlertDialog = new int[] {
16842994,
- 2130968664,
- 2130968794,
- 2130968795,
- 2130968809,
- 2130968855,
- 2130968856};
+ 2130772010,
+ 2130772011,
+ 2130772012,
+ 2130772013,
+ 2130772014,
+ 2130772015};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -5960,39 +6028,27 @@
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
+ // aapt resource value: 5
+ public const int AlertDialog_listItemLayout = 5;
+
// aapt resource value: 2
- public const int AlertDialog_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: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
+ // aapt resource value: 4
+ public const int AlertDialog_singleChoiceItemLayout = 4;
+
public static int[] AppBarLayout = new int[] {
16842964,
16843919,
16844096,
- 2130968723,
- 2130968727};
-
- // aapt resource value: { 0x7F040162,0x7F040163 }
- public static int[] AppBarLayoutStates = new int[] {
- 2130968930,
- 2130968931};
-
- // aapt resource value: 0
- public const int AppBarLayoutStates_state_collapsed = 0;
-
- // aapt resource value: 1
- public const int AppBarLayoutStates_state_collapsible = 1;
+ 2130772005,
+ 2130772223};
// aapt resource value: 0
public const int AppBarLayout_android_background = 0;
@@ -6009,10 +6065,19 @@
// aapt resource value: 4
public const int AppBarLayout_expanded = 4;
- // aapt resource value: { 0x7F0400D4,0x7F0400D5 }
+ public static int[] AppBarLayoutStates = new int[] {
+ 2130772224,
+ 2130772225};
+
+ // aapt resource value: 0
+ public const int AppBarLayoutStates_state_collapsed = 0;
+
+ // aapt resource value: 1
+ public const int AppBarLayoutStates_state_collapsible = 1;
+
public static int[] AppBarLayout_Layout = new int[] {
- 2130968788,
- 2130968789};
+ 2130772226,
+ 2130772227};
// aapt resource value: 0
public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -6020,12 +6085,11 @@
// aapt resource value: 1
public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
- // aapt resource value: { 0x1010119,0x7F04011E,0x7F040195,0x7F040196 }
public static int[] AppCompatImageView = new int[] {
16843033,
- 2130968862,
- 2130968981,
- 2130968982};
+ 2130772016,
+ 2130772017,
+ 2130772018};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -6039,12 +6103,11 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
- // aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130968978,
- 2130968979,
- 2130968980};
+ 2130772019,
+ 2130772020,
+ 2130772021};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -6058,7 +6121,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,
@@ -6089,267 +6151,265 @@
// aapt resource value: 0
public const int AppCompatTextHelper_android_textAppearance = 0;
- // aapt resource value: { 0x1010034,0x7F04003D,0x7F04003E,0x7F04003F,0x7F040040,0x7F040041,0x7F0400A6,0x7F040181 }
public static int[] AppCompatTextView = new int[] {
16842804,
- 2130968637,
- 2130968638,
- 2130968639,
- 2130968640,
- 2130968641,
- 2130968742,
- 2130968961};
+ 2130772022,
+ 2130772023,
+ 2130772024,
+ 2130772025,
+ 2130772026,
+ 2130772027,
+ 2130772028};
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
- // aapt resource value: 1
- public const int AppCompatTextView_autoSizeMaxTextSize = 1;
-
- // aapt resource value: 2
- public const int AppCompatTextView_autoSizeMinTextSize = 2;
-
- // aapt resource value: 3
- public const int AppCompatTextView_autoSizePresetSizes = 3;
-
- // aapt resource value: 4
- public const int AppCompatTextView_autoSizeStepGranularity = 4;
+ // aapt resource value: 6
+ public const int AppCompatTextView_autoSizeMaxTextSize = 6;
// aapt resource value: 5
- public const int AppCompatTextView_autoSizeTextType = 5;
+ public const int AppCompatTextView_autoSizeMinTextSize = 5;
- // aapt resource value: 6
- public const int AppCompatTextView_fontFamily = 6;
+ // aapt resource value: 4
+ public const int AppCompatTextView_autoSizePresetSizes = 4;
+
+ // aapt resource value: 3
+ public const int AppCompatTextView_autoSizeStepGranularity = 3;
+
+ // aapt resource value: 2
+ public const int AppCompatTextView_autoSizeTextType = 2;
// aapt resource value: 7
- public const int AppCompatTextView_textAllCaps = 7;
+ public const int AppCompatTextView_fontFamily = 7;
- // aapt resource value: { 0x1010057,0x10100AE,0x7F040000,0x7F040001,0x7F040002,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000E,0x7F04000F,0x7F040010,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F040021,0x7F040022,0x7F040023,0x7F040024,0x7F040025,0x7F04003C,0x7F04004F,0x7F040052,0x7F040053,0x7F040054,0x7F040055,0x7F040056,0x7F040059,0x7F04005A,0x7F04005D,0x7F04005E,0x7F040066,0x7F040067,0x7F040068,0x7F040069,0x7F04006A,0x7F04006B,0x7F04006C,0x7F04006D,0x7F04006E,0x7F04006F,0x7F040079,0x7F040085,0x7F040086,0x7F040089,0x7F04008B,0x7F04008E,0x7F04008F,0x7F040090,0x7F040091,0x7F040092,0x7F0400B9,0x7F0400BF,0x7F0400D8,0x7F0400D9,0x7F0400DC,0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400F3,0x7F0400F4,0x7F0400F5,0x7F0400FB,0x7F0400FD,0x7F040104,0x7F040105,0x7F040106,0x7F040107,0x7F04010E,0x7F040111,0x7F040112,0x7F040113,0x7F04011B,0x7F04011C,0x7F04016F,0x7F040182,0x7F040183,0x7F040184,0x7F040185,0x7F040186,0x7F040187,0x7F040188,0x7F040189,0x7F04018A,0x7F04018C,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401B8,0x7F0401B9,0x7F0401BA,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401BE,0x7F0401BF,0x7F0401C0,0x7F0401C1 }
+ // aapt resource value: 1
+ public const int AppCompatTextView_textAllCaps = 1;
+
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 2130968576,
- 2130968577,
- 2130968578,
- 2130968579,
- 2130968580,
- 2130968581,
- 2130968582,
- 2130968583,
- 2130968584,
- 2130968585,
- 2130968586,
- 2130968587,
- 2130968588,
- 2130968590,
- 2130968591,
- 2130968592,
- 2130968593,
- 2130968594,
- 2130968595,
- 2130968596,
- 2130968597,
- 2130968598,
- 2130968599,
- 2130968600,
- 2130968601,
- 2130968602,
- 2130968603,
- 2130968604,
- 2130968605,
- 2130968606,
- 2130968609,
- 2130968610,
- 2130968611,
- 2130968612,
- 2130968613,
- 2130968636,
- 2130968655,
- 2130968658,
- 2130968659,
- 2130968660,
- 2130968661,
- 2130968662,
- 2130968665,
- 2130968666,
- 2130968669,
- 2130968670,
- 2130968678,
- 2130968679,
- 2130968680,
- 2130968681,
- 2130968682,
- 2130968683,
- 2130968684,
- 2130968685,
- 2130968686,
- 2130968687,
- 2130968697,
- 2130968709,
- 2130968710,
- 2130968713,
- 2130968715,
- 2130968718,
- 2130968719,
- 2130968720,
- 2130968721,
- 2130968722,
- 2130968761,
- 2130968767,
- 2130968792,
- 2130968793,
- 2130968796,
- 2130968797,
- 2130968798,
- 2130968799,
- 2130968800,
- 2130968801,
- 2130968802,
- 2130968819,
- 2130968820,
- 2130968821,
- 2130968827,
- 2130968829,
- 2130968836,
- 2130968837,
- 2130968838,
- 2130968839,
- 2130968846,
- 2130968849,
- 2130968850,
- 2130968851,
- 2130968859,
- 2130968860,
- 2130968943,
- 2130968962,
- 2130968963,
- 2130968964,
- 2130968965,
- 2130968966,
- 2130968967,
- 2130968968,
- 2130968969,
- 2130968970,
- 2130968972,
- 2130968995,
- 2130968996,
- 2130968997,
- 2130968998,
- 2130969016,
- 2130969017,
- 2130969018,
- 2130969019,
- 2130969020,
- 2130969021,
- 2130969022,
- 2130969023,
- 2130969024,
- 2130969025};
-
- // aapt resource value: 2
- public const int AppCompatTheme_actionBarDivider = 2;
-
- // aapt resource value: 3
- public const int AppCompatTheme_actionBarItemBackground = 3;
-
- // aapt resource value: 4
- public const int AppCompatTheme_actionBarPopupTheme = 4;
-
- // aapt resource value: 5
- public const int AppCompatTheme_actionBarSize = 5;
-
- // aapt resource value: 6
- public const int AppCompatTheme_actionBarSplitStyle = 6;
-
- // aapt resource value: 7
- public const int AppCompatTheme_actionBarStyle = 7;
-
- // aapt resource value: 8
- public const int AppCompatTheme_actionBarTabBarStyle = 8;
-
- // aapt resource value: 9
- public const int AppCompatTheme_actionBarTabStyle = 9;
-
- // aapt resource value: 10
- public const int AppCompatTheme_actionBarTabTextStyle = 10;
-
- // aapt resource value: 11
- public const int AppCompatTheme_actionBarTheme = 11;
-
- // aapt resource value: 12
- public const int AppCompatTheme_actionBarWidgetTheme = 12;
-
- // aapt resource value: 13
- public const int AppCompatTheme_actionButtonStyle = 13;
-
- // aapt resource value: 14
- public const int AppCompatTheme_actionDropDownStyle = 14;
-
- // aapt resource value: 15
- public const int AppCompatTheme_actionMenuTextAppearance = 15;
-
- // aapt resource value: 16
- public const int AppCompatTheme_actionMenuTextColor = 16;
-
- // aapt resource value: 17
- public const int AppCompatTheme_actionModeBackground = 17;
-
- // aapt resource value: 18
- public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
-
- // aapt resource value: 19
- public const int AppCompatTheme_actionModeCloseDrawable = 19;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionModeCopyDrawable = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionModeCutDrawable = 21;
-
- // aapt resource value: 22
- public const int AppCompatTheme_actionModeFindDrawable = 22;
+ 2130772029,
+ 2130772030,
+ 2130772031,
+ 2130772032,
+ 2130772033,
+ 2130772034,
+ 2130772035,
+ 2130772036,
+ 2130772037,
+ 2130772038,
+ 2130772039,
+ 2130772040,
+ 2130772041,
+ 2130772042,
+ 2130772043,
+ 2130772044,
+ 2130772045,
+ 2130772046,
+ 2130772047,
+ 2130772048,
+ 2130772049,
+ 2130772050,
+ 2130772051,
+ 2130772052,
+ 2130772053,
+ 2130772054,
+ 2130772055,
+ 2130772056,
+ 2130772057,
+ 2130772058,
+ 2130772059,
+ 2130772060,
+ 2130772061,
+ 2130772062,
+ 2130772063,
+ 2130772064,
+ 2130772065,
+ 2130772066,
+ 2130772067,
+ 2130772068,
+ 2130772069,
+ 2130772070,
+ 2130772071,
+ 2130772072,
+ 2130772073,
+ 2130772074,
+ 2130772075,
+ 2130772076,
+ 2130772077,
+ 2130772078,
+ 2130772079,
+ 2130772080,
+ 2130772081,
+ 2130772082,
+ 2130772083,
+ 2130772084,
+ 2130772085,
+ 2130772086,
+ 2130772087,
+ 2130772088,
+ 2130772089,
+ 2130772090,
+ 2130772091,
+ 2130772092,
+ 2130772093,
+ 2130772094,
+ 2130772095,
+ 2130772096,
+ 2130772097,
+ 2130772098,
+ 2130772099,
+ 2130772100,
+ 2130772101,
+ 2130772102,
+ 2130772103,
+ 2130772104,
+ 2130772105,
+ 2130772106,
+ 2130772107,
+ 2130772108,
+ 2130772109,
+ 2130772110,
+ 2130772111,
+ 2130772112,
+ 2130772113,
+ 2130772114,
+ 2130772115,
+ 2130772116,
+ 2130772117,
+ 2130772118,
+ 2130772119,
+ 2130772120,
+ 2130772121,
+ 2130772122,
+ 2130772123,
+ 2130772124,
+ 2130772125,
+ 2130772126,
+ 2130772127,
+ 2130772128,
+ 2130772129,
+ 2130772130,
+ 2130772131,
+ 2130772132,
+ 2130772133,
+ 2130772134,
+ 2130772135,
+ 2130772136,
+ 2130772137,
+ 2130772138,
+ 2130772139,
+ 2130772140,
+ 2130772141,
+ 2130772142,
+ 2130772143,
+ 2130772144,
+ 2130772145};
// aapt resource value: 23
- public const int AppCompatTheme_actionModePasteDrawable = 23;
+ public const int AppCompatTheme_actionBarDivider = 23;
// aapt resource value: 24
- public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+ public const int AppCompatTheme_actionBarItemBackground = 24;
+
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionBarPopupTheme = 17;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionBarSize = 22;
+
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionBarSplitStyle = 19;
+
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionBarStyle = 18;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionBarTabBarStyle = 13;
+
+ // aapt resource value: 12
+ public const int AppCompatTheme_actionBarTabStyle = 12;
+
+ // aapt resource value: 14
+ public const int AppCompatTheme_actionBarTabTextStyle = 14;
+
+ // aapt resource value: 20
+ public const int AppCompatTheme_actionBarTheme = 20;
+
+ // aapt resource value: 21
+ public const int AppCompatTheme_actionBarWidgetTheme = 21;
+
+ // aapt resource value: 50
+ public const int AppCompatTheme_actionButtonStyle = 50;
+
+ // aapt resource value: 46
+ public const int AppCompatTheme_actionDropDownStyle = 46;
// aapt resource value: 25
- public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+ public const int AppCompatTheme_actionMenuTextAppearance = 25;
// aapt resource value: 26
- public const int AppCompatTheme_actionModeShareDrawable = 26;
-
- // aapt resource value: 27
- public const int AppCompatTheme_actionModeSplitBackground = 27;
-
- // aapt resource value: 28
- public const int AppCompatTheme_actionModeStyle = 28;
+ public const int AppCompatTheme_actionMenuTextColor = 26;
// aapt resource value: 29
- public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+ public const int AppCompatTheme_actionModeBackground = 29;
- // aapt resource value: 30
- public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
// aapt resource value: 31
- public const int AppCompatTheme_actionOverflowMenuStyle = 31;
-
- // aapt resource value: 32
- public const int AppCompatTheme_activityChooserViewStyle = 32;
+ public const int AppCompatTheme_actionModeCloseDrawable = 31;
// aapt resource value: 33
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+ public const int AppCompatTheme_actionModeCopyDrawable = 33;
+
+ // aapt resource value: 32
+ public const int AppCompatTheme_actionModeCutDrawable = 32;
+
+ // aapt resource value: 37
+ public const int AppCompatTheme_actionModeFindDrawable = 37;
// aapt resource value: 34
- public const int AppCompatTheme_alertDialogCenterButtons = 34;
+ public const int AppCompatTheme_actionModePasteDrawable = 34;
+
+ // aapt resource value: 39
+ public const int AppCompatTheme_actionModePopupWindowStyle = 39;
// aapt resource value: 35
- public const int AppCompatTheme_alertDialogStyle = 35;
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
// aapt resource value: 36
- public const int AppCompatTheme_alertDialogTheme = 36;
+ public const int AppCompatTheme_actionModeShareDrawable = 36;
+
+ // aapt resource value: 30
+ public const int AppCompatTheme_actionModeSplitBackground = 30;
+
+ // aapt resource value: 27
+ public const int AppCompatTheme_actionModeStyle = 27;
+
+ // aapt resource value: 38
+ public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+
+ // aapt resource value: 15
+ public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+
+ // aapt resource value: 16
+ public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_activityChooserViewStyle = 58;
+
+ // aapt resource value: 95
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+
+ // aapt resource value: 96
+ public const int AppCompatTheme_alertDialogCenterButtons = 96;
+
+ // aapt resource value: 94
+ public const int AppCompatTheme_alertDialogStyle = 94;
+
+ // aapt resource value: 97
+ public const int AppCompatTheme_alertDialogTheme = 97;
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -6357,272 +6417,270 @@
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
- // aapt resource value: 37
- public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
-
- // aapt resource value: 38
- public const int AppCompatTheme_borderlessButtonStyle = 38;
-
- // aapt resource value: 39
- public const int AppCompatTheme_buttonBarButtonStyle = 39;
-
- // aapt resource value: 40
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
-
- // aapt resource value: 41
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
-
- // aapt resource value: 42
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
-
- // aapt resource value: 43
- public const int AppCompatTheme_buttonBarStyle = 43;
-
- // aapt resource value: 44
- public const int AppCompatTheme_buttonStyle = 44;
-
- // aapt resource value: 45
- public const int AppCompatTheme_buttonStyleSmall = 45;
-
- // aapt resource value: 46
- public const int AppCompatTheme_checkboxStyle = 46;
-
- // aapt resource value: 47
- public const int AppCompatTheme_checkedTextViewStyle = 47;
-
- // aapt resource value: 48
- public const int AppCompatTheme_colorAccent = 48;
-
- // aapt resource value: 49
- public const int AppCompatTheme_colorBackgroundFloating = 49;
-
- // aapt resource value: 50
- public const int AppCompatTheme_colorButtonNormal = 50;
-
- // aapt resource value: 51
- public const int AppCompatTheme_colorControlActivated = 51;
-
- // aapt resource value: 52
- public const int AppCompatTheme_colorControlHighlight = 52;
-
- // aapt resource value: 53
- public const int AppCompatTheme_colorControlNormal = 53;
-
- // aapt resource value: 54
- public const int AppCompatTheme_colorError = 54;
+ // aapt resource value: 102
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
// aapt resource value: 55
- public const int AppCompatTheme_colorPrimary = 55;
+ public const int AppCompatTheme_borderlessButtonStyle = 55;
- // aapt resource value: 56
- public const int AppCompatTheme_colorPrimaryDark = 56;
+ // aapt resource value: 52
+ public const int AppCompatTheme_buttonBarButtonStyle = 52;
+
+ // aapt resource value: 100
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+
+ // aapt resource value: 101
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+
+ // aapt resource value: 99
+ public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
+
+ // aapt resource value: 51
+ public const int AppCompatTheme_buttonBarStyle = 51;
+
+ // aapt resource value: 103
+ public const int AppCompatTheme_buttonStyle = 103;
+
+ // aapt resource value: 104
+ public const int AppCompatTheme_buttonStyleSmall = 104;
+
+ // aapt resource value: 105
+ public const int AppCompatTheme_checkboxStyle = 105;
+
+ // aapt resource value: 106
+ public const int AppCompatTheme_checkedTextViewStyle = 106;
+
+ // aapt resource value: 86
+ public const int AppCompatTheme_colorAccent = 86;
+
+ // aapt resource value: 93
+ public const int AppCompatTheme_colorBackgroundFloating = 93;
+
+ // aapt resource value: 90
+ public const int AppCompatTheme_colorButtonNormal = 90;
+
+ // aapt resource value: 88
+ public const int AppCompatTheme_colorControlActivated = 88;
+
+ // aapt resource value: 89
+ public const int AppCompatTheme_colorControlHighlight = 89;
+
+ // aapt resource value: 87
+ public const int AppCompatTheme_colorControlNormal = 87;
+
+ // aapt resource value: 118
+ public const int AppCompatTheme_colorError = 118;
+
+ // aapt resource value: 84
+ public const int AppCompatTheme_colorPrimary = 84;
+
+ // aapt resource value: 85
+ public const int AppCompatTheme_colorPrimaryDark = 85;
+
+ // aapt resource value: 91
+ public const int AppCompatTheme_colorSwitchThumbNormal = 91;
+
+ // aapt resource value: 92
+ public const int AppCompatTheme_controlBackground = 92;
+
+ // aapt resource value: 44
+ public const int AppCompatTheme_dialogPreferredPadding = 44;
+
+ // aapt resource value: 43
+ public const int AppCompatTheme_dialogTheme = 43;
// aapt resource value: 57
- public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+ public const int AppCompatTheme_dividerHorizontal = 57;
- // aapt resource value: 58
- public const int AppCompatTheme_controlBackground = 58;
-
- // aapt resource value: 59
- public const int AppCompatTheme_dialogPreferredPadding = 59;
-
- // aapt resource value: 60
- public const int AppCompatTheme_dialogTheme = 60;
-
- // aapt resource value: 61
- public const int AppCompatTheme_dividerHorizontal = 61;
-
- // aapt resource value: 62
- public const int AppCompatTheme_dividerVertical = 62;
-
- // aapt resource value: 64
- public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
-
- // aapt resource value: 63
- public const int AppCompatTheme_dropDownListViewStyle = 63;
-
- // aapt resource value: 65
- public const int AppCompatTheme_editTextBackground = 65;
-
- // aapt resource value: 66
- public const int AppCompatTheme_editTextColor = 66;
-
- // aapt resource value: 67
- public const int AppCompatTheme_editTextStyle = 67;
-
- // aapt resource value: 68
- public const int AppCompatTheme_homeAsUpIndicator = 68;
-
- // aapt resource value: 69
- public const int AppCompatTheme_imageButtonStyle = 69;
-
- // aapt resource value: 70
- public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
-
- // aapt resource value: 71
- public const int AppCompatTheme_listDividerAlertDialog = 71;
-
- // aapt resource value: 72
- public const int AppCompatTheme_listMenuViewStyle = 72;
-
- // aapt resource value: 73
- public const int AppCompatTheme_listPopupWindowStyle = 73;
-
- // aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemHeight = 74;
+ // aapt resource value: 56
+ public const int AppCompatTheme_dividerVertical = 56;
// aapt resource value: 75
- public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+ public const int AppCompatTheme_dropDownListViewStyle = 75;
+
+ // aapt resource value: 47
+ public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
+
+ // aapt resource value: 64
+ public const int AppCompatTheme_editTextBackground = 64;
+
+ // aapt resource value: 63
+ public const int AppCompatTheme_editTextColor = 63;
+
+ // aapt resource value: 107
+ public const int AppCompatTheme_editTextStyle = 107;
+
+ // aapt resource value: 49
+ public const int AppCompatTheme_homeAsUpIndicator = 49;
+
+ // aapt resource value: 65
+ public const int AppCompatTheme_imageButtonStyle = 65;
+
+ // aapt resource value: 83
+ public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+
+ // aapt resource value: 45
+ public const int AppCompatTheme_listDividerAlertDialog = 45;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_listMenuViewStyle = 115;
// aapt resource value: 76
- public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+ public const int AppCompatTheme_listPopupWindowStyle = 76;
- // aapt resource value: 77
- public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+ // aapt resource value: 70
+ public const int AppCompatTheme_listPreferredItemHeight = 70;
- // aapt resource value: 78
- public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+ // aapt resource value: 72
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
- // aapt resource value: 79
- public const int AppCompatTheme_panelBackground = 79;
+ // aapt resource value: 71
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+
+ // aapt resource value: 73
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+
+ // aapt resource value: 74
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
// aapt resource value: 80
- public const int AppCompatTheme_panelMenuListTheme = 80;
+ public const int AppCompatTheme_panelBackground = 80;
+
+ // aapt resource value: 82
+ public const int AppCompatTheme_panelMenuListTheme = 82;
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
- // aapt resource value: 82
- public const int AppCompatTheme_popupMenuStyle = 82;
+ // aapt resource value: 61
+ public const int AppCompatTheme_popupMenuStyle = 61;
- // aapt resource value: 83
- public const int AppCompatTheme_popupWindowStyle = 83;
-
- // aapt resource value: 84
- public const int AppCompatTheme_radioButtonStyle = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_ratingBarStyle = 85;
-
- // aapt resource value: 86
- public const int AppCompatTheme_ratingBarStyleIndicator = 86;
-
- // aapt resource value: 87
- public const int AppCompatTheme_ratingBarStyleSmall = 87;
-
- // aapt resource value: 88
- public const int AppCompatTheme_searchViewStyle = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_seekBarStyle = 89;
-
- // aapt resource value: 90
- public const int AppCompatTheme_selectableItemBackground = 90;
-
- // aapt resource value: 91
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
-
- // aapt resource value: 93
- public const int AppCompatTheme_spinnerStyle = 93;
-
- // aapt resource value: 94
- public const int AppCompatTheme_switchStyle = 94;
-
- // aapt resource value: 95
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
-
- // aapt resource value: 96
- public const int AppCompatTheme_textAppearanceListItem = 96;
-
- // aapt resource value: 97
- public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
-
- // aapt resource value: 98
- public const int AppCompatTheme_textAppearanceListItemSmall = 98;
-
- // aapt resource value: 99
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
-
- // aapt resource value: 100
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
-
- // aapt resource value: 101
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
-
- // aapt resource value: 102
- public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
-
- // aapt resource value: 103
- public const int AppCompatTheme_textColorAlertDialogListItem = 103;
-
- // aapt resource value: 104
- public const int AppCompatTheme_textColorSearchUrl = 104;
-
- // aapt resource value: 105
- public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
-
- // aapt resource value: 106
- public const int AppCompatTheme_toolbarStyle = 106;
-
- // aapt resource value: 107
- public const int AppCompatTheme_tooltipForegroundColor = 107;
+ // aapt resource value: 62
+ public const int AppCompatTheme_popupWindowStyle = 62;
// aapt resource value: 108
- public const int AppCompatTheme_tooltipFrameBackground = 108;
+ public const int AppCompatTheme_radioButtonStyle = 108;
// aapt resource value: 109
- public const int AppCompatTheme_windowActionBar = 109;
+ public const int AppCompatTheme_ratingBarStyle = 109;
// aapt resource value: 110
- public const int AppCompatTheme_windowActionBarOverlay = 110;
+ public const int AppCompatTheme_ratingBarStyleIndicator = 110;
// aapt resource value: 111
- public const int AppCompatTheme_windowActionModeOverlay = 111;
+ public const int AppCompatTheme_ratingBarStyleSmall = 111;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_searchViewStyle = 69;
// aapt resource value: 112
- public const int AppCompatTheme_windowFixedHeightMajor = 112;
+ public const int AppCompatTheme_seekBarStyle = 112;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_selectableItemBackground = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
// aapt resource value: 113
- public const int AppCompatTheme_windowFixedHeightMinor = 113;
+ public const int AppCompatTheme_spinnerStyle = 113;
// aapt resource value: 114
- public const int AppCompatTheme_windowFixedWidthMajor = 114;
+ public const int AppCompatTheme_switchStyle = 114;
- // aapt resource value: 115
- public const int AppCompatTheme_windowFixedWidthMinor = 115;
+ // aapt resource value: 40
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
- // aapt resource value: 116
- public const int AppCompatTheme_windowMinWidthMajor = 116;
+ // aapt resource value: 77
+ public const int AppCompatTheme_textAppearanceListItem = 77;
+
+ // aapt resource value: 78
+ public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
+
+ // aapt resource value: 79
+ public const int AppCompatTheme_textAppearanceListItemSmall = 79;
+
+ // aapt resource value: 42
+ public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
+
+ // aapt resource value: 67
+ public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
+
+ // aapt resource value: 66
+ public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
+
+ // aapt resource value: 41
+ public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+
+ // aapt resource value: 98
+ public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_textColorSearchUrl = 68;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_toolbarStyle = 59;
// aapt resource value: 117
- public const int AppCompatTheme_windowMinWidthMinor = 117;
+ public const int AppCompatTheme_tooltipForegroundColor = 117;
- // aapt resource value: 118
- public const int AppCompatTheme_windowNoTitle = 118;
+ // aapt resource value: 116
+ public const int AppCompatTheme_tooltipFrameBackground = 116;
- // aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
+ // aapt resource value: 2
+ public const int AppCompatTheme_windowActionBar = 2;
+
+ // aapt resource value: 4
+ public const int AppCompatTheme_windowActionBarOverlay = 4;
+
+ // aapt resource value: 5
+ public const int AppCompatTheme_windowActionModeOverlay = 5;
+
+ // aapt resource value: 9
+ public const int AppCompatTheme_windowFixedHeightMajor = 9;
+
+ // aapt resource value: 7
+ public const int AppCompatTheme_windowFixedHeightMinor = 7;
+
+ // aapt resource value: 6
+ public const int AppCompatTheme_windowFixedWidthMajor = 6;
+
+ // aapt resource value: 8
+ public const int AppCompatTheme_windowFixedWidthMinor = 8;
+
+ // aapt resource value: 10
+ public const int AppCompatTheme_windowMinWidthMajor = 10;
+
+ // aapt resource value: 11
+ public const int AppCompatTheme_windowMinWidthMinor = 11;
+
+ // aapt resource value: 3
+ public const int AppCompatTheme_windowNoTitle = 3;
+
public static int[] BallPulseFooter = new int[] {
- 2130968864,
- 2130968865,
- 2130968912};
-
- // aapt resource value: 0
- public const int BallPulseFooter_srlAnimatingColor = 0;
+ 2130772317,
+ 2130772338,
+ 2130772339};
// aapt resource value: 1
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
+ public const int BallPulseFooter_srlAnimatingColor = 1;
+
+ // aapt resource value: 0
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
- // aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
public static int[] BezierRadarHeader = new int[] {
- 2130968863,
- 2130968882,
- 2130968913};
+ 2130772316,
+ 2130772324,
+ 2130772326};
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
@@ -6633,19 +6691,18 @@
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
- // aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
public static int[] BottomNavigationView = new int[] {
- 2130968723,
- 2130968772,
- 2130968773,
- 2130968776,
- 2130968808};
+ 2130772005,
+ 2130772266,
+ 2130772267,
+ 2130772268,
+ 2130772269};
// aapt resource value: 0
public const int BottomNavigationView_elevation = 0;
- // aapt resource value: 1
- public const int BottomNavigationView_itemBackground = 1;
+ // aapt resource value: 4
+ public const int BottomNavigationView_itemBackground = 4;
// aapt resource value: 2
public const int BottomNavigationView_itemIconTint = 2;
@@ -6653,51 +6710,48 @@
// aapt resource value: 3
public const int BottomNavigationView_itemTextColor = 3;
- // aapt resource value: 4
- public const int BottomNavigationView_menu = 4;
+ // aapt resource value: 1
+ public const int BottomNavigationView_menu = 1;
- // aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
public static int[] BottomSheetBehavior_Layout = new int[] {
- 2130968649,
- 2130968651,
- 2130968652};
-
- // aapt resource value: 0
- public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
+ 2130772228,
+ 2130772229,
+ 2130772230};
// aapt resource value: 1
- public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
+ public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+
+ // aapt resource value: 0
+ public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
// aapt resource value: 2
public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
- // aapt resource value: { 0x7F040026 }
public static int[] ButtonBarLayout = new int[] {
- 2130968614};
+ 2130772146};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
- // aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015D }
public static int[] ClassicsFooter = new int[] {
- 2130968863,
- 2130968865,
- 2130968869,
- 2130968870,
- 2130968871,
- 2130968872,
- 2130968873,
- 2130968874,
- 2130968896,
- 2130968913,
- 2130968916,
- 2130968917,
- 2130968918,
- 2130968919,
- 2130968920,
- 2130968921,
- 2130968922,
- 2130968925};
+ 2130772316,
+ 2130772317,
+ 2130772318,
+ 2130772319,
+ 2130772320,
+ 2130772321,
+ 2130772322,
+ 2130772323,
+ 2130772325,
+ 2130772326,
+ 2130772327,
+ 2130772328,
+ 2130772329,
+ 2130772330,
+ 2130772331,
+ 2130772332,
+ 2130772333,
+ 2130772336};
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
@@ -6753,30 +6807,29 @@
// aapt resource value: 17
public const int ClassicsFooter_srlTextSizeTitle = 17;
- // aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040133,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015C,0x7F04015D,0x7F04015E,0x7F04015F }
public static int[] ClassicsHeader = new int[] {
- 2130968863,
- 2130968865,
- 2130968869,
- 2130968870,
- 2130968871,
- 2130968872,
- 2130968873,
- 2130968874,
- 2130968883,
- 2130968896,
- 2130968913,
- 2130968916,
- 2130968917,
- 2130968918,
- 2130968920,
- 2130968921,
- 2130968922,
- 2130968923,
- 2130968924,
- 2130968925,
- 2130968926,
- 2130968927};
+ 2130772316,
+ 2130772317,
+ 2130772318,
+ 2130772319,
+ 2130772320,
+ 2130772321,
+ 2130772322,
+ 2130772323,
+ 2130772325,
+ 2130772326,
+ 2130772327,
+ 2130772328,
+ 2130772329,
+ 2130772331,
+ 2130772332,
+ 2130772333,
+ 2130772334,
+ 2130772335,
+ 2130772336,
+ 2130772337,
+ 2130772340,
+ 2130772341};
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
@@ -6802,101 +6855,117 @@
// aapt resource value: 7
public const int ClassicsHeader_srlDrawableSize = 7;
+ // aapt resource value: 21
+ public const int ClassicsHeader_srlEnableLastTime = 21;
+
// aapt resource value: 8
- public const int ClassicsHeader_srlEnableLastTime = 8;
+ public const int ClassicsHeader_srlFinishDuration = 8;
// aapt resource value: 9
- public const int ClassicsHeader_srlFinishDuration = 9;
+ public const int ClassicsHeader_srlPrimaryColor = 9;
// aapt resource value: 10
- public const int ClassicsHeader_srlPrimaryColor = 10;
+ public const int ClassicsHeader_srlTextFailed = 10;
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFailed = 11;
+ public const int ClassicsHeader_srlTextFinish = 11;
// aapt resource value: 12
- public const int ClassicsHeader_srlTextFinish = 12;
+ public const int ClassicsHeader_srlTextLoading = 12;
// aapt resource value: 13
- public const int ClassicsHeader_srlTextLoading = 13;
+ public const int ClassicsHeader_srlTextPulling = 13;
// aapt resource value: 14
- public const int ClassicsHeader_srlTextPulling = 14;
+ public const int ClassicsHeader_srlTextRefreshing = 14;
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRefreshing = 15;
+ public const int ClassicsHeader_srlTextRelease = 15;
// aapt resource value: 16
- public const int ClassicsHeader_srlTextRelease = 16;
+ public const int ClassicsHeader_srlTextSecondary = 16;
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSecondary = 17;
+ public const int ClassicsHeader_srlTextSizeTime = 17;
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTime = 18;
-
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextSizeTitle = 19;
+ public const int ClassicsHeader_srlTextSizeTitle = 18;
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
- // aapt resource value: 21
- public const int ClassicsHeader_srlTextUpdate = 21;
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextUpdate = 19;
- // aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
public static int[] CollapsingToolbarLayout = new int[] {
- 2130968675,
- 2130968676,
- 2130968696,
- 2130968728,
- 2130968729,
- 2130968730,
- 2130968731,
- 2130968732,
- 2130968733,
- 2130968734,
- 2130968842,
- 2130968843,
- 2130968933,
- 2130968983,
- 2130968984,
- 2130968994};
+ 2130771980,
+ 2130772231,
+ 2130772232,
+ 2130772233,
+ 2130772234,
+ 2130772235,
+ 2130772236,
+ 2130772237,
+ 2130772238,
+ 2130772239,
+ 2130772240,
+ 2130772241,
+ 2130772242,
+ 2130772243,
+ 2130772244,
+ 2130772245};
- // aapt resource value: 0
- public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
+ // aapt resource value: 13
+ public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
+
+ // aapt resource value: 7
+ public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int CollapsingToolbarLayout_contentScrim = 8;
+
+ // aapt resource value: 14
+ public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
// aapt resource value: 1
- public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 1;
-
- // aapt resource value: 2
- public const int CollapsingToolbarLayout_contentScrim = 2;
-
- // aapt resource value: 3
- public const int CollapsingToolbarLayout_expandedTitleGravity = 3;
-
- // aapt resource value: 4
- public const int CollapsingToolbarLayout_expandedTitleMargin = 4;
+ public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
// aapt resource value: 5
public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
+ // aapt resource value: 4
+ public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
+
+ // aapt resource value: 2
+ public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
+
+ // aapt resource value: 3
+ public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
+
// aapt resource value: 6
- public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
+ public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
- // aapt resource value: 7
- public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
+ // aapt resource value: 12
+ public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
- // aapt resource value: 8
- public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
+ // aapt resource value: 11
+ public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
// aapt resource value: 9
- public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
+ public const int CollapsingToolbarLayout_statusBarScrim = 9;
- // aapt resource value: { 0x7F0400CF,0x7F0400D0 }
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_title = 0;
+
+ // aapt resource value: 15
+ public const int CollapsingToolbarLayout_titleEnabled = 15;
+
+ // aapt resource value: 10
+ public const int CollapsingToolbarLayout_toolbarId = 10;
+
public static int[] CollapsingToolbarLayout_Layout = new int[] {
- 2130968783,
- 2130968784};
+ 2130772246,
+ 2130772247};
// aapt resource value: 0
public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -6904,29 +6973,10 @@
// aapt resource value: 1
public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
- // aapt resource value: 10
- public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
-
- // aapt resource value: 11
- public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
-
- // aapt resource value: 12
- public const int CollapsingToolbarLayout_statusBarScrim = 12;
-
- // aapt resource value: 13
- public const int CollapsingToolbarLayout_title = 13;
-
- // aapt resource value: 14
- public const int CollapsingToolbarLayout_titleEnabled = 14;
-
- // aapt resource value: 15
- public const int CollapsingToolbarLayout_toolbarId = 15;
-
- // aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130968615};
+ 2130772147};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -6937,11 +6987,10 @@
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
- // aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
public static int[] CompoundButton = new int[] {
16843015,
- 2130968667,
- 2130968668};
+ 2130772148,
+ 2130772149};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -6952,53 +7001,50 @@
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
- // aapt resource value: { 0x7F0400C9,0x7F040164 }
public static int[] CoordinatorLayout = new int[] {
- 2130968777,
- 2130968932};
+ 2130772248,
+ 2130772249};
// aapt resource value: 0
public const int CoordinatorLayout_keylines = 0;
- // aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
+ // aapt resource value: 1
+ public const int CoordinatorLayout_statusBarBackground = 1;
+
public static int[] CoordinatorLayout_Layout = new int[] {
16842931,
- 2130968780,
- 2130968781,
- 2130968782,
- 2130968785,
- 2130968786,
- 2130968787};
+ 2130772250,
+ 2130772251,
+ 2130772252,
+ 2130772253,
+ 2130772254,
+ 2130772255};
// aapt resource value: 0
public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
- // aapt resource value: 1
- public const int CoordinatorLayout_Layout_layout_anchor = 1;
-
// aapt resource value: 2
- public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
-
- // aapt resource value: 3
- public const int CoordinatorLayout_Layout_layout_behavior = 3;
+ public const int CoordinatorLayout_Layout_layout_anchor = 2;
// aapt resource value: 4
- public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
+ public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
+
+ // aapt resource value: 1
+ public const int CoordinatorLayout_Layout_layout_behavior = 1;
+
+ // aapt resource value: 6
+ public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
// aapt resource value: 5
public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
- // aapt resource value: 6
- public const int CoordinatorLayout_Layout_layout_keyline = 6;
+ // aapt resource value: 3
+ public const int CoordinatorLayout_Layout_layout_keyline = 3;
- // aapt resource value: 1
- public const int CoordinatorLayout_statusBarBackground = 1;
-
- // aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
public static int[] DesignTheme = new int[] {
- 2130968656,
- 2130968657,
- 2130968971};
+ 2130772256,
+ 2130772257,
+ 2130772258};
// aapt resource value: 0
public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -7009,70 +7055,61 @@
// aapt resource value: 2
public const int DesignTheme_textColorError = 2;
- // aapt resource value: { 0x7F04003A,0x7F04003B,0x7F040047,0x7F040065,0x7F04008C,0x7F0400B0,0x7F04011A,0x7F04018E }
public static int[] DrawerArrowToggle = new int[] {
- 2130968634,
- 2130968635,
- 2130968647,
- 2130968677,
- 2130968716,
- 2130968752,
- 2130968858,
- 2130968974};
-
- // 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;
+ 2130772150,
+ 2130772151,
+ 2130772152,
+ 2130772153,
+ 2130772154,
+ 2130772155,
+ 2130772156,
+ 2130772157};
// 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: { 0x7F040045,0x7F040046,0x7F04004E,0x7F040093,0x7F04009F,0x7F0400FF,0x7F040109,0x7F0401AB }
public static int[] FloatingActionButton = new int[] {
- 2130968645,
- 2130968646,
- 2130968654,
- 2130968723,
- 2130968735,
- 2130968831,
- 2130968841,
- 2130969003};
-
- // aapt resource value: 0
- public const int FloatingActionButton_backgroundTint = 0;
+ 2130772005,
+ 2130772221,
+ 2130772222,
+ 2130772259,
+ 2130772260,
+ 2130772261,
+ 2130772262,
+ 2130772263};
// aapt resource value: 1
- public const int FloatingActionButton_backgroundTintMode = 1;
-
- // aapt resource value: { 0x7F040048 }
- public static int[] FloatingActionButton_Behavior_Layout = new int[] {
- 2130968648};
-
- // aapt resource value: 0
- public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+ public const int FloatingActionButton_backgroundTint = 1;
// aapt resource value: 2
- public const int FloatingActionButton_borderWidth = 2;
+ public const int FloatingActionButton_backgroundTintMode = 2;
- // aapt resource value: 3
- public const int FloatingActionButton_elevation = 3;
+ // aapt resource value: 6
+ public const int FloatingActionButton_borderWidth = 6;
+
+ // aapt resource value: 0
+ public const int FloatingActionButton_elevation = 0;
// aapt resource value: 4
public const int FloatingActionButton_fabSize = 4;
@@ -7080,59 +7117,62 @@
// aapt resource value: 5
public const int FloatingActionButton_pressedTranslationZ = 5;
- // aapt resource value: 6
- public const int FloatingActionButton_rippleColor = 6;
+ // aapt resource value: 3
+ public const int FloatingActionButton_rippleColor = 3;
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
- // aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
- public static int[] FontFamily = new int[] {
- 2130968743,
- 2130968744,
- 2130968745,
- 2130968746,
- 2130968747,
- 2130968748};
-
- // aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
- public static int[] FontFamilyFont = new int[] {
- 2130968741,
- 2130968749,
- 2130968750};
+ public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+ 2130772264};
// aapt resource value: 0
- public const int FontFamilyFont_font = 0;
+ public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
- // aapt resource value: 1
- public const int FontFamilyFont_fontStyle = 1;
-
- // aapt resource value: 2
- public const int FontFamilyFont_fontWeight = 2;
+ public static int[] FontFamily = new int[] {
+ 2130772305,
+ 2130772306,
+ 2130772307,
+ 2130772308,
+ 2130772309,
+ 2130772310};
// aapt resource value: 0
public const int FontFamily_fontProviderAuthority = 0;
- // aapt resource value: 1
- public const int FontFamily_fontProviderCerts = 1;
-
- // aapt resource value: 2
- public const int FontFamily_fontProviderFetchStrategy = 2;
-
// aapt resource value: 3
- public const int FontFamily_fontProviderFetchTimeout = 3;
+ public const int FontFamily_fontProviderCerts = 3;
// aapt resource value: 4
- public const int FontFamily_fontProviderPackage = 4;
+ public const int FontFamily_fontProviderFetchStrategy = 4;
// aapt resource value: 5
- public const int FontFamily_fontProviderQuery = 5;
+ public const int FontFamily_fontProviderFetchTimeout = 5;
- // aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
+ // aapt resource value: 1
+ public const int FontFamily_fontProviderPackage = 1;
+
+ // aapt resource value: 2
+ public const int FontFamily_fontProviderQuery = 2;
+
+ public static int[] FontFamilyFont = new int[] {
+ 2130772311,
+ 2130772312,
+ 2130772313};
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_font = 1;
+
+ // aapt resource value: 0
+ public const int FontFamilyFont_fontStyle = 0;
+
+ // aapt resource value: 2
+ public const int FontFamilyFont_fontWeight = 2;
+
public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
- 2130968751};
+ 2130772265};
// aapt resource value: 0
public const int ForegroundLinearLayout_android_foreground = 0;
@@ -7143,146 +7183,142 @@
// aapt resource value: 2
public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
- // aapt resource value: { 0x7F040029,0x7F04002A,0x7F04002B,0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F0400B2 }
public static int[] HDLArcSeekBar = new int[] {
- 2130968617,
- 2130968618,
- 2130968619,
- 2130968620,
- 2130968621,
- 2130968622,
- 2130968623,
- 2130968624,
- 2130968625,
- 2130968626,
- 2130968627,
- 2130968628,
- 2130968629,
- 2130968630,
- 2130968631,
- 2130968632,
- 2130968633,
- 2130968754};
-
- // aapt resource value: 0
- public const int HDLArcSeekBar_arc_border_color = 0;
-
- // aapt resource value: 1
- public const int HDLArcSeekBar_arc_border_width = 1;
-
- // aapt resource value: 2
- public const int HDLArcSeekBar_arc_colors = 2;
-
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_max = 3;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_min = 4;
+ 2130772382,
+ 2130772383,
+ 2130772384,
+ 2130772385,
+ 2130772386,
+ 2130772387,
+ 2130772388,
+ 2130772389,
+ 2130772390,
+ 2130772391,
+ 2130772392,
+ 2130772393,
+ 2130772394,
+ 2130772395,
+ 2130772396,
+ 2130772397,
+ 2130772398,
+ 2130772399};
// aapt resource value: 5
- public const int HDLArcSeekBar_arc_open_angle = 5;
+ public const int HDLArcSeekBar_arc_border_color = 5;
+
+ // aapt resource value: 4
+ public const int HDLArcSeekBar_arc_border_width = 4;
+
+ // aapt resource value: 3
+ public const int HDLArcSeekBar_arc_colors = 3;
// aapt resource value: 6
- public const int HDLArcSeekBar_arc_progress = 6;
+ public const int HDLArcSeekBar_arc_max = 6;
// aapt resource value: 7
- public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+ public const int HDLArcSeekBar_arc_min = 7;
+
+ // aapt resource value: 1
+ public const int HDLArcSeekBar_arc_open_angle = 1;
// aapt resource value: 8
- public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+ public const int HDLArcSeekBar_arc_progress = 8;
- // aapt resource value: 9
- public const int HDLArcSeekBar_arc_rotate_angle = 9;
+ // aapt resource value: 16
+ public const int HDLArcSeekBar_arc_progress_bar_color = 16;
+
+ // aapt resource value: 17
+ public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+
+ // aapt resource value: 2
+ public const int HDLArcSeekBar_arc_rotate_angle = 2;
+
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_shadow_radius = 15;
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_shadow_radius = 10;
+ public const int HDLArcSeekBar_arc_thumb_color = 10;
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_color = 11;
-
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_radius = 12;
+ public const int HDLArcSeekBar_arc_thumb_radius = 11;
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
- // aapt resource value: 14
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
+ // aapt resource value: 12
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
- // aapt resource value: 15
- public const int HDLArcSeekBar_arc_thumb_width = 15;
-
- // aapt resource value: 16
- public const int HDLArcSeekBar_arc_width = 16;
-
- // aapt resource value: 17
- public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
-
- // aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130968702,
- 2130968703,
- 2130968704,
- 2130968705,
- 2130968706,
- 2130968847};
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_thumb_width = 9;
// aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
+ public const int HDLArcSeekBar_arc_width = 0;
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
+ // aapt resource value: 14
+ public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
+
+ public static int[] HDLCurtainSeekBar = new int[] {
+ 2130772400,
+ 2130772401,
+ 2130772402,
+ 2130772403,
+ 2130772404,
+ 2130772405};
// aapt resource value: 2
- public const int HDLCurtainSeekBar_curtain_bar_color = 2;
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_height = 3;
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
+
+ // aapt resource value: 0
+ public const int HDLCurtainSeekBar_curtain_bar_color = 0;
+
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_curtain_bar_height = 5;
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
- // aapt resource value: 5
- public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
- // aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
public static int[] HDLWaveSeekBar = new int[] {
- 2130968848,
- 2130969005,
- 2130969006,
- 2130969007,
- 2130969008,
- 2130969009};
-
- // aapt resource value: 0
- public const int HDLWaveSeekBar_second_wave_color = 0;
+ 2130772406,
+ 2130772407,
+ 2130772408,
+ 2130772409,
+ 2130772410,
+ 2130772411};
// aapt resource value: 1
- public const int HDLWaveSeekBar_wave_bg_color = 1;
+ public const int HDLWaveSeekBar_second_wave_color = 1;
// aapt resource value: 2
- public const int HDLWaveSeekBar_wave_border_color = 2;
+ public const int HDLWaveSeekBar_wave_bg_color = 2;
// aapt resource value: 3
- public const int HDLWaveSeekBar_wave_color = 3;
+ public const int HDLWaveSeekBar_wave_border_color = 3;
- // aapt resource value: 4
- public const int HDLWaveSeekBar_wave_height = 4;
+ // aapt resource value: 0
+ public const int HDLWaveSeekBar_wave_color = 0;
// aapt resource value: 5
- public const int HDLWaveSeekBar_wave_width = 5;
+ public const int HDLWaveSeekBar_wave_height = 5;
- // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
+ // aapt resource value: 4
+ public const int HDLWaveSeekBar_wave_width = 4;
+
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130968712,
- 2130968714,
- 2130968807,
- 2130968853};
+ 2130771988,
+ 2130772158,
+ 2130772159,
+ 2130772160};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -7302,10 +7338,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,
@@ -7324,13 +7365,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};
@@ -7341,7 +7375,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,
@@ -7368,7 +7401,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,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -7383,28 +7415,28 @@
16843236,
16843237,
16843375,
- 2130968589,
- 2130968607,
- 2130968608,
- 2130968616,
- 2130968689,
- 2130968764,
- 2130968765,
- 2130968813,
- 2130968852,
- 2130968999};
-
- // aapt resource value: 13
- public const int MenuItem_actionLayout = 13;
-
- // aapt resource value: 14
- public const int MenuItem_actionProviderClass = 14;
-
- // aapt resource value: 15
- public const int MenuItem_actionViewClass = 15;
+ 2130772161,
+ 2130772162,
+ 2130772163,
+ 2130772164,
+ 2130772165,
+ 2130772166,
+ 2130772167,
+ 2130772168,
+ 2130772169,
+ 2130772170};
// aapt resource value: 16
- public const int MenuItem_alphabeticModifiers = 16;
+ public const int MenuItem_actionLayout = 16;
+
+ // aapt resource value: 18
+ public const int MenuItem_actionProviderClass = 18;
+
+ // aapt resource value: 17
+ public const int MenuItem_actionViewClass = 17;
+
+ // aapt resource value: 13
+ public const int MenuItem_alphabeticModifiers = 13;
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
@@ -7445,25 +7477,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,0x7F0400FE,0x7F040166 }
+ // 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,
@@ -7472,8 +7503,8 @@
16843055,
16843056,
16843057,
- 2130968830,
- 2130968934};
+ 2130772171,
+ 2130772172};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -7502,18 +7533,17 @@
// aapt resource value: 8
public const int MenuView_subMenuArrow = 8;
- // aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F040093,0x7F0400B3,0x7F0400C4,0x7F0400C5,0x7F0400C7,0x7F0400C8,0x7F0400E8 }
public static int[] NavigationView = new int[] {
16842964,
16842973,
16843039,
- 2130968723,
- 2130968755,
- 2130968772,
- 2130968773,
- 2130968775,
- 2130968776,
- 2130968808};
+ 2130772005,
+ 2130772266,
+ 2130772267,
+ 2130772268,
+ 2130772269,
+ 2130772270,
+ 2130772271};
// aapt resource value: 0
public const int NavigationView_android_background = 0;
@@ -7527,63 +7557,28 @@
// aapt resource value: 3
public const int NavigationView_elevation = 3;
- // aapt resource value: 4
- public const int NavigationView_headerLayout = 4;
-
- // aapt resource value: 5
- public const int NavigationView_itemBackground = 5;
-
- // aapt resource value: 6
- public const int NavigationView_itemIconTint = 6;
+ // aapt resource value: 9
+ public const int NavigationView_headerLayout = 9;
// aapt resource value: 7
- public const int NavigationView_itemTextAppearance = 7;
-
- // aapt resource value: 8
- public const int NavigationView_itemTextColor = 8;
-
- // aapt resource value: 9
- public const int NavigationView_menu = 9;
-
- // aapt resource value: { 0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6,0x7F0401B7 }
- public static int[] pickerview = new int[] {
- 2130969010,
- 2130969011,
- 2130969012,
- 2130969013,
- 2130969014,
- 2130969015};
-
- // 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;
+ public const int NavigationView_itemBackground = 7;
// aapt resource value: 5
- public const int pickerview_wheelview_textSize = 5;
+ public const int NavigationView_itemIconTint = 5;
- // aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
+ // aapt resource value: 8
+ public const int NavigationView_itemTextAppearance = 8;
+
+ // aapt resource value: 6
+ public const int NavigationView_itemTextColor = 6;
+
+ // aapt resource value: 4
+ public const int NavigationView_menu = 4;
+
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130968814};
-
- // aapt resource value: { 0x7F040161 }
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130968929};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
+ 2130772173};
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -7594,10 +7589,15 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- // aapt resource value: { 0x7F0400EF,0x7F0400F2 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130772174};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
+
public static int[] RecycleListView = new int[] {
- 2130968815,
- 2130968818};
+ 2130772175,
+ 2130772176};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -7605,19 +7605,18 @@
// aapt resource value: 1
public const int RecycleListView_paddingTopNoTitle = 1;
- // aapt resource value: { 0x10100C4,0x10100F1,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0400CB,0x7F040108,0x7F040119,0x7F040160 }
public static int[] RecyclerView = new int[] {
16842948,
16842993,
- 2130968736,
- 2130968737,
- 2130968738,
- 2130968739,
- 2130968740,
- 2130968779,
- 2130968840,
- 2130968857,
- 2130968928};
+ 2130771968,
+ 2130771969,
+ 2130771970,
+ 2130771971,
+ 2130771972,
+ 2130771973,
+ 2130771974,
+ 2130771975,
+ 2130771976};
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
@@ -7625,66 +7624,63 @@
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
- // aapt resource value: 2
- public const int RecyclerView_fastScrollEnabled = 2;
-
- // aapt resource value: 3
- public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
-
- // aapt resource value: 4
- public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
-
- // aapt resource value: 5
- public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
-
// aapt resource value: 6
- public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
-
- // aapt resource value: 7
- public const int RecyclerView_layoutManager = 7;
-
- // aapt resource value: 8
- public const int RecyclerView_reverseLayout = 8;
+ public const int RecyclerView_fastScrollEnabled = 6;
// aapt resource value: 9
- public const int RecyclerView_spanCount = 9;
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
// aapt resource value: 10
- public const int RecyclerView_stackFromEnd = 10;
+ public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
- // aapt resource value: { 0x7F0400C2 }
+ // aapt resource value: 7
+ public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
+
+ // aapt resource value: 8
+ public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
+
+ // aapt resource value: 2
+ public const int RecyclerView_layoutManager = 2;
+
+ // aapt resource value: 4
+ public const int RecyclerView_reverseLayout = 4;
+
+ // aapt resource value: 3
+ public const int RecyclerView_spanCount = 3;
+
+ // aapt resource value: 5
+ public const int RecyclerView_stackFromEnd = 5;
+
public static int[] ScrimInsetsFrameLayout = new int[] {
- 2130968770};
+ 2130772272};
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
- // aapt resource value: { 0x7F04004A }
public static int[] ScrollingViewBehavior_Layout = new int[] {
- 2130968650};
+ 2130772273};
// aapt resource value: 0
public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
- // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F04005F,0x7F040070,0x7F040084,0x7F0400B1,0x7F0400BE,0x7F0400CA,0x7F040102,0x7F040103,0x7F04010C,0x7F04010D,0x7F040167,0x7F04016C,0x7F0401AC }
public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
16843364,
- 2130968671,
- 2130968688,
- 2130968708,
- 2130968753,
- 2130968766,
- 2130968778,
- 2130968834,
- 2130968835,
- 2130968844,
- 2130968845,
- 2130968935,
- 2130968940,
- 2130969004};
+ 2130772177,
+ 2130772178,
+ 2130772179,
+ 2130772180,
+ 2130772181,
+ 2130772182,
+ 2130772183,
+ 2130772184,
+ 2130772185,
+ 2130772186,
+ 2130772187,
+ 2130772188,
+ 2130772189};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -7698,84 +7694,83 @@
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
- // aapt resource value: 4
- public const int SearchView_closeIcon = 4;
-
- // aapt resource value: 5
- public const int SearchView_commitIcon = 5;
-
- // aapt resource value: 6
- public const int SearchView_defaultQueryHint = 6;
-
- // aapt resource value: 7
- public const int SearchView_goIcon = 7;
-
// aapt resource value: 8
- public const int SearchView_iconifiedByDefault = 8;
-
- // aapt resource value: 9
- public const int SearchView_layout = 9;
-
- // aapt resource value: 10
- public const int SearchView_queryBackground = 10;
-
- // aapt resource value: 11
- public const int SearchView_queryHint = 11;
-
- // aapt resource value: 12
- public const int SearchView_searchHintIcon = 12;
+ public const int SearchView_closeIcon = 8;
// aapt resource value: 13
- public const int SearchView_searchIcon = 13;
+ public const int SearchView_commitIcon = 13;
- // aapt resource value: 14
- public const int SearchView_submitBackground = 14;
+ // aapt resource value: 7
+ public const int SearchView_defaultQueryHint = 7;
+
+ // aapt resource value: 9
+ public const int SearchView_goIcon = 9;
+
+ // aapt resource value: 5
+ public const int SearchView_iconifiedByDefault = 5;
+
+ // aapt resource value: 4
+ public const int SearchView_layout = 4;
// aapt resource value: 15
- public const int SearchView_suggestionRowLayout = 15;
+ public const int SearchView_queryBackground = 15;
+
+ // aapt resource value: 6
+ public const int SearchView_queryHint = 6;
+
+ // aapt resource value: 11
+ public const int SearchView_searchHintIcon = 11;
+
+ // aapt resource value: 10
+ public const int SearchView_searchIcon = 10;
// aapt resource value: 16
- public const int SearchView_voiceIcon = 16;
+ public const int SearchView_submitBackground = 16;
- // aapt resource value: { 0x10100EA,0x10100EB,0x7F04011F,0x7F040122,0x7F040123,0x7F040124,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F040141,0x7F040142,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F040151,0x7F040152 }
+ // aapt resource value: 14
+ public const int SearchView_suggestionRowLayout = 14;
+
+ // aapt resource value: 12
+ public const int SearchView_voiceIcon = 12;
+
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 2130968863,
- 2130968866,
- 2130968867,
- 2130968868,
- 2130968875,
- 2130968876,
- 2130968877,
- 2130968878,
- 2130968879,
- 2130968880,
- 2130968881,
- 2130968884,
- 2130968885,
- 2130968886,
- 2130968887,
- 2130968888,
- 2130968889,
- 2130968891,
- 2130968892,
- 2130968893,
- 2130968894,
- 2130968897,
- 2130968898,
- 2130968901,
- 2130968902,
- 2130968903,
- 2130968904,
- 2130968905,
- 2130968906,
- 2130968907,
- 2130968908,
- 2130968909,
- 2130968910,
- 2130968913,
- 2130968914};
+ 2130772316,
+ 2130772326,
+ 2130772342,
+ 2130772343,
+ 2130772344,
+ 2130772345,
+ 2130772346,
+ 2130772347,
+ 2130772348,
+ 2130772349,
+ 2130772350,
+ 2130772351,
+ 2130772352,
+ 2130772353,
+ 2130772354,
+ 2130772355,
+ 2130772356,
+ 2130772357,
+ 2130772358,
+ 2130772359,
+ 2130772360,
+ 2130772361,
+ 2130772362,
+ 2130772363,
+ 2130772364,
+ 2130772365,
+ 2130772366,
+ 2130772367,
+ 2130772368,
+ 2130772369,
+ 2130772370,
+ 2130772371,
+ 2130772372,
+ 2130772373,
+ 2130772374};
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -7783,127 +7778,125 @@
// aapt resource value: 1
public const int SmartRefreshLayout_android_clipToPadding = 1;
- // aapt resource value: { 0x7F0400D6,0x7F0400D7 }
- public static int[] SmartRefreshLayout_Layout = new int[] {
- 2130968790,
- 2130968791};
-
- // aapt resource value: 0
- public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
-
- // aapt resource value: 1
- public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
-
// aapt resource value: 2
public const int SmartRefreshLayout_srlAccentColor = 2;
- // aapt resource value: 3
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
-
- // aapt resource value: 4
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlDragRate = 5;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
-
- // aapt resource value: 7
- public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
-
- // aapt resource value: 8
- public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
-
- // aapt resource value: 9
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
-
- // aapt resource value: 10
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
-
- // aapt resource value: 11
- public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
-
- // aapt resource value: 12
- public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
-
- // aapt resource value: 13
- public const int SmartRefreshLayout_srlEnableLoadMore = 13;
-
- // aapt resource value: 14
- public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
-
- // aapt resource value: 15
- public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
-
- // aapt resource value: 16
- public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
-
- // aapt resource value: 17
- public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
-
- // aapt resource value: 18
- public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
-
- // aapt resource value: 19
- public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
-
- // aapt resource value: 20
- public const int SmartRefreshLayout_srlEnableRefresh = 20;
-
- // aapt resource value: 21
- public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
-
- // aapt resource value: 22
- public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
-
- // aapt resource value: 23
- public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
-
- // aapt resource value: 24
- public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
-
- // aapt resource value: 25
- public const int SmartRefreshLayout_srlFooterHeight = 25;
-
- // aapt resource value: 26
- public const int SmartRefreshLayout_srlFooterInsetStart = 26;
-
- // aapt resource value: 27
- public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
-
- // aapt resource value: 28
- public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
-
- // aapt resource value: 29
- public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
-
- // aapt resource value: 30
- public const int SmartRefreshLayout_srlHeaderHeight = 30;
-
- // aapt resource value: 31
- public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
-
- // aapt resource value: 32
- public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+ // aapt resource value: 34
+ public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
// aapt resource value: 33
- public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+ public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
- // aapt resource value: 34
- public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+ // aapt resource value: 9
+ public const int SmartRefreshLayout_srlDragRate = 9;
- // aapt resource value: 35
- public const int SmartRefreshLayout_srlPrimaryColor = 35;
+ // aapt resource value: 21
+ public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
+
+ // aapt resource value: 31
+ public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
+
+ // aapt resource value: 30
+ public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
+
+ // aapt resource value: 28
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
+
+ // aapt resource value: 29
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
+
+ // aapt resource value: 17
+ public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
+
+ // aapt resource value: 16
+ public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
+
+ // aapt resource value: 15
+ public const int SmartRefreshLayout_srlEnableLoadMore = 15;
+
+ // aapt resource value: 27
+ public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
+
+ // aapt resource value: 24
+ public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
+
+ // aapt resource value: 22
+ public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
+
+ // aapt resource value: 32
+ public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
+
+ // aapt resource value: 20
+ public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
+
+ // aapt resource value: 23
+ public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
+
+ // aapt resource value: 14
+ public const int SmartRefreshLayout_srlEnableRefresh = 14;
+
+ // aapt resource value: 25
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
+
+ // aapt resource value: 26
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
// aapt resource value: 36
- public const int SmartRefreshLayout_srlReboundDuration = 36;
+ public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
- // aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
+ // aapt resource value: 35
+ public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
+
+ // aapt resource value: 6
+ public const int SmartRefreshLayout_srlFooterHeight = 6;
+
+ // aapt resource value: 8
+ public const int SmartRefreshLayout_srlFooterInsetStart = 8;
+
+ // aapt resource value: 11
+ public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
+
+ // aapt resource value: 19
+ public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
+
+ // aapt resource value: 13
+ public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
+
+ // aapt resource value: 5
+ public const int SmartRefreshLayout_srlHeaderHeight = 5;
+
+ // aapt resource value: 7
+ public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
+
+ // aapt resource value: 10
+ public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
+
+ // aapt resource value: 18
+ public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
+
+ // aapt resource value: 12
+ public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
+
+ // aapt resource value: 3
+ public const int SmartRefreshLayout_srlPrimaryColor = 3;
+
+ // aapt resource value: 4
+ public const int SmartRefreshLayout_srlReboundDuration = 4;
+
+ public static int[] SmartRefreshLayout_Layout = new int[] {
+ 2130772315,
+ 2130772375};
+
+ // aapt resource value: 1
+ public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+
+ // aapt resource value: 0
+ public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+
public static int[] SnackbarLayout = new int[] {
16843039,
- 2130968723,
- 2130968805};
+ 2130772005,
+ 2130772274};
// aapt resource value: 0
public const int SnackbarLayout_android_maxWidth = 0;
@@ -7914,13 +7907,12 @@
// aapt resource value: 2
public const int SnackbarLayout_maxActionInlineWidth = 2;
- // aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0400FC }
public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
16843362,
- 2130968828};
+ 2130772006};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -7937,22 +7929,21 @@
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
- // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F040116,0x7F04011D,0x7F04016D,0x7F04016E,0x7F040170,0x7F04018F,0x7F040190,0x7F040191,0x7F0401A8,0x7F0401A9,0x7F0401AA }
public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
- 2130968854,
- 2130968861,
- 2130968941,
- 2130968942,
- 2130968944,
- 2130968975,
- 2130968976,
- 2130968977,
- 2130969000,
- 2130969001,
- 2130969002};
+ 2130772190,
+ 2130772191,
+ 2130772192,
+ 2130772193,
+ 2130772194,
+ 2130772195,
+ 2130772196,
+ 2130772197,
+ 2130772198,
+ 2130772199,
+ 2130772200};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -7963,40 +7954,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: { 0x1010002,0x10100F2,0x101014F }
public static int[] TabItem = new int[] {
16842754,
16842994,
@@ -8011,57 +8001,56 @@
// aapt resource value: 2
public const int TabItem_android_text = 2;
- // aapt resource value: { 0x7F040171,0x7F040172,0x7F040173,0x7F040174,0x7F040175,0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B,0x7F04017C,0x7F04017D,0x7F04017E,0x7F04017F,0x7F040180 }
public static int[] TabLayout = new int[] {
- 2130968945,
- 2130968946,
- 2130968947,
- 2130968948,
- 2130968949,
- 2130968950,
- 2130968951,
- 2130968952,
- 2130968953,
- 2130968954,
- 2130968955,
- 2130968956,
- 2130968957,
- 2130968958,
- 2130968959,
- 2130968960};
-
- // aapt resource value: 0
- public const int TabLayout_tabBackground = 0;
-
- // aapt resource value: 1
- public const int TabLayout_tabContentStart = 1;
-
- // aapt resource value: 2
- public const int TabLayout_tabGravity = 2;
+ 2130772275,
+ 2130772276,
+ 2130772277,
+ 2130772278,
+ 2130772279,
+ 2130772280,
+ 2130772281,
+ 2130772282,
+ 2130772283,
+ 2130772284,
+ 2130772285,
+ 2130772286,
+ 2130772287,
+ 2130772288,
+ 2130772289,
+ 2130772290};
// aapt resource value: 3
- public const int TabLayout_tabIndicatorColor = 3;
+ public const int TabLayout_tabBackground = 3;
- // aapt resource value: 4
- public const int TabLayout_tabIndicatorHeight = 4;
+ // aapt resource value: 2
+ public const int TabLayout_tabContentStart = 2;
// aapt resource value: 5
- public const int TabLayout_tabMaxWidth = 5;
+ public const int TabLayout_tabGravity = 5;
+
+ // aapt resource value: 0
+ public const int TabLayout_tabIndicatorColor = 0;
+
+ // aapt resource value: 1
+ public const int TabLayout_tabIndicatorHeight = 1;
+
+ // aapt resource value: 7
+ public const int TabLayout_tabMaxWidth = 7;
// aapt resource value: 6
public const int TabLayout_tabMinWidth = 6;
- // aapt resource value: 7
- public const int TabLayout_tabMode = 7;
+ // aapt resource value: 4
+ public const int TabLayout_tabMode = 4;
- // aapt resource value: 8
- public const int TabLayout_tabPadding = 8;
+ // aapt resource value: 15
+ public const int TabLayout_tabPadding = 15;
- // aapt resource value: 9
- public const int TabLayout_tabPaddingBottom = 9;
+ // aapt resource value: 14
+ public const int TabLayout_tabPaddingBottom = 14;
- // aapt resource value: 10
- public const int TabLayout_tabPaddingEnd = 10;
+ // aapt resource value: 13
+ public const int TabLayout_tabPaddingEnd = 13;
// aapt resource value: 11
public const int TabLayout_tabPaddingStart = 11;
@@ -8069,16 +8058,15 @@
// aapt resource value: 12
public const int TabLayout_tabPaddingTop = 12;
- // aapt resource value: 13
- public const int TabLayout_tabSelectedTextColor = 13;
+ // aapt resource value: 10
+ public const int TabLayout_tabSelectedTextColor = 10;
- // aapt resource value: 14
- public const int TabLayout_tabTextAppearance = 14;
+ // aapt resource value: 8
+ public const int TabLayout_tabTextAppearance = 8;
- // aapt resource value: 15
- public const int TabLayout_tabTextColor = 15;
+ // aapt resource value: 9
+ public const int TabLayout_tabTextColor = 9;
- // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -8091,8 +8079,8 @@
16843107,
16843108,
16843692,
- 2130968742,
- 2130968961};
+ 2130772022,
+ 2130772028};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -8127,30 +8115,29 @@
// 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: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
+ // aapt resource value: 11
+ public const int TextAppearance_textAllCaps = 11;
+
public static int[] TextInputLayout = new int[] {
16842906,
16843088,
- 2130968698,
- 2130968699,
- 2130968700,
- 2130968701,
- 2130968724,
- 2130968725,
- 2130968758,
- 2130968759,
- 2130968760,
- 2130968822,
- 2130968823,
- 2130968824,
- 2130968825,
- 2130968826};
+ 2130772291,
+ 2130772292,
+ 2130772293,
+ 2130772294,
+ 2130772295,
+ 2130772296,
+ 2130772297,
+ 2130772298,
+ 2130772299,
+ 2130772300,
+ 2130772301,
+ 2130772302,
+ 2130772303,
+ 2130772304};
// aapt resource value: 1
public const int TextInputLayout_android_hint = 1;
@@ -8158,41 +8145,41 @@
// aapt resource value: 0
public const int TextInputLayout_android_textColorHint = 0;
- // aapt resource value: 2
- public const int TextInputLayout_counterEnabled = 2;
-
- // aapt resource value: 3
- public const int TextInputLayout_counterMaxLength = 3;
-
- // aapt resource value: 4
- public const int TextInputLayout_counterOverflowTextAppearance = 4;
-
- // aapt resource value: 5
- public const int TextInputLayout_counterTextAppearance = 5;
-
// aapt resource value: 6
- public const int TextInputLayout_errorEnabled = 6;
+ public const int TextInputLayout_counterEnabled = 6;
// aapt resource value: 7
- public const int TextInputLayout_errorTextAppearance = 7;
-
- // aapt resource value: 8
- public const int TextInputLayout_hintAnimationEnabled = 8;
+ public const int TextInputLayout_counterMaxLength = 7;
// aapt resource value: 9
- public const int TextInputLayout_hintEnabled = 9;
+ public const int TextInputLayout_counterOverflowTextAppearance = 9;
+
+ // aapt resource value: 8
+ public const int TextInputLayout_counterTextAppearance = 8;
+
+ // aapt resource value: 4
+ public const int TextInputLayout_errorEnabled = 4;
+
+ // aapt resource value: 5
+ public const int TextInputLayout_errorTextAppearance = 5;
// aapt resource value: 10
- public const int TextInputLayout_hintTextAppearance = 10;
+ public const int TextInputLayout_hintAnimationEnabled = 10;
- // aapt resource value: 11
- public const int TextInputLayout_passwordToggleContentDescription = 11;
+ // aapt resource value: 3
+ public const int TextInputLayout_hintEnabled = 3;
+
+ // aapt resource value: 2
+ public const int TextInputLayout_hintTextAppearance = 2;
+
+ // aapt resource value: 13
+ public const int TextInputLayout_passwordToggleContentDescription = 13;
// aapt resource value: 12
public const int TextInputLayout_passwordToggleDrawable = 12;
- // aapt resource value: 13
- public const int TextInputLayout_passwordToggleEnabled = 13;
+ // aapt resource value: 11
+ public const int TextInputLayout_passwordToggleEnabled = 11;
// aapt resource value: 14
public const int TextInputLayout_passwordToggleTint = 14;
@@ -8200,37 +8187,36 @@
// aapt resource value: 15
public const int TextInputLayout_passwordToggleTintMode = 15;
- // aapt resource value: { 0x10100AF,0x1010140,0x7F040057,0x7F040061,0x7F040062,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F0400E3,0x7F0400E4,0x7F0400E6,0x7F0400EA,0x7F0400EB,0x7F0400FC,0x7F040168,0x7F040169,0x7F04016A,0x7F040197,0x7F040199,0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0 }
public static int[] Toolbar = new int[] {
16842927,
16843072,
- 2130968663,
- 2130968673,
- 2130968674,
- 2130968690,
- 2130968691,
- 2130968692,
- 2130968693,
- 2130968694,
- 2130968695,
- 2130968803,
- 2130968804,
- 2130968806,
- 2130968810,
- 2130968811,
- 2130968828,
- 2130968936,
- 2130968937,
- 2130968938,
- 2130968983,
- 2130968985,
- 2130968986,
- 2130968987,
- 2130968988,
- 2130968989,
- 2130968990,
- 2130968991,
- 2130968992};
+ 2130771980,
+ 2130771983,
+ 2130771987,
+ 2130771999,
+ 2130772000,
+ 2130772001,
+ 2130772002,
+ 2130772003,
+ 2130772004,
+ 2130772006,
+ 2130772201,
+ 2130772202,
+ 2130772203,
+ 2130772204,
+ 2130772205,
+ 2130772206,
+ 2130772207,
+ 2130772208,
+ 2130772209,
+ 2130772210,
+ 2130772211,
+ 2130772212,
+ 2130772213,
+ 2130772214,
+ 2130772215,
+ 2130772216,
+ 2130772217};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -8238,20 +8224,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;
@@ -8259,106 +8245,118 @@
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
+ // aapt resource value: 5
+ public const int Toolbar_contentInsetStart = 5;
+
// aapt resource value: 9
- public const int Toolbar_contentInsetStart = 9;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetStartWithNavigation = 10;
-
- // aapt resource value: 11
- public const int Toolbar_logo = 11;
-
- // aapt resource value: 12
- public const int Toolbar_logoDescription = 12;
-
- // aapt resource value: 13
- public const int Toolbar_maxButtonHeight = 13;
-
- // aapt resource value: 14
- public const int Toolbar_navigationContentDescription = 14;
-
- // aapt resource value: 15
- public const int Toolbar_navigationIcon = 15;
-
- // aapt resource value: 16
- public const int Toolbar_popupTheme = 16;
-
- // aapt resource value: 17
- public const int Toolbar_subtitle = 17;
-
- // aapt resource value: 18
- public const int Toolbar_subtitleTextAppearance = 18;
-
- // aapt resource value: 19
- public const int Toolbar_subtitleTextColor = 19;
-
- // aapt resource value: 20
- public const int Toolbar_title = 20;
-
- // aapt resource value: 21
- public const int Toolbar_titleMargin = 21;
-
- // aapt resource value: 22
- public const int Toolbar_titleMarginBottom = 22;
-
- // aapt resource value: 23
- public const int Toolbar_titleMarginEnd = 23;
-
- // aapt resource value: 26
- public const int Toolbar_titleMargins = 26;
-
- // aapt resource value: 24
- public const int Toolbar_titleMarginStart = 24;
-
- // aapt resource value: 25
- public const int Toolbar_titleMarginTop = 25;
-
- // aapt resource value: 27
- public const int Toolbar_titleTextAppearance = 27;
-
- // aapt resource value: 28
- public const int Toolbar_titleTextColor = 28;
-
- // aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
- public static int[] TwoLevelHeader = new int[] {
- 2130968890,
- 2130968895,
- 2130968899,
- 2130968900,
- 2130968911,
- 2130968915};
-
- // aapt resource value: 0
- public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
-
- // aapt resource value: 1
- public const int TwoLevelHeader_srlEnableTwoLevel = 1;
-
- // aapt resource value: 2
- public const int TwoLevelHeader_srlFloorDuration = 2;
-
- // aapt resource value: 3
- public const int TwoLevelHeader_srlFloorRage = 3;
+ public const int Toolbar_contentInsetStartWithNavigation = 9;
// aapt resource value: 4
- public const int TwoLevelHeader_srlMaxRage = 4;
+ public const int Toolbar_logo = 4;
+
+ // aapt resource value: 26
+ public const int Toolbar_logoDescription = 26;
+
+ // aapt resource value: 20
+ public const int Toolbar_maxButtonHeight = 20;
+
+ // aapt resource value: 25
+ public const int Toolbar_navigationContentDescription = 25;
+
+ // aapt resource value: 24
+ public const int Toolbar_navigationIcon = 24;
+
+ // aapt resource value: 11
+ public const int Toolbar_popupTheme = 11;
+
+ // aapt resource value: 3
+ public const int Toolbar_subtitle = 3;
+
+ // aapt resource value: 13
+ public const int Toolbar_subtitleTextAppearance = 13;
+
+ // aapt resource value: 28
+ public const int Toolbar_subtitleTextColor = 28;
+
+ // aapt resource value: 2
+ public const int Toolbar_title = 2;
+
+ // aapt resource value: 14
+ public const int Toolbar_titleMargin = 14;
+
+ // aapt resource value: 18
+ public const int Toolbar_titleMarginBottom = 18;
+
+ // aapt resource value: 16
+ public const int Toolbar_titleMarginEnd = 16;
+
+ // aapt resource value: 15
+ public const int Toolbar_titleMarginStart = 15;
+
+ // aapt resource value: 17
+ public const int Toolbar_titleMarginTop = 17;
+
+ // aapt resource value: 19
+ public const int Toolbar_titleMargins = 19;
+
+ // aapt resource value: 12
+ public const int Toolbar_titleTextAppearance = 12;
+
+ // aapt resource value: 27
+ public const int Toolbar_titleTextColor = 27;
+
+ public static int[] TwoLevelHeader = new int[] {
+ 2130772376,
+ 2130772377,
+ 2130772378,
+ 2130772379,
+ 2130772380,
+ 2130772381};
// aapt resource value: 5
- public const int TwoLevelHeader_srlRefreshRage = 5;
+ public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
- // aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
+ // aapt resource value: 4
+ public const int TwoLevelHeader_srlEnableTwoLevel = 4;
+
+ // aapt resource value: 3
+ public const int TwoLevelHeader_srlFloorDuration = 3;
+
+ // aapt resource value: 1
+ public const int TwoLevelHeader_srlFloorRage = 1;
+
+ // aapt resource value: 0
+ public const int TwoLevelHeader_srlMaxRage = 0;
+
+ // aapt resource value: 2
+ public const int TwoLevelHeader_srlRefreshRage = 2;
+
public static int[] View = new int[] {
16842752,
16842970,
- 2130968816,
- 2130968817,
- 2130968973};
+ 2130772218,
+ 2130772219,
+ 2130772220};
- // aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
+ // 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,
- 2130968645,
- 2130968646};
+ 2130772221,
+ 2130772222};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -8369,7 +8367,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,
@@ -8384,20 +8381,31 @@
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
- // aapt resource value: 1
- public const int View_android_focusable = 1;
-
- // aapt resource value: 0
- public const int View_android_theme = 0;
-
- // aapt resource value: 2
- public const int View_paddingEnd = 2;
-
- // aapt resource value: 3
- public const int View_paddingStart = 3;
+ public static int[] pickerview = new int[] {
+ 2130772412,
+ 2130772413,
+ 2130772414,
+ 2130772415,
+ 2130772416,
+ 2130772417};
// aapt resource value: 4
- public const int View_theme = 4;
+ public const int pickerview_wheelview_dividerColor = 4;
+
+ // aapt resource value: 0
+ public const int pickerview_wheelview_gravity = 0;
+
+ // aapt resource value: 5
+ public const int pickerview_wheelview_lineSpacingMultiplier = 5;
+
+ // aapt resource value: 3
+ public const int pickerview_wheelview_textColorCenter = 3;
+
+ // aapt resource value: 2
+ public const int pickerview_wheelview_textColorOut = 2;
+
+ // aapt resource value: 1
+ public const int pickerview_wheelview_textSize = 1;
static Styleable()
{
@@ -8405,25 +8413,6 @@
}
private Styleable()
- {
- }
- }
-
- public partial class Xml
- {
-
- // aapt resource value: 0x7F100000
- public const int file_paths = 2131755008;
-
- // aapt resource value: 0x7F100001
- public const int hdl_filepaths = 2131755009;
-
- static Xml()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Xml()
{
}
}
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 33ceb2b..0d14059 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -562,6 +562,7 @@
<BundleResource Include="Resources\Phone\Item\Switch1.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\Check.png" />
+ <BundleResource Include="Resources\Phone\Item\ScanQrCodeGroud.png" />
<BundleResource Include="Resources\Phone\Item\MessageManagement.png" />
<BundleResource Include="Resources\Phone\Item\Add_GW.png" />
<BundleResource Include="Resources\Phone\Item\Battery.png" />
@@ -635,6 +636,7 @@
<BundleResource Include="Resources\Phone\Item\SynchronizationSelected.png" />
<BundleResource Include="Resources\Phone\Item\BottomButtonGround.png" />
<BundleResource Include="Resources\Phone\Item\AutoBackup.png" />
+ <BundleResource Include="Resources\Phone\Item\TransferOfResidence.png" />
<BundleResource Include="Resources\Phone\Item\BatterySelected.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBGSelected.png" />
<BundleResource Include="Resources\Phone\Item\NoFunction.png" />
@@ -857,6 +859,7 @@
<BundleResource Include="Resources\Phone\Device\ConverterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotionSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected.png" />
<BundleResource Include="Resources\Phone\Device\RelaySelected.png" />
<BundleResource Include="Resources\Phone\Device\Socket1Selected.png" />
@@ -864,6 +867,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButton.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SwitchSelected.png" />
@@ -874,6 +878,7 @@
<BundleResource Include="Resources\Phone\Device\ThirdPartyDevice.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGatewaySelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotion.png" />
<BundleResource Include="Resources\Phone\Device\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected2.png" />
@@ -896,6 +901,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanel.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwoSelected2.png" />
<BundleResource Include="Resources\Phone\Device\FreshAirEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButtonSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\Device\DryContact.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected2.png" />
@@ -932,6 +938,7 @@
<BundleResource Include="Resources\Phone\Device\RepeaterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButtonSelected2.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected2.png" />
@@ -939,6 +946,7 @@
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotionSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwo.png" />
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index cd9614f..1185889 100755
--- a/ZigbeeApp/Home.Ios/Info.plist
+++ b/ZigbeeApp/Home.Ios/Info.plist
@@ -54,9 +54,9 @@
<key>aps-environment</key>
<string>development</string>
<key>CFBundleShortVersionString</key>
- <string>1.1.0120081901</string>
+ <string>1.1.0120082402</string>
<key>CFBundleVersion</key>
- <string>2020081901</string>
+ <string>2020082402</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
diff --git a/ZigbeeApp/Home.Ios/Resources/DeviceName.ini b/ZigbeeApp/Home.Ios/Resources/DeviceName.ini
index be83f7f..2cccf66 100755
--- a/ZigbeeApp/Home.Ios/Resources/DeviceName.ini
+++ b/ZigbeeApp/Home.Ios/Resources/DeviceName.ini
@@ -118,6 +118,12 @@
MPR0310-ZB.10 = 2300 / 3璺紑鍏冲皬妯″潡 / 3璺紑鍏冲皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
;鏂规偊鏂伴灏忔ā鍧�
MFA01-ZB.10 = 2310 / 鏂规偊鏂伴灏忔ā鍧� / 鏂规偊鏂伴灏忔ā鍧� / 2300 / 缁х數鍣� / 鏂伴妯″潡
+;鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡
+MLR0310-ZB.20= 2311 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
+;娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡
+MLR0205-ZB.18= 2312 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
+;娆ф爣14璺共鎺ョ偣灏忔ā鍧�
+MLDRY14-ZB.18= 2313 / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 2300 / 缁х數鍣� / 骞叉帴鐐规ā鍧�
;***************************************************************
; 璋冨厜鍣ㄨ澶�
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
old mode 100644
new mode 100755
index e960eea..568a03f
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -343,6 +343,11 @@
339=鐭娓╁害澶辫触
340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
341=璇疯緭鍏ユ纭殑鏁板��
+342=璇疯緭鍏ユ纭殑娓╁害鍊�
+343=璇疯緭鍏ユ纭殑婀垮害鍊�
+344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+345=鐩爣鍚嶇О澶暱
+346=鐭ラ亾浜�
5097=鍙栨秷
5098=纭畾
@@ -1890,6 +1895,17 @@
16147=寮�鍏抽敭
16148=杩囨埛
16149=浣忓畢杩囨埛
+16150=杞Щ浣忓畢鍒板叾浠朎voyo
+16151=Home璐﹀彿
+16152=璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+16153=1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+16154=2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+16155=3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+16156=杩囨埛璐﹀彿
+16157=璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+16158=鏌ョ湅
+16159=瀹氭椂鑷姩鍏抽棴
+16160=涓嶅叧闂�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButton.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButton.png
new file mode 100755
index 0000000..5c472b6
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButton.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected.png
new file mode 100755
index 0000000..ee6ad95
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected2.png
new file mode 100755
index 0000000..ffcf6fd
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorEmergencyButtonSelected2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotion.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotion.png
new file mode 100755
index 0000000..22723f6
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotion.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected.png
new file mode 100755
index 0000000..bb287fd
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected2.png
new file mode 100755
index 0000000..0f56c72
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorMotionSelected2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/ScanQrCodeGroud.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/ScanQrCodeGroud.png
new file mode 100755
index 0000000..257298f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/ScanQrCodeGroud.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidence.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidence.png
new file mode 100755
index 0000000..1fd7221
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidence.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 3c622c9..d72d0b2 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,7 +42,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0120081801";
+ public static string CodeIDString = "1.1.0120082701";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 43449e8..8031876 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -260,7 +260,10 @@
dicExist.Remove(maikey);
}
//鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
- HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
+ if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
+ {
+ System.Threading.Thread.Sleep(200);
+ }
//瀵规湭鍛藉悕鐨勮櫄鎷熻澶囬噸鏂板懡鍚�
if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
{
@@ -1275,10 +1278,15 @@
/// <returns></returns>
public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
{
- var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
- var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
- jObject.Add("Data", data);
- var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", jObject.ToString(), "Device/SetEPDeviceFunctionTypeRespon");
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ device.DfunctionType = functionType;
+ return true;
+ }
+ //鑾峰彇鍛戒护瀛楃
+ var sendCommond = this.GetDeviceFunctionTypeCommandText(device, functionType);
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", sendCommond, "Device/SetEPDeviceFunctionTypeRespon");
if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
{
return false;
@@ -1290,6 +1298,20 @@
return resultData["Result"].ToString() == "0";
}
return false;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧鍔熻兘绫诲瀷鐨勫懡浠ゆ枃鏈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="functionType"></param>
+ /// <returns></returns>
+ public string GetDeviceFunctionTypeCommandText(CommonDevice device, DeviceFunctionType functionType)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
+ jObject.Add("Data", data);
+ return jObject.ToString();
}
#endregion
@@ -1376,9 +1398,10 @@
{
if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
|| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment
+ || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
|| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
- //鏂伴闈㈡澘/绠�绾﹀鍔熻兘/绠�绾︾幆澧冮潰鏉� 娓╁害浼犳劅鍣�
+ //鏂伴闈㈡澘/绠�绾﹀鍔熻兘/绠�绾�/鏂规偊鐜闈㈡澘 娓╁害浼犳劅鍣�
return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
}
else if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
@@ -2741,12 +2764,30 @@
var localDevice = this.GetDevice(mainkeys);
var tempDevice = localDevice == null ? device : localDevice;
+ //濡傛灉杩欎釜璁惧ID鍙樻洿浜嗙殑璇�
+ bool typeNotEquals = localDevice != null && deviceID != localDevice.Type;
+ if (typeNotEquals == true)
+ {
+ //閲嶆柊New杩欎釜瀵硅薄
+ typeNotEquals = this.ReNewDeviceOnTypeIsChanged(localDevice, deviceID);
+ //閲嶆柊鍐嶆鑾峰彇瀵硅薄
+ tempDevice = this.GetDevice(mainkeys);
+ }
+
//鍒锋柊灞炴��
this.SetDeviceInfoToMain(tempDevice, device);
if (this.RefreshDeviceFunctionType(tempDevice, device, false) == true)
{
//闇�瑕佸彂閫佸姛鑳界被鍨嬬粰缃戝叧
listFucDevice.Add(tempDevice);
+ }
+ if (typeNotEquals == true)
+ {
+ //閲嶆柊鐢熸垚缂撳瓨
+ tempDevice.ReSave();
+ HdlAutoBackupLogic.AddOrEditorFile(tempDevice.FilePath);
+ //鍏ㄩ儴涓婚〉鑿滃崟闇�瑕佸埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
}
}
}
@@ -2838,6 +2879,45 @@
return listDevice;
}
+ /// <summary>
+ /// 鍦ㄨ澶嘥ype鍙樻洿鏃�,閲嶆柊New杩欎釜璁惧瀵硅薄(浠呴檺鍦ㄥ埛鏂拌澶囧垪琛ㄤ娇鐢�,骞朵笖鏈湴闇�瑕佸瓨鍦�)
+ /// </summary>
+ /// <param name="oldLocalDevice">鍘熸潵鐨勬湰鍦板璞�</param>
+ /// <param name="newDeviceType">鏂扮殑璁惧Type</param>
+ private bool ReNewDeviceOnTypeIsChanged(CommonDevice oldLocalDevice, DeviceType newDeviceType)
+ {
+ //鍏堣幏鍙栨湰鍦拌繖涓棫璁惧瀵硅薄鐨刯son
+ string oldFile = System.IO.Path.Combine(Config.Instance.FullPath, oldLocalDevice.FilePath);
+ var deviceData = HdlFileLogic.Current.ReadFileTextContent(oldFile);
+ if (deviceData == null)
+ {
+ //搴旇涓嶄細
+ return false;
+ }
+ //鏍规嵁鏂癟ype閲嶆柊New瀵硅薄
+ var newDevice = CommonDevice.CommonDeviceByByteString(newDeviceType.ToString(), deviceData);
+ if (newDevice == null)
+ {
+ //濂藉儚鏈夌偣鍙兘
+ return false;
+ }
+ //鍒犻櫎鏈湴鏂囦欢
+ HdlFileLogic.Current.DeleteFile(oldFile);
+ HdlAutoBackupLogic.DeleteFile(oldLocalDevice.FilePath);
+
+ //閲嶆柊鐢熸垚鏂囦欢
+ if (newDevice.IsCustomizeImage == false)
+ {
+ newDevice.IconPath = string.Empty;
+ }
+ string mainkey = this.GetDeviceMainKeys(newDevice);
+ lock (dicAllDevice)
+ {
+ this.dicAllDevice[mainkey] = newDevice;
+ }
+ return true;
+ }
+
#endregion
#region 鈻� 鍒涘缓鏂拌澶囧璞＄浉鍏砡________________
@@ -2890,6 +2970,7 @@
mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
mainDevice.Profile = device.DeviceInfo.Profile;
mainDevice.Type = device.Type;
+ mainDevice.DeviceID = (int)device.Type;
//鍥轰欢鐗堟湰
mainDevice.ImgVersion = device.DeviceInfo.ImgVersion;
@@ -3434,7 +3515,19 @@
/// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
/// </summary>
Relay_FangyueFreshAirModul = 2310,
-
+ /// <summary>
+ /// 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2311(涓存椂)
+ /// </summary>
+ Relay_NationalThreeLoadTenA = 2311,
+ /// <summary>
+ /// 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2312(涓存椂)
+ /// </summary>
+ Relay_EuropeanTwoLoadFiveA = 2312,
+ /// <summary>
+ /// 娆ф爣14璺共鎺ョ偣灏忔ā鍧� 闀滃儚id锛�2313(涓存椂)
+ /// </summary>
+ Relay_EuropeanFourteenLoadDryContact = 2313,
+
//=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
/// <summary>
/// 璋冨厜鍣�
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 5d257fd..ae86e44 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -179,6 +179,11 @@
/// <param name="autoBackup">鏄惁澶囦唤</param>
public void Save(bool autoBackup = true)
{
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鍏佽淇濆瓨
+ if (this.IsShowTemplate == true)
+ {
+ return;
+ }
//淇敼鏃堕棿
this.LastEditorTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm");
var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, Id);
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index c86ec02..20b2fd3 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 19fadf8..980ca24 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
index 95824c1..1229952 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
@@ -625,6 +625,11 @@
杈撳叆鏂囧瓧鍙樺寲浜嬩欢
</summary>
</member>
+ <member name="M:Shared.EditText.SetSelectionEnd">
+ <summary>
+ 璁剧疆鐒︾偣浣嶇疆鍒版渶鍚�
+ </summary>
+ </member>
<member name="F:Shared.FocusEventArgs.Focus">
<summary>
true 涓鸿幏鍙栧埌鐒︾偣
@@ -3251,6 +3256,11 @@
鍒锋柊placeholderUILabel甯冨眬
</summary>
</member>
+ <member name="M:Shared.EditTextView.SetSelectionEnd">
+ <summary>
+ 璁剧疆鐒︾偣浣嶇疆鍒版渶鍚�
+ </summary>
+ </member>
<member name="T:Shared.HorizontalPages">
<summary>
棣栭〉杞挱鍥�
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index 6e0c21b..de9322f 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index e4e0207..74dd958 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
index 25b2d3e..23e0121 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
@@ -267,6 +267,16 @@
GPS浣嶇疆鍙樺寲浜嬩欢
</summary>
</member>
+ <member name="M:Shared.Application.StartGPSLocationService">
+ <summary>
+ 寮�鍚畾浣嶆湇鍔�
+ </summary>
+ </member>
+ <member name="M:Shared.Application.StopGPSLocationService">
+ <summary>
+ 鍏抽棴瀹氫綅鏈嶅姟
+ </summary>
+ </member>
<member name="T:Shared.Button">
<summary>
Button 鎸夐敭
@@ -2448,6 +2458,22 @@
<param name="application">Application.</param>
<param name="deviceToken">Device token.</param>
</member>
+ <member name="T:Shared.MyCLLocationManager">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="P:Shared.MyCLLocationManager.IsLocationServicesEnabled">
+ <summary>
+ 鐢ㄦ埛鏄惁鍏佽瀹氫綅鍔熻兘
+ </summary>
+ </member>
+ <member name="M:Shared.MyCLLocationManager.adjustDistanceFilter(CoreLocation.CLLocation)">
+ 瑙勫垯: 濡傛灉閫熷害灏忎簬minSpeed m/s 鍒欐妸瑙﹀彂鑼冨洿璁惧畾涓�100m
+ 鍚﹀垯灏嗚Е鍙戣寖鍥磋瀹氫负minSpeed*minInteval
+ 姝ゆ椂鑻ラ�熷害鍙樺寲瓒呰繃10% 鍒欐洿鏂板綋鍓嶇殑瑙﹀彂鑼冨洿(杩欓噷闄愬埗鏄洜涓轰笉鑳戒笉鍋滅殑璁剧疆distanceFilter,
+ 鍚﹀垯uploadLocation浼氫笉鍋滆瑙﹀彂)
+ </member>
<member name="F:Shared.MusicInfo.Title">
<summary>
姝屾洸鍚嶇О
diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 3c1a90e..62a53db 100755
--- a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -225,6 +225,7 @@
//鍦烘櫙鍚嶇О
var rowScene = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.SceneName), this.cloneScene.Name);
rowScene.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.PleaseInputSceneName);
+ rowScene.txtInput.MaxByte = 32;//闄愬埗鍙兘杈撳叆32涓瓧鑺�
rowScene.Y = btnTitle.Bottom + Application.GetRealHeight(23);
frameBack.AddChidren(rowScene);
rowScene.InitControl();
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index b09d0bf..41140ca 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -582,15 +582,30 @@
}
HdlThreadLogic.Current.RunThread(() =>
{
- for (int i = 0; i < listContr.Count; i++)
+ while (listView.Parent != null)
{
- if (listView.Parent == null)
+ bool hadSend = false;
+ for (int i = 0; i < listContr.Count; i++)
{
- return;
+ if (listView.Parent == null)
+ {
+ return;
+ }
+ //濡傛灉杩樻病鏈夋帴鏀跺埌鏁版嵁,鍒欏啀娆″彂閫�
+ if (listContr[i].ReceiveResponeResultStatu() == false)
+ {
+ //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
+ listContr[i].SendStatuComand();
+ hadSend = true;
+ System.Threading.Thread.Sleep(200);
+ }
}
- System.Threading.Thread.Sleep(200);
- //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
- listContr[i].SendStatuComand();
+ if (hadSend == false)
+ {
+ //濡傛灉宸茬粡鍏ㄩ儴鍥炶矾閮芥帴鏀朵簡缃戝叧鍥炲,鍒欎笉鍐嶄簩娆″彂閫�
+ break;
+ }
+ System.Threading.Thread.Sleep(2000);
}
}, ShowErrorMode.NO);
@@ -913,7 +928,8 @@
//璁惧鐘舵�佸繀椤诲埛鏂�
string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
contr.SetDeviceStatuText(statuText);
-
+ //浼犳劅鍣ㄥ垏鎹负鐏拌壊鐘舵��
+ contr.SwitchRowStatuAppeal(false);
}, ShowErrorMode.NO);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 69f42ef..8966fec 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -271,6 +271,13 @@
//绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
isOpen = false;
}
+ //濡傛灉鏄紶鎰熷櫒绫�,鍒欓粯璁ゆ槸鍏崇殑鏁堟灉
+ if (this.device.Type == DeviceType.PMSensor || this.device.Type == DeviceType.IASZone
+ || this.device.Type == DeviceType.TemperatureSensor)
+ {
+ isOpen = false;
+ }
+
this.SetRowOpenStatu(isOpen);
}
@@ -443,6 +450,15 @@
this.ResponeResult = 1;
}
+ /// <summary>
+ /// 鎺ユ敹缃戝叧鍥炲鐨勭姸鎬�(true:宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍥炲 false:杩樻病鏈夋帴鏀跺埌缃戝叧鍥炲)
+ /// </summary>
+ /// <returns></returns>
+ public bool ReceiveResponeResultStatu()
+ {
+ return this.ResponeResult == 1;
+ }
+
#endregion
#region 鈻� 鏄剧ず浣庣數閲廮________________________
@@ -545,7 +561,7 @@
/// <summary>
/// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
/// </summary>
- private void SwitchRowStatuAppeal(bool isOpen)
+ public void SwitchRowStatuAppeal(bool isOpen)
{
if (this.btnDeviceName.IsSelected == isOpen)
{
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
index 415ff8d..43bd5cb 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
@@ -28,11 +28,18 @@
var btnSwitch = this.AddSwitchControl();
btnSwitch.ButtonClickEvent += (sender, e) =>
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, i_device, null));
//濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鐩存帴淇敼缂撳瓨
if (Common.Config.Instance.Home.IsVirtually == true)
{
//鐩存帴鍙樻洿缂撳瓨
((LightBase)i_device).OnOffStatus = btnSwitch.IsSelected == true ? 0 : 1;
+ if (((LightBase)i_device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, i_device, new object[] { 100 });
+ }
this.RefreshControlInfo(this.device);
return;
}
@@ -46,13 +53,21 @@
{
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
- i_device.SwitchControl(1);
- HdlThreadLogic.Current.RunThread(() =>
+ if (level == 0)
{
- //鑾峰彇鐏厜浜害
- System.Threading.Thread.Sleep(300);
- HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
- });
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, i_device, new object[] { 254 });
+ }
+ else
+ {
+ i_device.SwitchControl(1);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇鐏厜浜害
+ System.Threading.Thread.Sleep(300);
+ HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
+ });
+ }
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs
index aa7e70f..5f148d0 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs
@@ -28,11 +28,18 @@
var btnSwitch = this.AddSwitchControl();
btnSwitch.ButtonClickEvent += (sender, e) =>
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, i_device, null));
//濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鐩存帴淇敼缂撳瓨
if (Common.Config.Instance.Home.IsVirtually == true)
{
//鐩存帴鍙樻洿缂撳瓨
((LightBase)i_device).OnOffStatus = btnSwitch.IsSelected == true ? 0 : 1;
+ if (((LightBase)i_device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, i_device, new object[] { 100 });
+ }
this.RefreshControlInfo(this.device);
return;
}
@@ -46,13 +53,21 @@
{
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
- i_device.SwitchControl(1);
- HdlThreadLogic.Current.RunThread(() =>
+ if (level == 0)
{
- //鑾峰彇鐏厜浜害
- System.Threading.Thread.Sleep(300);
- HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
- });
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, i_device, new object[] { 254 });
+ }
+ else
+ {
+ i_device.SwitchControl(1);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇鐏厜浜害
+ System.Threading.Thread.Sleep(300);
+ HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
+ });
+ }
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index b039c42..adbd012 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -7,6 +7,7 @@
using ZigBee.Device;
using Shared.Phone.Device.Logic.LogicView;
+
namespace Shared.Phone.Device.Logic
{
@@ -18,14 +19,13 @@
}
public void Show()
{
-
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
-
+
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
@@ -478,8 +478,10 @@
accounts.Add("Latitude", latitudW.ToString());
accounts.Add("Longitude", longitudeH.ToString());
accounts.Add("Radius", mRadius.ToString());
+
LogicIfon.Addaccounts(accounts);
LogicIfon.AddLocationconditions(LocationConditionsInfo);
+
var logicCommunalPage = new LogicCommunalPage();
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
@@ -575,6 +577,7 @@
};
}
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 9412a75..11d924f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -108,17 +108,6 @@
}
}
- //foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
- //{
- // if (deviceinfo["Type"] == "1")
- // {
- // if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
- // {
- // devices = deviceinfo;
- // break;
- // }
- // }
- //}
}
else
{
@@ -131,17 +120,7 @@
TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
}
}
- //foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
- //{
- // if (deviceinfo["LinkType"].ToString() == "0")
- // {
- // if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
- // {
- // TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
- // break;
- // }
- // }
- //}
+
}
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index f1e2b56..72ffbac 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -157,16 +157,16 @@
Y = Application.GetRealHeight(140 + 20),
Height = Application.GetRealHeight(160 * count),
};
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ completeView.Show(count).AddChidren(vV);
//娓呴櫎涔嬪墠鐨勬帶浠�;
vV.RemoveAll();
- completeView.Show(count).AddChidren(vV);
}
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
string userId = "";
string openMode = "";
string accountName = "";
string SelectedDeviceStatuscondition = "";
-
for (int i = 0; i < user.UserIdMode.Count; i++)
{
var userifon = user.UserIdMode[i];
@@ -174,7 +174,7 @@
mFunView lockView = new mFunView();
if (user.UserIdMode.Count > 9)
{
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+
vV.AddChidren(lockView.Show());
}
else
@@ -243,8 +243,6 @@
}
}
-
-
completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
{
var lockConditionsInfo = new Dictionary<string, string>();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index f9b736b..ab5d4e5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -212,7 +212,6 @@
state = Language.StringByID(MyInternationalizationString.someone);
}
}
-
}
break;
case 21:
@@ -298,7 +297,6 @@
}
break;
-
default:
{
if (intvalue == "1")
@@ -540,10 +538,6 @@
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
selecteddevice.selecetdFrameLayout.RemoveFromParent();
- //var logicCommunalPage = new LogicCommunalPage();
- //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //logicCommunalPage.Show(() => { });
};
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 626cb01..b5069a6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -144,7 +144,6 @@
{
-
int count = user.UserIdMode.Count;
#region -------鍙栨秷 瀹屾垚
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
@@ -171,10 +170,10 @@
Y = Application.GetRealHeight(140 + 20),
Height = Application.GetRealHeight(160 * count),
};
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ completeView.Show(count).AddChidren(vV);
//娓呴櫎涔嬪墠鐨勬帶浠�;
vV.RemoveAll();
- completeView.Show(count).AddChidren(vV);
-
}
#endregion
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
@@ -189,7 +188,7 @@
mFunView lockView = new mFunView();
if (user.UserIdMode.Count > 9)
{
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+
vV.AddChidren(lockView.Show());
}
else
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 7f76b73..62ce91a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -901,6 +901,60 @@
UserView.HomePage.Instance.RemoveViewByTag("Logic");//绉婚櫎鎵�鏈夋爣璁癓ogic鐣岄潰
if (LogicView.IfString._Logic == if_logic)
{
+
+ //鏌ヨ-褰撳墠閫昏緫-鏄惁娣诲姞鍦扮悊浣嶇疆浣滀负鏉′欢
+ var exist = Common.Logic.CurrentLogic.Conditions.Find((obj) => obj["Type"] == "7");
+ if (exist==null)
+ {
+ bool if_type = false;
+ //鏌ヨ-閫昏緫鍒楄〃-鏄惁娣诲姞杩囧湴鐞嗕綅缃綔涓烘潯浠�
+ for (int a = 0; a < Common.Logic.LogicList.Count; a++)
+ {
+ var logic = Common.Logic.LogicList[a];
+ var exist_logic = logic.Conditions.Find((obj) => obj["Type"] == "7");
+ if (exist_logic != null)
+ {
+ //鏄惁瀛樺湪鍦扮悊浣嶇疆鏉′欢
+ if_type = true;
+ //閫�鍑篺or寰幆
+ break;
+ }
+ }
+ if (if_type)
+ {
+ //鏌ヨ涔嬪墠鐘舵�佹槸鍚﹀凡缁忓紑鍚疓PS鏈嶅姟(浠ユ湰鍦板瓨鍌ㄧ姸鎬佷负涓� 0:娌″紑鍚�; 1锛氬紑鍚�)
+ if (Send.If_Exist == "0")
+ {
+ //寮�鍚疓PS鏈嶅姟
+ Application.StartGPSLocationService();
+ //淇濆瓨GPS鏈嶅姟寮�鍚姸鎬�
+ Send.SaveLocalFile(Config.Instance.HomeId + "_GPS_File", "1");
+ }
+
+ }
+ else
+ {
+ //濡傛灉鎵句笉鍒板湴鐞嗕綅缃綔涓烘潯浠剁殑璇�,鍏抽棴GPS鏈嶅姟(鍑忓皯鑰楃數)
+ if (Send.If_Exist == "1")
+ {
+ //鍏抽棴GPS鏈嶅姟
+ Application.StopGPSLocationService();
+ //淇濆瓨GPS鏈嶅姟鍏抽棴鐘舵��
+ Send.SaveLocalFile(Config.Instance.HomeId + "_GPS_File", "0");
+ }
+ }
+ }
+ else
+ {
+ //鏌ヨ涔嬪墠鐘舵�佹槸鍚﹀凡缁忓紑鍚疓PS鏈嶅姟(浠ユ湰鍦板瓨鍌ㄧ姸鎬佷负涓� 0:娌″紑鍚�; 1锛氬紑鍚�)
+ if (Send.If_Exist == "0")
+ {
+ //寮�鍚疓PS鏈嶅姟
+ Application.StartGPSLocationService();
+ //淇濆瓨GPS鏈嶅姟寮�鍚姸鎬�
+ Send.SaveLocalFile(Config.Instance.HomeId + "_GPS_File", "1");
+ }
+ }
//鍙埛鏂板垎绫�-鑷姩鍖栦笂涓嬫粦鍔╲iew锛�
Phone.Category.CategoryMainForm.instance?.RefreshBodyView();
// Category.Category.instance?.RefreshBodyView();
@@ -944,5 +998,8 @@
/// 鐣岄潰楂樺害
/// </summary>
public static int H = 1922;
+
+
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 5ce1f29..1292f36 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -318,44 +318,39 @@
Send.dictionary(brightnessDictionary, "Data2", "0");
Button seekIconBtn = new Button
{
- Y = Application.GetRealHeight(140 + 154),
+ Y = Application.GetRealHeight(140 + 160),
X = Application.GetRealWidth(78),
Height = Application.GetRealHeight(12),
- Width = Application.GetRealWidth(918),
+ Width = Application.GetRealWidth(918 - 120),
UnSelectedImagePath = "ZigeeLogic/seek.png",
+ Gravity = Gravity.CenterHorizontal
};
- completeView.Show(2).AddChidren(seekIconBtn);
- var horizontalSeekBarVol = new DiyImageSeekBar
- {
- Y = Application.GetRealHeight(140),
- X = Application.GetRealWidth(78),
- Width = Application.GetRealWidth(918),
- Height = Application.GetRealHeight(320),//婊戝姩鏉＄埗鎺т欢楂樺害
- IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
- IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
- ProgressBarColor = 0x00000000,// ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
- SeekBarBackgroundColor = 0x00000000,
- ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
- ThumbImageHeight = Application.GetRealHeight(89),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
- ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
- SeekBarViewHeight = Application.GetRealHeight(12),//杩涘害鏉＄殑楂樺害10
- MinValue = 30,
- MaxValue = 60,
- ProgressBarUnitSring = "K",//鍒囨崲鍗曚綅
- };
+ completeView.Show(2).AddChidren(seekIconBtn);
+
+ var horizontalSeekBarVol = new UserCenter.SeekBarControl(918)
+ {
+ ProgressBarColor = 0x00000000,// ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ SeekBarBackgroundColor = 0x00000000,
+ SeekBarViewHeight = Application.GetRealHeight(20),
+ SeekBarPadding = Application.GetRealWidth(60),
+ MinValue = 30,
+ MaxValue = 60,
+ ProgressChangeDelayTime = 0,
+ };
completeView.Show(2).AddChidren(horizontalSeekBarVol);
+ horizontalSeekBarVol.Y = seekIconBtn.Y - (horizontalSeekBarVol.Height - seekIconBtn.Height) / 2;
+ horizontalSeekBarVol.ShowCustomTextView(Application.GetRealWidth(200), 12, ZigbeeColor.Current.LogicBtnCancelColor);
EventHandler<int> progressclick = (sender, e) =>
{
+ horizontalSeekBarVol.SetCustomText(e * 100 + "K");
selectedDeviceStatus = "8";
var lightbrightnessvalue = 1000000 / (100 * horizontalSeekBarVol.Progress);
Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString());
DicValue("8", brightnessDictionary);
- status = horizontalSeekBarVol.Progress.ToString() + "K";
+ status =horizontalSeekBarVol.Progress.ToString() + "K";
};
horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
-
if (TaskList != null && TaskList.Count != 0)
{
@@ -365,12 +360,16 @@
{
var intvalue = int.Parse(value["Data1"]);
var lightbrightnessvalue = 1000000 / (intvalue * 100);
- horizontalSeekBarVol.Progress = lightbrightnessvalue;
+ horizontalSeekBarVol.Progress = lightbrightnessvalue;
+
break;
}
}
- }
+ }
+ var intValue = horizontalSeekBarVol.Progress;
+ if (intValue == 0) { intValue = 30; }
+ horizontalSeekBarVol.SetCustomText(intValue * 100 + "K");
}
break;
case "铚傞福鍣�":
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 04d882d..1f50bbe 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -12,6 +12,7 @@
{
public class Send
{
+
#region ----Logic鎵�鏈夊彂閫佸懡浠�
/// <summary>
/// 鑾峰彇LogicId鐨勬柟娉�
@@ -22,7 +23,9 @@
return await System.Threading.Tasks.Task.Run(async () =>
{
List<int> logicIdList = new List<int>();
-
+
+ bool if_theme = false;
+ int if_number = -1;
Action<string, string> action = (topic, data) =>
{
var gatewayID = topic.Split('/')[0];
@@ -34,19 +37,19 @@
if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
{
-
- var list = jObjectdata["Data"]["LogicList"];
- if (list == null)
+ if_theme = true;
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(jObjectdata["Data"]["LogicList"].ToString());
+ if_number = list.Count;
+ if (list.Count == 0)
{
return;
}
foreach (var listIfon in list)
{
- var logicId = int.Parse(listIfon["LogicId"].ToString());
+ var logicId = int.Parse(listIfon["LogicId"]);
logicIdList.Add(logicId);
}
-
}
};
var mainGateWay = ZbGateway.MainGateWay;
@@ -72,9 +75,13 @@
while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
{
await System.Threading.Tasks.Task.Delay(100);
- if (logicIdList.Count != 0)
+ if (if_theme)
{
- break;
+ if (if_number == 0 || if_number == logicIdList.Count)
+ {
+ break;//鍥炲娌℃湁鏁版嵁绔嬪埢杩斿洖
+ }
+
}
}
ZbGateway.MainGateWay.GwResDataAction -= action;
@@ -103,7 +110,6 @@
if (topic == $"{gatewayID}/Logic/GetLogicInfo_Respon")
{
-
logic = new Common.Logic();
var Logicifon = jObjectdata["Data"];
logic.LogicId = int.Parse(Logicifon["LogicId"]?.ToString());
@@ -248,7 +254,6 @@
{
try
{
- Logicifon = new Common.Logic();
Logicifon = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Logic>(jObjectdata["Data"].ToString());
}
catch (Exception ex)
@@ -652,7 +657,6 @@
{
var listLogic = new List<Common.Logic>();
- // bool @bool = false;
Action<string, string> action = (topic, data) =>
{
var gatewayID = topic.Split('/')[0];
@@ -664,7 +668,6 @@
if (topic == $"{gatewayID}/Logic/GetAllLogicListInfo_Respon")
{
-
var logic = new Common.Logic();
var Logicifon = jObjectdata["Data"];
logic.LogicId = int.Parse(Logicifon["LogicId"].ToString());
@@ -723,10 +726,7 @@
}
}
- //if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
- //{
- // @bool = true;
- //}
+
};
var mainGateWay = ZbGateway.MainGateWay;
if (mainGateWay == null)
@@ -751,10 +751,6 @@
{
break;
}
- //if (@bool)
- //{
- // break;
- //}
}
ZbGateway.MainGateWay.GwResDataAction -= action;
return listLogic;
@@ -804,7 +800,7 @@
while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
{
await System.Threading.Tasks.Task.Delay(100);
- if (sceneui != null)
+ if (sceneui != null && sceneui.Id > 0)
{
break;
}
@@ -1324,6 +1320,23 @@
#region 瀛樺彇鏈湴鏂囦欢鐨勬柟娉� ---鏆傛椂涓嶇敤鍚堝苟璇ユ柟娉�---
/// <summary>
+ /// 鍒ゆ柇鏄惁寮�鍚疓PS鏈嶅姟
+ /// </summary>
+ public static string If_Exist
+ {
+ get
+ {
+ string value = ReadLocalFile(Config.Instance.HomeId+"_GPS_File");
+ //璇诲彇鏈湴GPS鏈嶅姟鐘舵��
+ if (value == "0"||string.IsNullOrEmpty(value))
+ {
+ return "0";
+ }
+ return "1";
+ }
+
+ }
+ /// <summary>
/// 鏂囦欢淇濆瓨
/// </summary>
/// <param name="FileName">鏂囦欢璺緞</param>
@@ -1337,7 +1350,19 @@
//鍐欏叆鏁版嵁锛�
Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
}
-
+ /// <summary>
+ /// 鏂囦欢淇濆瓨
+ /// </summary>
+ /// <param name="FileName">鏂囦欢璺緞</param>
+ /// <param name="data">瀛楃涓�</param>
+ public static void SaveLocalFile(string FileName, string data)
+ {
+ //鍏堝簭鍒楀寲鏁版嵁锛�
+ //鏁版嵁杞崲涓哄瓧鑺傛祦锛�
+ var byteData = System.Text.Encoding.UTF8.GetBytes(data);
+ //鍐欏叆鏁版嵁锛�
+ Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
+ }
/// <summary>
/// 鏂囦欢璇诲彇
/// </summary>
@@ -1345,11 +1370,6 @@
/// <returns></returns>
public static string ReadLocalFile(string FileName)
{
- if (System.IO.File.Exists(FileName) == false)
- {
- ///鍒ゆ柇鏄惁鏈夋枃浠�;
- return null;
- }
//璇诲嚭淇濆瓨璇ヨ矾寰勭殑鏂囦欢锛�
var varByte = Shared.IO.FileUtils.ReadFile(FileName);
//瀛楄妭娴佽浆鎹负瀛楃涓诧紱
@@ -1372,6 +1392,6 @@
deviceConditionsInfo.Add(Key, Value);
}
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index bf13f19..f10e1fc 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鏄惁鍚屾剰闅愮鍗忚
/// </summary>
- private bool isAgreePrivacyPolicy = true;
+ private bool isAgreePrivacyPolicy = false;
#endregion
@@ -190,7 +190,7 @@
};
//娣诲姞鏈嶅姟鍗忚鎺т欢
- //this.AddServiceAgreementControl(frameMidBack);
+ this.AddServiceAgreementControl(frameMidBack);
//娓稿浣撻獙
var btnTiyan = new NormalViewControl(300, 100, true);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
index b935e42..fba1360 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -301,7 +301,7 @@
{
//婊戝姩杩囩▼涓�
int oldProgressValue = arcScaleSeekBar.Progress;//涔嬪墠鐨勫��
- arcScaleSeekBar.OnProgressChangedEvent += (send2, value) =>
+ arcScaleSeekBar.OnStopTrackingTouchEvent += (send2, value) =>
{
nowProgressValue = value;
};
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs
index cc9f72d..8aab3d5 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs
@@ -31,10 +31,6 @@
/// </summary>
private bool isProgressing = false;
/// <summary>
- /// 鑳藉惁鍙戦�佽繘搴﹀��
- /// </summary>
- private bool canSetProgressValue = true;
- /// <summary>
/// 鏄惁宸茬粡鍒濆鍖栦簡鎺т欢(鍥犱负搴曞眰鏈夊彲鑳戒細鍒锋柊鏁翠釜鐣岄潰)
/// </summary>
private bool hadInitControl = false;
@@ -79,6 +75,7 @@
waveSeekBar.MaxValue = 100;
waveSeekBar.Progress = (int)(((DimmableLight)this.device).Level * 1.0 / MaxLevel * 100);
waveSeekBar.CornerRadius = Application.GetRealHeight(58);
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
frameWhiteBack.AddChidren(waveSeekBar);
//寮�鍏�
@@ -97,17 +94,9 @@
//璁剧疆鍒濆鐘舵��
this.IsLightOpen = ((LightBase)this.device).OnOffStatus == 1;
- this.canSetProgressValue = this.IsLightOpen;
if (IsLightOpen == true)
{
btnSwitch.IsSelected = true;
- waveSeekBar.IsClickable = true;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
- }
- else
- {
- waveSeekBar.IsClickable = false;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
//褰╃伅鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
@@ -174,14 +163,19 @@
}
this.hadInitControl = true;
+ if (Config.Instance.Home.IsVirtually == true)
+ {
+ //铏氭嫙浣忓畢
+ return;
+ }
+
//寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
HdlThreadLogic.Current.RunThread(() =>
{
while (this.Parent != null)
{
System.Threading.Thread.Sleep(1000);
- if (nowProgressValue == oldProgressValue
- || this.canSetProgressValue == false)
+ if (nowProgressValue == oldProgressValue)
{
//鍊间竴鏍�
continue;
@@ -203,17 +197,21 @@
/// <param name="isOpen"></param>
private void SetSwitchCommand(bool isOpen)
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(this.device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, this.device, null));
//濡傛灉浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
((LightBase)this.device).OnOffStatus = isOpen == true ? 1 : 0;
+ if (((LightBase)this.device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ this.device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, this.device, new object[] { 100 });
+ }
//鍒锋柊寮�鍏崇姸鎬�
this.RefreshSwitchStatu(isOpen);
return;
}
-
- //褰撴寜涓嬪紑鍏虫寜閽椂,涓嶈兘鍐嶅彂閫佽繘搴﹀��
- this.canSetProgressValue = false;
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
@@ -229,21 +227,20 @@
//鐘舵�佸彇鍙�
listControl[0].IsSelected = statu;
}
- if (statu == true)
- {
- //绛夊緟缁撴灉缁撴潫鍚�,褰╃伅鎺т欢鍙互婊戝姩
- waveSeekBar.IsClickable = true;
- }
});
});
-
- //鍙戦�佺瓑寰呯殑鏃堕棿鍐�,涓嶈兘婊戝姩褰╃伅鎺т欢
- waveSeekBar.IsClickable = false;
-
if (isOpen == true)
{
//鎵撳紑
- this.device.SwitchControl(1);
+ if (level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ this.device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, this.device, new object[] { 254 });
+ }
+ else
+ {
+ this.device.SwitchControl(1);
+ }
}
else
{
@@ -290,16 +287,17 @@
{
//浜害鏄繀椤昏鍒锋柊鐨� 浜害 XX
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + " " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
- if (this.isProgressing == false)
- {
- //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
- waveSeekBar.Progress = (int)(((DimmableLight)this.device).Level * 1.0 / MaxLevel * 100);
- }
}
if (isOpen == false && this.IsLightOpen == true)
{
//鐘舵�佷笉涓�鏍�,鎵嶅彉鏇村瓧鏍�:鍏抽棴
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ }
+
+ if (this.isProgressing == false)
+ {
+ //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
+ waveSeekBar.Progress = (int)(((DimmableLight)this.device).Level * 1.0 / MaxLevel * 100);
}
if (listControl[0].IsSelected != isOpen)
@@ -308,23 +306,7 @@
listControl[0].IsSelected = isOpen;
}
- //鐘舵�佷笉涓�鏍锋墠鍙樻洿
- if (this.IsLightOpen != isOpen)
- {
- if (isOpen == true)
- {
- waveSeekBar.IsClickable = true;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
- }
- else
- {
- waveSeekBar.IsClickable = false;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
- }
- }
this.IsLightOpen = isOpen;
- //鍥炲鐨勭粨鏋滆,澶勪簬鎵撳紑鐘舵�佹墠鑳藉彂閫�
- this.canSetProgressValue = this.IsLightOpen;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorTemperatureLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorTemperatureLightDetailCardForm.cs
index 833d002..f233a45 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorTemperatureLightDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorTemperatureLightDetailCardForm.cs
@@ -75,6 +75,7 @@
waveSeekBar.MaxValue = 100;
waveSeekBar.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);
waveSeekBar.CornerRadius = Application.GetRealHeight(58);
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
frameWhiteBack.AddChidren(waveSeekBar);
//寮�鍏�
@@ -97,13 +98,6 @@
if (IsLightOpen == true)
{
btnSwitch.IsSelected = true;
- waveSeekBar.IsClickable = true;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
- }
- else
- {
- waveSeekBar.IsClickable = false;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
//褰╃伅鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
@@ -252,10 +246,18 @@
/// <param name="isOpen"></param>
private void SetSwitchCommand(bool isOpen)
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(this.device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, this.device, null));
+
//濡傛灉浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
((LightBase)this.device).OnOffStatus = isOpen == true ? 1 : 0;
+ if (((LightBase)this.device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ this.device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, this.device, new object[] { 100 });
+ }
//鍒锋柊寮�鍏崇姸鎬�
this.RefreshSwitchStatu(isOpen);
return;
@@ -278,20 +280,20 @@
//鐘舵�佸彇鍙�
listControl[0].IsSelected = statu;
}
- if (statu == true)
- {
- //绛夊緟缁撴灉缁撴潫鍚�,褰╃伅鎺т欢鍙互婊戝姩
- waveSeekBar.IsClickable = true;
- }
});
});
-
- //鍙戦�佺瓑寰呯殑鏃堕棿鍐�,涓嶈兘婊戝姩褰╃伅鎺т欢
- waveSeekBar.IsClickable = false;
if (isOpen == true)
{
//鎵撳紑
- this.device.SwitchControl(1);
+ if (level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ this.device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, this.device, new object[] { 254 });
+ }
+ else
+ {
+ this.device.SwitchControl(1);
+ }
}
else
{
@@ -338,38 +340,23 @@
{
//浜害鏄繀椤昏鍒锋柊鐨� 浜害 XX
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + " " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
- if (this.isProgressing == false)
- {
- //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
- waveSeekBar.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);
- }
}
if (isOpen == false && this.IsLightOpen == true)
{
//鐘舵�佷笉涓�鏍�,鎵嶅彉鏇村瓧鏍�:鍏抽棴
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
}
-
if (listControl[0].IsSelected != isOpen)
{
//寮�鍏崇姸鎬佸彉鏇�
listControl[0].IsSelected = isOpen;
}
-
- //鐘舵�佷笉涓�鏍锋墠鍙樻洿
- if (this.IsLightOpen != isOpen)
+ if (this.isProgressing == false)
{
- if (isOpen == true)
- {
- waveSeekBar.IsClickable = true;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
- }
- else
- {
- waveSeekBar.IsClickable = false;
- waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
- }
+ //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
+ waveSeekBar.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);
}
+
this.IsLightOpen = isOpen;
//鍥炲鐨勭粨鏋滆,澶勪簬鎵撳紑鐘舵�佹墠鑳藉彂閫�
this.canSetProgressValue = this.IsLightOpen;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
index 693b662..c30c0e5 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
@@ -43,10 +43,6 @@
/// </summary>
private bool isColorProgressing = false;
/// <summary>
- /// 鑳藉惁鍙戦�佽繘搴﹀��
- /// </summary>
- private bool canSetProgressValue = true;
- /// <summary>
/// 1:鍙戦�佺殑鏄皬澶滅伅 2:鍙戦�佺殑鏄渹楦ｅ櫒
/// </summary>
private int sendDiv = 0;
@@ -140,7 +136,7 @@
seekBarColor.ProgressChangeDelayTime = 0;
frameWhiteBack.AddChidren(seekBarColor);
//鏄剧ず鑷畾涔夋枃鏈�
- seekBarColor.ShowCustomTextView(Application.GetRealWidth(150), 15, UserCenterColor.Current.TextGrayColor3);
+ seekBarColor.ShowCustomTextView(Application.GetRealWidth(200), 15, UserCenterColor.Current.TextGrayColor3);
//璁剧疆鍒濆鍊�
int colorValue = ((ColorTemperatureLight)this.device).ColorTemperature;
if (colorValue == 0) { colorValue = 3000; }
@@ -202,13 +198,6 @@
this.SetLightSwitchCommand(!btnMiniSwitch.IsSelected);
};
btnMiniSwitch.IsSelected = ((LightBase)this.device).OnOffStatus == 1;
- this.canSetProgressValue = btnMiniSwitch.IsSelected;
- if (btnMiniSwitch.IsSelected == false)
- {
- //鍦ㄦ病鏈夋墦寮�澶滅伅寮�鍏充箣鍓�,涓嶅厑璁告粦鍔�
- seekBarLight.Enable = false;
- seekBarColor.Enable = false;
- }
//浜害寮�濮嬫粦鍔ㄧ殑浜嬩欢
seekBarLight.OnStartTrackingTouchEvent += (sender, e) =>
@@ -231,11 +220,8 @@
{
if (Common.Config.Instance.Home.IsVirtually == false)
{
- if (this.canSetProgressValue == true)
- {
- //鑳藉鍙戦�佽繘搴﹀�肩殑鏃跺��,鎵嶈褰�
- nowLightValue = value;
- }
+ //鑳藉鍙戦�佽繘搴﹀�肩殑鏃跺��,鎵嶈褰�
+ nowLightValue = value;
}
else
{
@@ -270,11 +256,8 @@
seekBarColor.SetCustomText(value * 100 + "K");
if (Common.Config.Instance.Home.IsVirtually == false)
{
- if (this.canSetProgressValue == true)
- {
- //鑳藉鍙戦�佽繘搴﹀�肩殑鏃跺��,鎵嶈褰�
- nowColorValue = value;
- }
+ //鑳藉鍙戦�佽繘搴﹀�肩殑鏃跺��,鎵嶈褰�
+ nowColorValue = value;
}
else
{
@@ -282,8 +265,13 @@
((ColorTemperatureLight)this.device).ColorTemperature = value * 100;
}
};
+ if (Config.Instance.Home.IsVirtually == true)
+ {
+ //铏氭嫙浣忓畢
+ return;
+ }
- //寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
+ //寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
HdlThreadLogic.Current.RunThread(() =>
{
while (this.Parent != null)
@@ -303,20 +291,17 @@
((ColorTemperatureLight)this.device).SetColorTemperature(value);
}
}
- if (this.canSetProgressValue == true)
+ //鐣岄潰鍏抽棴鏃�
+ if (nowLightValue != oldLightValue)
{
- //鐣岄潰鍏抽棴鏃�
- if (nowLightValue != oldLightValue)
- {
- //鍙戦�佷寒搴﹀��
- ((ColorTemperatureLight)this.device).SetLevel((int)(nowLightValue * MaxLevel / 100.0));
- }
- if (nowColorValue != oldColorValue)
- {
- //鍙戦�佽壊娓╁��
- int value = 1000000 / (nowColorValue * 100);
- ((ColorTemperatureLight)this.device).SetColorTemperature(value);
- }
+ //鍙戦�佷寒搴﹀��
+ ((ColorTemperatureLight)this.device).SetLevel((int)(nowLightValue * MaxLevel / 100.0));
+ }
+ if (nowColorValue != oldColorValue)
+ {
+ //鍙戦�佽壊娓╁��
+ int value = 1000000 / (nowColorValue * 100);
+ ((ColorTemperatureLight)this.device).SetColorTemperature(value);
}
});
}
@@ -331,17 +316,21 @@
/// <param name="isOpen"></param>
private void SetLightSwitchCommand(bool isOpen)
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(this.device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, this.device, null));
//濡傛灉浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
((LightBase)this.device).OnOffStatus = isOpen == true ? 1 : 0;
+ if (((LightBase)this.device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ this.device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, this.device, new object[] { 100 });
+ }
//鍒锋柊寮�鍏崇姸鎬�
this.RefreshSwitchStatu(isOpen);
return;
}
-
- //褰撴寜涓嬪紑鍏虫寜閽椂,涓嶈兘鍐嶅彂閫佽繘搴﹀��
- this.canSetProgressValue = false;
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(new List<ButtonBase> { this.btnMiniSwitch.btnIcon }, (result) =>
@@ -354,18 +343,6 @@
bool statu = ((LightBase)this.device).OnOffStatus == 1;
//鍒锋柊寮�鍏崇姸鎬�
this.RefreshSwitchStatu(statu);
- if (statu == true)
- {
- //褰撴槸鎵撳紑鐘舵�佹椂,缃戝叧璇村畠浼氶粯璁ゆ妸浜害鍙樻垚100%
- //浠ラ槻涓囦竴,杩欓噷鍐嶆璇诲彇涓�涓�
- HdlThreadLogic.Current.RunThread(() =>
- {
- ((ColorTemperatureLight)device).ReadLevel();
- System.Threading.Thread.Sleep(300);
- ((ColorTemperatureLight)device).ReadColorTemperature();
- });
-
- }
}
});
});
@@ -374,7 +351,15 @@
if (isOpen == true)
{
//鎵撳紑
- this.device.SwitchControl(1);
+ if (level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ this.device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, this.device, new object[] { 254 });
+ }
+ else
+ {
+ this.device.SwitchControl(1);
+ }
}
else
{
@@ -490,41 +475,33 @@
{
//浜害鏄繀椤昏鍒锋柊鐨� 浜害 XX
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + " " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
- if (this.isLightProgressing == false)
- {
- //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
- seekBarLight.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);
- }
- if (this.isColorProgressing == false)
- {
- //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
- seekBarColor.Progress = (int)(((ColorTemperatureLight)this.device).ColorTemperature / 100);
- //璁剧疆鑷畾涔夌殑鏂囨湰
- seekBarColor.SetCustomText(seekBarColor.Progress * 100 + "K");
- }
if (this.btnMiniSwitch.IsSelected == false)
{
this.btnMiniSwitch.IsSelected = true;
}
- //婊戝姩鏉″彲浠ユ粦鍔�
- seekBarLight.Enable = true;
- seekBarColor.Enable = true;
}
else
{
- //鍙樻洿瀛楁牱:鍏抽棴
- this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
if (this.btnMiniSwitch.IsSelected == true)
{
this.btnMiniSwitch.IsSelected = false;
+ //鍙樻洿瀛楁牱:鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
}
- //婊戝姩鏉′笉鍙互婊戝姩
- seekBarLight.Enable = false;
- seekBarColor.Enable = false;
}
- //鍥炲鐨勭粨鏋滆,澶勪簬鎵撳紑鐘舵�佹墠鑳藉彂閫�
- this.canSetProgressValue = isOpen;
+ if (this.isLightProgressing == false)
+ {
+ //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
+ seekBarLight.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);
+ }
+ if (this.isColorProgressing == false)
+ {
+ //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
+ seekBarColor.Progress = (int)(((ColorTemperatureLight)this.device).ColorTemperature / 100);
+ //璁剧疆鑷畾涔夌殑鏂囨湰
+ seekBarColor.SetCustomText(seekBarColor.Progress * 100 + "K");
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index d774ce2..53864ae 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -230,6 +230,13 @@
//绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
isOpen = false;
}
+ //濡傛灉鏄紶鎰熷櫒绫�,鍒欓粯璁ゆ槸鍏崇殑鏁堟灉
+ if (this.device.Type == DeviceType.PMSensor || this.device.Type == DeviceType.IASZone
+ || this.device.Type == DeviceType.TemperatureSensor)
+ {
+ isOpen = false;
+ }
+
this.SetCardOpenStatu(isOpen);
}
@@ -401,6 +408,15 @@
this.ResponeResult = 1;
}
+ /// <summary>
+ /// 鎺ユ敹缃戝叧鍥炲鐨勭姸鎬�(true:宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍥炲 false:杩樻病鏈夋帴鏀跺埌缃戝叧鍥炲)
+ /// </summary>
+ /// <returns></returns>
+ public bool ReceiveResponeResultStatu()
+ {
+ return this.ResponeResult == 1;
+ }
+
#endregion
#region 鈻� 鏄剧ず浣庣數閲廮________________________
@@ -503,7 +519,7 @@
/// <summary>
/// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
/// </summary>
- private void SwitchCardStatuAppeal(bool isOpen)
+ public void SwitchCardStatuAppeal(bool isOpen)
{
if (this.btnBackGroud.IsSelected == isOpen)
{
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index 8313777..f62b952 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -28,11 +28,18 @@
var btnSwitch = this.AddSwitchControl();
btnSwitch.ButtonClickEvent += (sender, e) =>
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, i_device, null));
//濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
//鐩存帴鍙樻洿缂撳瓨
((LightBase)i_device).OnOffStatus = btnSwitch.IsSelected == true ? 0 : 1;
+ if (((LightBase)i_device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, i_device, new object[] { 100 });
+ }
this.RefreshControlInfo(this.device);
return;
}
@@ -46,13 +53,21 @@
{
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
- i_device.SwitchControl(1);
- HdlThreadLogic.Current.RunThread(() =>
+ if (level == 0)
{
- //鑾峰彇鐏厜浜害
- System.Threading.Thread.Sleep(300);
- HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
- });
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, i_device, new object[] { 254 });
+ }
+ else
+ {
+ i_device.SwitchControl(1);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇鐏厜浜害
+ System.Threading.Thread.Sleep(300);
+ HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
+ });
+ }
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
index 60fe1f3..a3bbe14 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
@@ -28,11 +28,18 @@
var btnSwitch = this.AddSwitchControl();
btnSwitch.ButtonClickEvent += (sender, e) =>
{
+ //鑾峰彇褰撳墠浜害
+ int level = Convert.ToInt32(i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.GetField, null, i_device, null));
//濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
//鐩存帴鍙樻洿缂撳瓨
((LightBase)i_device).OnOffStatus = btnSwitch.IsSelected == true ? 0 : 1;
+ if (((LightBase)i_device).OnOffStatus == 1 && level == 0)
+ {
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("Level", System.Reflection.BindingFlags.SetField, null, i_device, new object[] { 100 });
+ }
this.RefreshControlInfo(this.device);
return;
}
@@ -46,13 +53,21 @@
{
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
- i_device.SwitchControl(1);
- HdlThreadLogic.Current.RunThread(() =>
+ if (level == 0)
{
- //鑾峰彇鐏厜浜害
- System.Threading.Thread.Sleep(300);
- HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
- });
+ //濡傛灉褰撳墠鏄墦寮�鐘舵��,骞朵笖浜害涓�0鐨勮瘽,鍒欓渶瑕佸彉鎴�100%浜害
+ i_device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, i_device, new object[] { 254 });
+ }
+ else
+ {
+ i_device.SwitchControl(1);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇鐏厜浜害
+ System.Threading.Thread.Sleep(300);
+ HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
+ });
+ }
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
index bb903da..435a274 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
@@ -113,6 +113,7 @@
string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
string deviceName = LocalDevice.Current.GetDeviceEpointName(device);
var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+ btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
btnNote.InitControl();
//鍒掔嚎
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 366dc9d..0b5571f 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -697,17 +697,31 @@
}
HdlThreadLogic.Current.RunThread(() =>
{
- for (int i = 0; i < listContr.Count; i++)
+ while (listDeviceBackContr.Parent != null)
{
- if (listDeviceBackContr.Parent == null)
+ bool hadSend = false;
+ for (int i = 0; i < listContr.Count; i++)
{
- return;
+ if (listDeviceBackContr.Parent == null)
+ {
+ return;
+ }
+ //濡傛灉杩樻病鏈夋帴鏀跺埌鏁版嵁,鍒欏啀娆″彂閫�
+ if (listContr[i].ReceiveResponeResultStatu() == false)
+ {
+ //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
+ listContr[i].SendStatuComand();
+ hadSend = true;
+ System.Threading.Thread.Sleep(200);
+ }
}
- System.Threading.Thread.Sleep(200);
- //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
- listContr[i].SendStatuComand();
+ if (hadSend == false)
+ {
+ //濡傛灉宸茬粡鍏ㄩ儴鍥炶矾閮芥帴鏀朵簡缃戝叧鍥炲,鍒欎笉鍐嶄簩娆″彂閫�
+ break;
+ }
+ System.Threading.Thread.Sleep(2000);
}
-
}, ShowErrorMode.NO);
}
});
@@ -1192,6 +1206,8 @@
//璁惧鐘舵�佸繀椤诲埛鏂�
string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
contr.SetDeviceStatuText(statuText);
+ //浼犳劅鍣ㄥ垏鎹负鐏拌壊鐘舵��
+ contr.SwitchCardStatuAppeal(false);
}, ShowErrorMode.NO);
}
diff --git a/ZigbeeApp/Shared/Phone/ModelData/DeviceModelDataLogic.cs b/ZigbeeApp/Shared/Phone/ModelData/DeviceModelDataLogic.cs
deleted file mode 100755
index 9070abe..0000000
--- a/ZigbeeApp/Shared/Phone/ModelData/DeviceModelDataLogic.cs
+++ /dev/null
@@ -1,789 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.ModelData
-{
- /// <summary>
- /// 璁惧妯℃澘鏁版嵁鐨勯�昏緫
- /// </summary>
- public class DeviceModelDataLogic
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 璁惧妯℃澘鏁版嵁鐨勯�昏緫
- /// </summary>
- private static DeviceModelDataLogic m_Current = null;
- /// <summary>
- /// 璁惧妯℃澘鏁版嵁鐨勯�昏緫
- /// </summary>
- public static DeviceModelDataLogic Current
- {
- get
- {
- if (m_Current == null)
- {
- m_Current = new DeviceModelDataLogic();
- }
- return m_Current;
- }
- }
- /// <summary>
- /// 妯℃澘鏁版嵁
- /// </summary>
- private ModelMemoryData modelData = new ModelMemoryData();
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鍒濆鍖栧叏閮ㄦ暟鎹�
- /// </summary>
- public void InitAllData()
- {
- }
-
- #endregion
-
- #region 鈻� 绐楀笜鎵嬫媺鎺у埗_______________________
-
- /// <summary>
- /// 娣诲姞绐楀笜鎵嬫媺鎺у埗缂撳瓨
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="bolStatu">鎵嬫媺鎺у埗鐘舵��</param>
- /// <param name="topic">涓婚</param>
- public void SetCurtainHandPullControl(CommonDevice device, bool bolStatu, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainHandPullControl();
- classData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
-
- classData.Statu = bolStatu;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁灞炴��;
- classData.TopicName = topic;
- //淇濆瓨鏁版嵁
- this.SaveData(device);
- }
-
- /// <summary>
- /// 鑾峰彇绐楀笜鎵嬫媺鎺у埗鐘舵��(铏氭嫙浣跨敤)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public bool GetCurtainHandPullControl(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainHandPullControl();
- classData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
-
- return classData.Statu;
- }
-
- #endregion
-
- #region 鈻� 绐楀笜鏂瑰悜___________________________
-
- /// <summary>
- /// 璁剧疆绐楀笜鐨勬柟鍚�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="isDirectionReversed"></param>
- /// <param name="topic"></param>
- /// <returns></returns>
- public CommonDevice.SetWritableValueResponAllData SetCurtainDirection(CommonDevice device, bool isDirectionReversed, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainDirectionAndLimite();
- classData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
-
- classData.Direction = isDirectionReversed;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁灞炴��;
- classData.TopicName = topic;
- //淇濆瓨鏁版嵁
- this.SaveData(device);
-
- return new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = new CommonDevice.SetWritableValueResponData { Status = 0 } };
- }
-
- #endregion
-
- #region 鈻� 绐楀笜闄愪綅___________________________
-
- /// <summary>
- /// 鑾峰彇寮�鍚堝笜鐨勯檺浣�
- /// </summary>
- /// <param name="rollershade"></param>
- /// <param name="upLimit"></param>
- /// <param name="downLimit"></param>
- /// <param name="curtainLength"></param>
- /// <param name="topic"></param>
- /// <returns></returns>
- public bool SetCurtainLimitPoint(CommonDevice rollershade,int upLimit, int downLimit, int curtainLength, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainDirectionAndLimite();
- classData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
- classData.curtainLength = curtainLength;
- classData.downLimit = downLimit;
- classData.upLimit = upLimit;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁灞炴��;
- classData.TopicName = topic;
-
- return true;
- }
-
- /// <summary>
- /// 鑾峰彇寮�鍚堝笜鐨勯檺浣�
- /// </summary>
- /// <param name="rollershade"></param>
- /// <returns></returns>
- public ModelCurtainDirectionAndLimite GetCurtainLimitPoint(CommonDevice rollershade)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainDirectionAndLimite();
- classData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
-
- return classData;
- }
-
- #endregion
-
- #region 鈻� 绌鸿皟鑷畾涔夋ā寮廮____________________
-
- /// <summary>
- /// 娣诲姞绌鸿皟鑷畾涔夋ā寮忕紦瀛�
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="data">鍊�</param>
- public void SetAcModeSupport(CommonDevice device, int data, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcModeSupport();
- classData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
-
- classData.data = data;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁灞炴��;
- classData.TopicName = topic;
- //淇濆瓨鏁版嵁
- this.SaveData(device);
- }
-
- /// <summary>
- /// 鑾峰彇绌鸿皟鑷畾涔夋ā寮�(铏氭嫙浣跨敤)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public int GetAcModeSupport(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcModeSupport();
- classData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
-
- return classData.data;
- }
-
- #endregion
-
- #region 鈻� 绌鸿皟鎽嗛妯″紡_______________________
-
- /// <summary>
- /// 娣诲姞绌鸿皟鎽嗛妯″紡缂撳瓨
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="data">鍊�</param>
- public void SetAcSwingModeSupport(CommonDevice device, int data, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcSwingModeSupport();
- classData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
-
- classData.data = data;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁灞炴��;
- classData.TopicName = topic;
- //淇濆瓨鏁版嵁
- this.SaveData(device);
- }
-
- /// <summary>
- /// 鑾峰彇绌鸿皟鎽嗛妯″紡(铏氭嫙浣跨敤)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public int GetAcSwingModeSupport(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcSwingModeSupport();
- classData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
-
- return classData.data;
- }
-
- #endregion
-
- #region 鈻� 璁惧缁戝畾___________________________
-
- /// <summary>
- /// 鑾峰彇璁惧缁戝畾鍒楄〃鐨勭紦瀛�
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- public List<BindObj.BindListResponseObj> GetDeviceBindList(CommonDevice device, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- classData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
-
- return classData.BindList;
- }
-
- /// <summary>
- /// 娣诲姞璁惧缁戝畾鍒楄〃鐨勭紦瀛�
- /// </summary>
- /// <param name="addBindData"></param>
- /// <param name="topic">涓婚</param>
- /// <returns></returns>
- public BindObj.AddedDeviceBindResponseAllData AddDeviceBindList(BindObj.AddBindData addBindData, string topic)
- {
- var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- classData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁鍗忚;
- classData.TopicName = topic;
-
- var reData = new BindObj.AddedDeviceBindResponseAllData();
- reData.addedDeviceBindResponseData = new BindObj.AddedDeviceBindResponseData();
- reData.addedDeviceBindResponseData.Result = 0;
-
- foreach (var data in addBindData.BindList)
- {
- bool canAdd = true;
- for (int i = 0; i < classData.BindList.Count; i++)
- {
- var bindData = classData.BindList[i];
- //濡傛灉鏄澶�
- if (bindData.BindType == 0 && data.BindType == 0
- && bindData.BindMacAddr == data.BindMacAddr
- && bindData.BindEpoint == data.BindEpoint
- && bindData.BindCluster == data.BindCluster)
- {
- //鍚屼竴涓笢瑗夸笉闇�瑕佹浛鎹�
- canAdd = false;
- reData.addedDeviceBindResponseData.BindList.Add(bindData);
- break;
- }
- //濡傛灉鏄満鏅�
- if (bindData.BindType == 2 && data.BindType == 1
- && bindData.BindScenesId == data.BindScenesId
- && bindData.BindCluster == data.BindCluster)
- {
- //鍚屼竴涓笢瑗夸笉闇�瑕佹浛鎹�
- canAdd = false;
- reData.addedDeviceBindResponseData.BindList.Add(bindData);
- break;
- }
- }
- if (canAdd == true)
- {
- //娣诲姞鏂扮殑缂撳瓨
- var newData = new BindObj.BindListResponseObj();
- classData.BindList.Add(newData);
- newData.BindCluster = data.BindCluster;
- newData.BindEpoint = data.BindEpoint;
- newData.BindMacAddr = data.BindMacAddr;
- newData.BindScenesId = data.BindScenesId;
- newData.BindType = data.BindType == 0 ? 0 : 2;
- reData.addedDeviceBindResponseData.BindList.Add(newData);
- }
- }
- //淇濆瓨鏁版嵁
- this.SaveData(device);
-
- return reData;
- }
-
- /// <summary>
- /// 鍒犻櫎璁惧缁戝畾鍒楄〃鐨勭紦瀛�
- /// </summary>
- /// <param name="delDeviceBindData"></param>
- /// <returns></returns>
- public BindObj.DelDeviceBindResponseAllData DeleteDeviceBindList(BindObj.DelDeviceBindData delDeviceBindData)
- {
- var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- classData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
-
- //杩斿洖鍊�
- var reData = new BindObj.DelDeviceBindResponseAllData();
- reData.removeBindResultResponseData = new BindObj.RemoveBindResultResponseData();
- reData.removeBindResultResponseData.Result = 0;
-
- reData.delDeviceBindResponseData = new BindObj.DelDeviceBindResponseData();
-
- foreach (var data in delDeviceBindData.RemoveBindList)
- {
- for (int i = 0; i < classData.BindList.Count; i++)
- {
- var bindData = classData.BindList[i];
- //濡傛灉鏄澶�
- if (bindData.BindType == 0 && data.BindType == 0
- && bindData.BindMacAddr == data.BindMacAddr
- && bindData.BindEpoint == data.BindEpoint
- && bindData.BindCluster == data.BindCluster)
- {
- //绉婚櫎缂撳瓨
- classData.BindList.RemoveAt(i);
- break;
- }
- //濡傛灉鏄満鏅�
- if (bindData.BindType == 2 && data.BindType == 1
- && bindData.BindScenesId == data.BindScenesId
- && bindData.BindCluster == data.BindCluster)
- {
- //绉婚櫎缂撳瓨
- classData.BindList.RemoveAt(i);
- break;
- }
- }
- var removeData = new BindObj.RemoveBindListResponseObj();
- reData.delDeviceBindResponseData.RemoveBindList.Add(removeData);
- removeData.BindCluster = data.BindCluster;
- removeData.BindEpoint = data.BindEpoint;
- removeData.BindMacAddr = data.BindMacAddr;
- removeData.BindScenesId = data.BindScenesId;
- removeData.BindType = data.BindType == 0 ? 0 : 2;
- removeData.Result = 0;
- }
- //淇濆瓨鏁版嵁
- this.SaveData(device);
- return reData;
- }
-
- /// <summary>
- /// 鍒犻櫎鎸囧畾璁惧鐨勫叏閮ㄧ粦瀹�
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public BindObj.ClearBindInfoResponseAllData ClearDeviceAllBind(CommonDevice device)
- {
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.modelData.dicAllData.ContainsKey(mainkey) == true)
- {
- //鍒涘缓瀛樺偍绌洪棿
- this.modelData.dicAllData.Remove(mainkey);
- }
- this.SaveData(device);
-
- return new BindObj.ClearBindInfoResponseAllData
- {
- clearBindInfoResponseData = new BindObj.ClearBindInfoResponseData { Result = 0 }
- };
- }
-
- /// <summary>
- /// 閰嶇疆鎸夐敭鐨勫姛鑳芥ā寮�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="value"></param>
- /// <param name="clusterID"></param>
- /// <returns></returns>
- public CommonDevice.SetWritableValueResponAllData ConfigurePanelKeyModel(CommonDevice device, Panel.KeyMode value, int clusterID, string topic)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- classData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
- classData.TopicName2 = topic;
- classData.keyMode = value;
- classData.keyModeClusterID = clusterID;
-
- this.SaveData(device);
-
- return new CommonDevice.SetWritableValueResponAllData
- {
- setWritableValueResponData = new CommonDevice.SetWritableValueResponData { Status = 0 }
- };
- }
-
- /// <summary>
- /// 鑾峰彇鎸夐敭鐨勫姛鑳芥ā寮�
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public Panel.PanelConfigureInfoResponAllData ReadPanelConfigureKeyModel(CommonDevice device)
- {
- var classData = new ModelDeviceBindData();
- classData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
-
- var data = new Panel.PanelConfigureInfoResponAllData();
- data.deviceStatusReportData = new CommonDevice.DeviceStatusReportData { CluterID = classData.keyModeClusterID };
-
- var dataAttri = new CommonDevice.AttributeDataObj();
- dataAttri.AttriButeData = (int)classData.keyMode;
-
- return data;
- }
-
- #endregion
-
- #region 鈻� Pir浼犳劅鍣╛_________________________
-
- /// <summary>
- /// 鑾峰彇Pir浼犳劅鍣ㄧ殑閰嶇疆
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public IASZone.ParamatesInfo GetPirSensorLightSettion(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPirSensorSettion();
- classData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.APir閰嶇疆, classData);
-
- var localData = new IASZone.ParamatesInfo();
- localData.configureParamates = new IASZone.ConfigureParamates();
- localData.configureParamates.controlDevEnable = classData.pirConfigure.controlDevEnable;
- localData.configureParamates.dimmerLevel = classData.pirConfigure.dimmerLevel;
- localData.configureParamates.dimmerOffTime = classData.pirConfigure.dimmerOffTime;
- localData.configureParamates.dimmerOnTime = classData.pirConfigure.dimmerOnTime;
- localData.configureParamates.iasReportPeriod = classData.pirConfigure.iasReportPeriod;
- localData.configureParamates.levelEnable = classData.pirConfigure.levelEnable;
- localData.configureParamates.levelSize = classData.pirConfigure.levelSize;
- localData.configureParamates.mode = classData.pirConfigure.mode;
- localData.configureParamates.transitionTime = classData.pirConfigure.transitionTime;
- localData.configureParamates.type = classData.pirConfigure.type;
-
- return localData;
- }
-
- /// <summary>
- /// 璁剧疆Pir浼犳劅鍣ㄧ殑閰嶇疆
- /// </summary>
- /// <param name="device"></param>
- /// <param name="configureParamates"></param>
- /// <returns></returns>
- public IASZone.ResponseAllData SetPirSensorLightSettion(CommonDevice device, IASZone.ConfigureParamates configureParamates, string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPirSensorSettion();
- classData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.APir閰嶇疆, classData);
-
- classData.pirConfigure = configureParamates;
- classData.DataSendDiv = ModelDataSendEnum.A閫忎紶鏁版嵁;
- classData.TopicName = topicName;
-
- this.SaveData(device);
-
- return new CommonDevice.ResponseAllData { responseData = new CommonDevice.ResponseData { status = 0 } };
- }
-
- #endregion
-
- #region 鈻� 闈㈡澘闇囧姩鍔熻兘_______________________
-
- /// <summary>
- /// 鑾峰彇闈㈡澘闇囧姩鍔熻兘
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public UserCenter.HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelVibrationInfo();
- classData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
-
- var data = new UserCenter.HdlDevicePanelLogic.PanelVibrationInfo();
- data.A闇囧姩浣胯兘 = classData.vibrationInfo.A闇囧姩浣胯兘;
- data.A闇囧姩寮哄害 = classData.vibrationInfo.A闇囧姩寮哄害;
- data.A闇囧姩鏃堕棿 = classData.vibrationInfo.A闇囧姩鏃堕棿;
-
- return data;
- }
-
- /// <summary>
- /// 璁剧疆闈㈡澘闇囧姩鍔熻兘
- /// </summary>
- /// <param name="device"></param>
- /// <param name="datainfo"></param>
- /// <param name="topicName"></param>
- /// <returns></returns>
- public bool SetPanelVibrationInfo(CommonDevice device, UserCenter.HdlDevicePanelLogic.PanelVibrationInfo datainfo, string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelVibrationInfo();
- classData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
- classData.TopicName = topicName;
- classData.vibrationInfo = datainfo;
- classData.DataSendDiv = ModelDataSendEnum.A閫忎紶鏁版嵁;
-
- this.SaveData(device);
-
- return true;
- }
- #endregion
-
- #region 鈻� 璁惧鍚嶇О___________________________
-
- /// <summary>
- /// 淇敼璁惧Mac鍚嶇О
- /// </summary>
- /// <param name="device"></param>
- /// <param name="macName"></param>
- /// <returns></returns>
- public CommonDevice.RenameDeviceMacNameAllData ReDeviceMacName(CommonDevice device, string macName, string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceMacNameInfo();
- classData = (ModelDeviceMacNameInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧鍚嶇О, classData);
- classData.deviceMacName = macName;
- classData.TopicName = topicName;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁鍗忚;
-
- this.SaveData(device);
-
- return new CommonDevice.RenameDeviceMacNameAllData
- {
- renameDeviceMacNameData = new CommonDevice.RenameDeviceMacNameData
- {
- Result = 0,
- MacName = macName
- }
- };
- }
-
- /// <summary>
- /// 淇敼璁惧绔偣鍚嶇О
- /// </summary>
- /// <param name="device"></param>
- /// <param name="macName"></param>
- /// <returns></returns>
- public CommonDevice.DeviceRenameAllData ReDeviceEpointName(CommonDevice device, string deviceName, string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceEpointNameInfo();
- classData = (ModelDeviceEpointNameInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绔偣鍚嶇О, classData);
- classData.deviceEpointName = deviceName;
- classData.TopicName = topicName;
- classData.DataSendDiv = ModelDataSendEnum.A绉佹湁鍗忚;
-
- this.SaveData(device);
-
- return new CommonDevice.DeviceRenameAllData
- {
- deviceRenameData = new CommonDevice.DeviceRenameResponseData
- {
- Result = 0,
- DeviceName = deviceName
- }
- };
- }
-
- #endregion
-
- #region 鈻� 闈㈡澘鑳屽厜鐏缃甠____________________
-
- /// <summary>
- /// 鑾峰彇璁惧浜害閰嶇疆锛坲i鍙寒搴﹁皟鑺�,浣跨敤杩斿洖鍊肩殑panelDirectionsLevel锛�
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public Panel.PanelSwitchLevelInfo GetDeviceLightSettion(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- classData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- var data = new Panel.PanelSwitchLevelInfo();
- data.panelBacklightLevel = classData.linghtLevelInfo.panelBacklightLevel == -1 ? 0 : classData.linghtLevelInfo.panelBacklightLevel;
- data.panelDirectionsLevel = classData.linghtLevelInfo.panelDirectionsLevel == -1 ? 0 : classData.linghtLevelInfo.panelDirectionsLevel;
- return data;
- }
-
- /// <summary>
- /// 璁剧疆璁惧浜害锛坲i鍙寒搴﹁皟鑺傦級
- /// </summary>
- /// <param name="panel">璁惧瀵硅薄</param>
- /// <param name="directionsLevel">0-100(杩欎釜鏄偣鍑诲悗鐨勫��)</param>
- /// <param name="backlightLevel">0-100(杩欎釜鏄偣鍑诲墠鐨勫��)</param>
- /// <returns></returns>
- public bool SetDeviceLightSettion(CommonDevice device, int directionsLevel, int backlightLevel, string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- classData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
- classData.TopicName = topicName;
- classData.linghtLevelInfo.panelBacklightLevel = backlightLevel;
- classData.linghtLevelInfo.panelDirectionsLevel = directionsLevel;
- classData.DataSendDiv = ModelDataSendEnum.A閫忎紶鏁版嵁;
-
- this.SaveData(device);
-
- return true;
- }
-
- /// <summary>
- /// 鑾峰彇璁惧鑺傝兘妯″紡鐨勯厤缃姸鎬�(ui鍙妭鑳芥ā寮�)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public Panel.PanelSaveEnergyModeInfo GetDeviceEnergyConservationMode(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- classData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- var data = new Panel.PanelSaveEnergyModeInfo();
- data.enable = classData.energyModeInfo.enable;
- data.level = classData.energyModeInfo.level == -1 ? 0 : classData.energyModeInfo.level;
- data.time = classData.energyModeInfo.time == -1 ? 0 : classData.energyModeInfo.time;
- return data;
- }
-
- /// <summary>
- /// 璁剧疆璁惧鐨勮妭鑳芥ā寮�(ui鍙妭鑳芥ā寮�)
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="modeEnable">鑺傝兘妯″紡鏄惁鏈夋晥</param>
- /// <param name="modeTime">鏃犳搷浣滆繘鍏ヨ妭鑳芥ā寮忔椂闂� 0-255</param>
- /// <param name="level">鑺傝兘妯″紡浜害:0-100</param>
- /// <returns></returns>
- public bool SetDeviceEnergyConservationMode(CommonDevice device, bool modeEnable, int modeTime, int level,string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- classData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
- classData.TopicName = topicName;
- classData.DataSendDiv = ModelDataSendEnum.A閫忎紶鏁版嵁;
- classData.energyModeInfo.enable = modeEnable;
- classData.energyModeInfo.time = modeTime;
- classData.energyModeInfo.level = level;
-
- this.SaveData(device);
-
- return true;
- }
-
- /// <summary>
- /// 鑾峰彇鎸夐敭鎸囩ず鐏紑鍏抽鑹�.
- /// </summary>
- /// <param name="device"></param>
- /// <param name="keyNum"></param>
- /// <returns></returns>
- public Panel.KeyColorDataResponseAllData GetPanelColorInfo(CommonDevice device, Panel.KeyNum keyNum)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- classData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- var data = new Panel.KeyColorDataResponseAllData();
- data.keyColorData = new Panel.KeyColorData();
- data.keyColorData.CloseColorB = string.IsNullOrEmpty(classData.keyColorData.CloseColorB) == true ? "0" : classData.keyColorData.CloseColorB;
- data.keyColorData.CloseColorG = string.IsNullOrEmpty(classData.keyColorData.CloseColorG) == true ? "0" : classData.keyColorData.CloseColorG;
- data.keyColorData.CloseColorR = string.IsNullOrEmpty(classData.keyColorData.CloseColorR) == true ? "0" : classData.keyColorData.CloseColorR;
- data.keyColorData.OpenColorB = string.IsNullOrEmpty(classData.keyColorData.OpenColorB) == true ? "0" : classData.keyColorData.OpenColorB;
- data.keyColorData.OpenColorG = string.IsNullOrEmpty(classData.keyColorData.OpenColorG) == true ? "0" : classData.keyColorData.OpenColorG;
- data.keyColorData.OpenColorR = string.IsNullOrEmpty(classData.keyColorData.OpenColorR) == true ? "0" : classData.keyColorData.OpenColorR;
- data.keyColorData.keyNum = keyNum;
-
- return data;
- }
-
- ///<summary >
- ///閰嶇疆鎸夐敭鎸囩ず鐏鑹�
- /// </summary>
- public CommonDevice.ResponseAllData SetPanelColorInfo(CommonDevice device, Panel.KeyColorData keyColorData, Panel.KeyNumStatus keyNumStatus, string topicName)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- classData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
- classData.TopicName = topicName;
- classData.DataSendDiv = ModelDataSendEnum.A閫忎紶鏁版嵁;
-
- classData.keyColorData.keyNum = keyColorData.keyNum;
- classData.keyColorData.OpenColorB = keyColorData.OpenColorB;
- classData.keyColorData.OpenColorG = keyColorData.OpenColorG;
- classData.keyColorData.OpenColorR = keyColorData.OpenColorR;
- classData.keyColorData.CloseColorB = keyColorData.CloseColorB;
- classData.keyColorData.CloseColorG = keyColorData.CloseColorG;
- classData.keyColorData.CloseColorR = keyColorData.CloseColorR;
-
- classData.KeyNum.Key1 = keyNumStatus.Key1;
- classData.KeyNum.Key2 = keyNumStatus.Key2;
- classData.KeyNum.Key3 = keyNumStatus.Key3;
- classData.KeyNum.Key4 = keyNumStatus.Key4;
- classData.KeyNum.Key5 = keyNumStatus.Key5;
- classData.KeyNum.Key6 = keyNumStatus.Key6;
- classData.KeyNum.Key7 = keyNumStatus.Key7;
- classData.KeyNum.Key8 = keyNumStatus.Key8;
- classData.KeyNum.Key9 = keyNumStatus.Key9;
- classData.KeyNum.Key10 = keyNumStatus.Key10;
- classData.KeyNum.Key11 = keyNumStatus.Key11;
- classData.KeyNum.Key12 = keyNumStatus.Key12;
- classData.KeyNum.Key13 = keyNumStatus.Key13;
- classData.KeyNum.Key14 = keyNumStatus.Key14;
- classData.KeyNum.Key15 = keyNumStatus.Key15;
- classData.KeyNum.Key16 = keyNumStatus.Key16;
-
- this.SaveData(device);
-
- return new CommonDevice.ResponseAllData
- {
- responseData = new CommonDevice.ResponseData
- { status = 0 }
- };
- }
-
- #endregion
-
- #region 鈻� 淇濆瓨鏁版嵁___________________________
-
- /// <summary>
- /// 淇濆瓨缂撳瓨鏁版嵁
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- private void SaveData(CommonDevice device)
- {
- //闇�瑕佸垽鏂�,濡傛灉涓嶅瓨鍦ㄤ簡,闇�瑕佸垹闄ゆ枃浠�
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="saveEnum"></param>
- /// <returns></returns>
- private ModelDeviceDataCommon GetDeviceModelDataClass(CommonDevice device, ModelDeviceSaveEnum saveEnum, ModelDeviceDataCommon newClass)
- {
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.modelData.dicAllData.ContainsKey(mainkey) == false)
- {
- //鍒涘缓瀛樺偍绌洪棿
- this.modelData.dicAllData[mainkey] = new List<ModelDeviceDataCommon>();
- }
- foreach (var data in this.modelData.dicAllData[mainkey])
- {
- //濡傛灉鏄凡缁忓瓨鍦ㄤ簡鐨�
- if (data.DataSaveDiv == saveEnum)
- {
- return data;
- }
- }
- //鏂板缓涓�涓柊鐨勫璞�
- newClass.DataSaveDiv = saveEnum;
- newClass.DeviceEpoint = device.DeviceEpoint;
- newClass.DeviceMac = device.DeviceAddr;
- this.modelData.dicAllData[mainkey].Add(newClass);
-
- return newClass;
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/ModelData/ModelDataCommon.cs b/ZigbeeApp/Shared/Phone/ModelData/ModelDataCommon.cs
deleted file mode 100755
index cd2caa5..0000000
--- a/ZigbeeApp/Shared/Phone/ModelData/ModelDataCommon.cs
+++ /dev/null
@@ -1,399 +0,0 @@
-锘縰sing Shared.Phone.UserCenter;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.ModelData
-{
- #region 鈻� 鍏遍�氭ā鏉挎暟鎹畾涔塤__________________
-
- /// <summary>
- /// 妯℃澘缂撳瓨鏁版嵁
- /// </summary>
- public class ModelMemoryData
- {
- /// <summary>
- /// 鍏ㄩ儴鐨勭紦瀛樻暟鎹�
- /// </summary>
- public Dictionary<string, List<ModelDeviceDataCommon>> dicAllData = new Dictionary<string, List<ModelDeviceDataCommon>>();
- }
-
- /// <summary>
- /// 涓�涓澶囩殑妯℃澘鏁版嵁鐨勫叡閫�
- /// </summary>
- public class ModelDeviceDataCommon
- {
- /// <summary>
- /// 璁惧Mac鍦板潃
- /// </summary>
- public string DeviceMac = string.Empty;
- /// <summary>
- /// 璁惧绔偣
- /// </summary>
- public int DeviceEpoint = -1;
- /// <summary>
- /// 鏁版嵁淇濆瓨鐨勫尯鍒�(涓嶉渶瑕佸啀娆¤缃�)
- /// </summary>
- public ModelDeviceSaveEnum DataSaveDiv = ModelDeviceSaveEnum.A鏈畾涔�;
- /// <summary>
- /// 鍙戦�佹ā鏉挎暟鎹殑鍖哄垎,鐢ㄤ互鏍囪瘑鏄互浠�涔堟柟寮忓彂閫佺粰缃戝叧(闇�瑕佸啀娆℃寚瀹�)
- /// </summary>
- public ModelDataSendEnum DataSendDiv = ModelDataSendEnum.A鏈畾涔�;
- /// <summary>
- /// 鏁版嵁鍙戦�佹垚鍔熺殑杩斿洖鏍囪瘑(姝ゅ彉閲忔槸缁欍�愰�忎紶鏁版嵁銆戜娇鐢�,鍊熶互璁╃綉鍏崇煡閬撻�忎紶涔嬪悗,鎬庝箞鍒ゆ柇鎴愬姛)
- /// </summary>
- public string SuccessFlage = string.Empty;
- /// <summary>
- /// 涓婚鍚嶅瓧(闇�瑕佸啀娆℃寚瀹�)
- /// </summary>
- public string TopicName = string.Empty;
-
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�(鍥犱负鏈変簺涓滆タ闇�瑕佽�冭檻闀濱D,鎵�浠ユ湁鍙兘浼氬嚭鐜板鏉″懡浠�)
- /// </summary>
- /// <returns></returns>
- public virtual List<string> GetSendGatewayValue()
- {
- return new List<string>();
- }
- }
-
- #endregion
-
- #region 鈻� 绐楀笜妯℃澘鏁版嵁瀹氫箟___________________
-
- /// <summary>
- /// 绐楀笜鎵嬫媺鎺у埗妯℃澘瀹氫箟
- /// </summary>
- public class ModelCurtainHandPullControl : ModelDeviceDataCommon
- {
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public bool Statu = false;
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = HdlDeviceCurtainLogic.Current.GetHandPullControlText(DeviceMac, DeviceEpoint, Statu);
- return new List<string>() { command };
- }
- }
-
- /// <summary>
- /// 绐楀笜鎵嬫媺鎺у埗妯℃澘瀹氫箟
- /// </summary>
- public class ModelCurtainDirectionAndLimite : ModelDeviceDataCommon
- {
- /// <summary>
- /// false:鐢垫満鏂瑰悜姝ｅ悜锛泃rue:鐢垫満鏂瑰悜鍙嶅悜
- /// </summary>
- public bool Direction = false;
- /// <summary>
- /// 寮�闄愪綅
- /// </summary>
- public int upLimit = 2;
- /// <summary>
- /// 鍚堥檺浣�
- /// </summary>
- public int downLimit = 98;
- /// <summary>
- /// 瀵艰建闀垮害
- /// </summary>
- public int curtainLength = 100;
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- //鏂瑰悜
- var command1 = HdlDeviceCurtainLogic.Current.GetCurtainDirectionCommadText(DeviceMac, DeviceEpoint, Direction);
- //闄愪綅
- var command2 = HdlDeviceCurtainLogic.Current.GetAutoOpenCurtainLimitPointCommandText(DeviceMac, DeviceEpoint, upLimit, downLimit);
- return new List<string>() { command1, command2 };
- }
- }
-
- #endregion
-
- #region 鈻� 绌鸿皟妯℃澘鏁版嵁瀹氫箟___________________
-
- /// <summary>
- /// 绌鸿皟鑷畾涔夋ā寮忔ā鏉挎暟鎹畾涔�
- /// </summary>
- public class ModelAcModeSupport : ModelDeviceDataCommon
- {
- /// <summary>
- /// 鍊�
- /// </summary>
- public int data = 0;
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = HdlDeviceAttributeLogic.Current.GetWriteDeviceAttributeText(DeviceMac, DeviceEpoint, 513, 4099, 25, data);
- return new List<string>() { command };
- }
- }
-
- /// <summary>
- /// 绌鸿皟鎽嗛妯″紡妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelAcSwingModeSupport : ModelDeviceDataCommon
- {
- /// <summary>
- /// 鍊�
- /// </summary>
- public int data = 0;
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = HdlDeviceAttributeLogic.Current.GetWriteDeviceAttributeText(DeviceMac, DeviceEpoint, 513, 4099, 25, data);
- return new List<string>() { command };
- }
- }
-
- #endregion
-
- #region 鈻� 璁惧缁戝畾妯℃澘鏁版嵁瀹氫箟_______________
-
- /// <summary>
- /// 璁惧缁戝畾妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelDeviceBindData : ModelDeviceDataCommon
- {
- /// <summary>
- /// 鎸夐敭鐨勫姛鑳芥ā寮�
- /// </summary>
- public ZigBee.Device.Panel.KeyMode keyMode = ZigBee.Device.Panel.KeyMode.Default;
- /// <summary>
- /// 鎸夐敭鐨勫姛鑳芥ā寮忕殑闀濱D
- /// </summary>
- public int keyModeClusterID = 0;
- /// <summary>
- /// 鎸夐敭鐨勫姛鑳芥ā寮忕殑涓婚
- /// </summary>
- public string TopicName2 = string.Empty;
- /// <summary>
- /// 缁戝畾鍒楄〃
- /// </summary>
- public List<ZigBee.Device.BindObj.BindListResponseObj> BindList = new List<ZigBee.Device.BindObj.BindListResponseObj>();
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var addBindData = new ZigBee.Device.BindObj.AddBindData();
- addBindData.DeviceAddr = this.DeviceMac;
- addBindData.Epoint = this.DeviceEpoint;
-
- foreach (var data in BindList)
- {
- var addData = new ZigBee.Device.BindObj.AddBindListObj();
- addBindData.BindList.Add(addData);
- addData.BindCluster = data.BindCluster;
- addData.BindEpoint = data.BindEpoint;
- addData.BindMacAddr = data.BindMacAddr;
- addData.BindScenesId = data.BindScenesId;
- addData.BindType = data.BindType == 0 ? 0 : 1;
- }
- //鍔熻兘閰嶇疆
- var command1 = HdlDeviceBindLogic.Current.GetConfigureHdlKeyCommandText(this.DeviceMac, this.DeviceEpoint, keyMode, keyModeClusterID);
- //缁戝畾鍒楄〃
- var command2 = HdlDeviceBindLogic.Current.GetAddDeviceListBindCommandText(addBindData);
- return new List<string>() { command1, command2 };
- }
- }
-
- #endregion
-
- #region 鈻� Pir浼犳劅鍣ㄦā鏉挎暟鎹畾涔塤_____________
-
- /// <summary>
- /// Pir浼犳劅鍣ㄦā鏉挎暟鎹畾涔�
- /// </summary>
- public class ModelPirSensorSettion : ModelDeviceDataCommon
- {
- /// <summary>
- /// pir鐨勯厤缃俊鎭�
- /// </summary>
- public ZigBee.Device.IASZone.ConfigureParamates pirConfigure = new ZigBee.Device.IASZone.ConfigureParamates();
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = HdlDevicePirSensorLogic.Current.GetPirSensorSettionCommandText(DeviceMac, pirConfigure);
- return new List<string>() { command };
- }
- }
-
- #endregion
-
- #region 鈻� 闈㈡澘妯℃澘鏁版嵁瀹氫箟___________________
-
- /// <summary>
- /// 闈㈡澘闇囧姩鍔熻兘妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelPanelVibrationInfo : ModelDeviceDataCommon
- {
- /// <summary>
- /// 闇囧姩鍔熻兘
- /// </summary>
- public HdlDevicePanelLogic.PanelVibrationInfo vibrationInfo = new HdlDevicePanelLogic.PanelVibrationInfo();
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = HdlDevicePanelLogic.Current.GetPanelVibrationCommandText(DeviceMac, vibrationInfo);
- return new List<string>() { command };
- }
- }
-
- /// <summary>
- /// 闈㈡澘鑳屽厜鐏ā鏉挎暟鎹畾涔�
- /// </summary>
- public class ModelPanelBackLightInfo : ModelDeviceDataCommon
- {
- /// <summary>
- /// 浜害璋冭妭鐨勪俊鎭�
- /// </summary>
- public ModelPanelSwitchLevelInfo linghtLevelInfo = new ModelPanelSwitchLevelInfo();
- /// <summary>
- /// 鑺傝兘妯″紡
- /// </summary>
- public ZigBee.Device.Panel.PanelSaveEnergyModeInfo energyModeInfo = new ZigBee.Device.Panel.PanelSaveEnergyModeInfo();
- /// <summary>
- /// 鎸夐敭鐨勯鑹叉暟鎹�
- /// </summary>
- public ZigBee.Device.Panel.KeyColorData keyColorData = new ZigBee.Device.Panel.KeyColorData();
- /// <summary>
- /// 鍜宬eyColorData涓�璧风敤鐨勪笢瑗�
- /// </summary>
- public ZigBee.Device.Panel.KeyNumStatus KeyNum = new ZigBee.Device.Panel.KeyNumStatus();
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- //浜害璋冭妭
- var command1 = HdlDevicePanelLogic.Current.GetPanelLevelCommadText(DeviceMac, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
- //鑺傝兘妯″紡
- var command2 = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationModeCommandText(DeviceMac, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
- return new List<string>() { command1, command2 };
- }
- }
-
- /// <summary>
- /// 鎸夐敭鎸囩ず鐏潰鏉垮紑鍏充寒搴﹂厤缃洖澶�
- /// </summary>
- public class ModelPanelSwitchLevelInfo
- {
- /// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
- /// </summary>
- public int panelDirectionsLevel = -1;
-
- /// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
- /// </summary>
- public int panelBacklightLevel = -1;
- }
-
- #endregion
-
- #region 鈻� 璁惧鍚嶇О妯℃澘鏁版嵁瀹氫箟_______________
-
- /// <summary>
- /// 璁惧绔偣鍚嶇О妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelDeviceEpointNameInfo : ModelDeviceDataCommon
- {
- /// <summary>
- /// 璁惧绔偣鍚嶇О
- /// </summary>
- public string deviceEpointName = string.Empty;
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = Common.LocalDevice.Current.GetReDeviceEpointNameCommandText(DeviceMac, DeviceEpoint, deviceEpointName);
- return new List<string>() { command };
- }
- }
-
- /// <summary>
- /// 璁惧Mac鍚嶇О妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelDeviceMacNameInfo : ModelDeviceDataCommon
- {
- /// <summary>
- /// 璁惧Mac鍚嶇О
- /// </summary>
- public string deviceMacName = string.Empty;
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
- /// </summary>
- /// <returns></returns>
- public override List<string> GetSendGatewayValue()
- {
- var command = Common.LocalDevice.Current.GetReDeviceMacNameCommandText(DeviceMac, DeviceEpoint, deviceMacName);
- return new List<string>() { command };
- }
- }
-
- #endregion
-
- #region 鈻� 鑷畾涔夋灇涓綺________________________
-
- /// <summary>
- /// 妯℃澘璁惧淇濆瓨鐨勫尯鍒�
- /// </summary>
- public enum ModelDeviceSaveEnum
- {
- A鏈畾涔� = -1,
- A璁惧鍚嶇О = 1,
- A绔偣鍚嶇О = 2,
- APir閰嶇疆 = 3,
- A骞叉帴鐐归鑹茶皟鑺� = 4,
- A骞叉帴鐐逛寒搴﹁皟鑺� = 5,
- A骞叉帴鐐硅妭鑳芥ā寮� = 6,
- A骞叉帴鐐圭涓夌骇鍒鏈夊睘鎬� = 7,
- A绐楀笜鏂瑰悜鍙婇檺浣� = 8,
- A绐楀笜鎵嬫媺鎺у埗 = 9,
- A绌鸿皟鑷畾涔夋ā寮� = 10,
- A闈㈡澘闇囧姩鍔熻兘 = 11,
- A绌鸿皟鎽嗛鍔熻兘 = 12,
- A闈㈡澘鎺ヨ繎鎰熷簲鍔熻兘 = 13,
- A璁惧缁戝畾鍒楄〃 = 14,
- A闈㈡澘鑳屽厜鐏� = 15
- }
-
- /// <summary>
- /// 鍙戦�佹ā鏉挎暟鎹殑鍖哄垎
- /// </summary>
- public enum ModelDataSendEnum
- {
- A鏈畾涔� = -1,
- A绉佹湁灞炴�� = 1,
- A绉佹湁鍗忚 = 2,
- A閫忎紶鏁版嵁 = 3
- }
-
- #endregion
-}
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index 6c72608..f435350 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -921,13 +921,10 @@
var listRoom = HdlRoomLogic.Current.GetAllListRooms();
foreach (var room in listRoom)
{
- if (room.IsLove == false)
- {
- writeText += "#START#\r\n";
- string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(room);
- writeText += dataInfo2 + "\r\n";
- writeText += "#RoomInfo END#\r\n\r\n";
- }
+ writeText += "#START#\r\n";
+ string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(room);
+ writeText += dataInfo2 + "\r\n";
+ writeText += "#RoomInfo END#\r\n\r\n";
}
//鐗╃悊缃戝叧鎵�鍦ㄧ殑鎴块棿
var dicRealRoom = new Dictionary<string, string>();
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
index a60cb93..65a7576 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
@@ -761,7 +761,11 @@
/// <summary>
/// 瀵硅薄绫�:ModelPanelBackLightInfo
/// </summary>
- A闈㈡澘鑳屽厜鐏� = 15
+ A闈㈡澘鑳屽厜鐏� = 15,
+ /// <summary>
+ /// ModelAutomaticTimingOffInfo
+ /// </summary>
+ A瀹氭椂鑷姩鍏抽棴 = 16,
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
index 1802c94..94fb484 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
@@ -473,6 +473,7 @@
data.deviceStatusReportData = new CommonDevice.DeviceStatusReportData { CluterID = memoryData.keyModeClusterID };
var dataAttri = new CommonDevice.AttributeDataObj();
+ dataAttri.AttributeId = (int)AttriButeId.HdlKey;
dataAttri.AttriButeData = (int)memoryData.keyMode;
data.deviceStatusReportData.AttriBute.Add(dataAttri);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index a09b052..756529e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -106,11 +106,17 @@
listView.Height = Application.GetRealHeight(500);
bodyFrameLayout.AddChidren(listView);
//鏈嶅姟鍗忚
- //var rowService = new FrameRowControl(listView.rowSpace / 2);
- //listView.AddChidren(rowService);
- //rowService.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SLA), 400);
- //rowService.AddRightArrow();
- //rowService.AddBottomLine();
+ var rowService = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(rowService);
+ rowService.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SLA), 400);
+ rowService.AddRightArrow();
+ rowService.AddBottomLine();
+ rowService.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new SLAForm();
+ form.AddForm();
+ };
+
//鐗堟湰鏇存柊
this.rowUpdate = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(rowUpdate);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 67710ee..ef0aaaa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1335,6 +1335,10 @@
/// 鏄惁寮�鍚皟璇旳pp鍔熻兘 1->寮�鍚�
/// </summary>
public int StartDebugApp = 0;
+ /// <summary>
+ /// 褰撹澶嘥ype涓嶄竴鏍锋椂,鏄惁鐢熸垚Log 1->鐢熸垚
+ /// </summary>
+ public int CheckDeviceType = 0;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
index 70432a9..61ff854 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
@@ -214,15 +214,15 @@
/// <summary>
/// 鍗忚皟鍣ㄦā鍧�,缃戝叧鐨勫垎绫讳箣涓�
/// </summary>
- Coordinator = 2,
+ A鍗忚皟鍣� = 2,
/// <summary>
/// 铏氭嫙璁惧妯″潡,缃戝叧鐨勫垎绫讳箣涓�
/// </summary>
- VirtualDevice = 3,
+ A铏氭嫙椹卞姩 = 3,
/// <summary>
/// 涓�鑸殑璁惧
/// </summary>
- ZigbeeDevice = 4
+ A璁惧 = 4
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
old mode 100755
new mode 100644
index c4572c8..72ed6e8
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
@@ -45,13 +45,27 @@
/// </summary>
public Action FinishInputEvent = null;
/// <summary>
- /// 鏈�澶ц緭鍏ラ暱搴�(鐩墠鍙拡瀵规寜涓嬪洖杞﹂敭鏃惰繘琛屾娴�,瓒呰繃鏃�,涓嶄細璋冪敤FinishInputEvent)
- /// </summary>
- public int MaxByte = 0;
- /// <summary>
/// 鎸囧畾璇ヨ緭鍏ユ鏄惁涓轰笉鍙渷鐣�(榛樿涓篺alse)
/// </summary>
public bool MustInput = false;
+
+ private int m_MaxByte = -1;
+ /// <summary>
+ /// 鏈�澶ц緭鍏yte闀垮害
+ /// </summary>
+ public int MaxByte
+ {
+ get { return m_MaxByte; }
+ set
+ {
+ m_MaxByte = value;
+ this.TextChangeEventHandler -= this.TxtCode_TextChangedEvent;
+ if (m_MaxByte > 0)
+ {
+ this.TextChangeEventHandler += this.TxtCode_TextChangedEvent;
+ }
+ }
+ }
private bool m_UseFocusColor = false;
/// <summary>
@@ -236,6 +250,37 @@
this.FinishInputEvent?.Invoke();
}
+ /// <summary>
+ /// 鍊兼敼鍙樹簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="value"></param>
+ private void TxtCode_TextChangedEvent(object sender, string value)
+ {
+ var byteData = Encoding.UTF8.GetBytes(value);
+
+ //濡傛灉杈撳叆鐨勫��,宸茬粡澶т簬鎸囧畾鐨刡yte鏁�,鍒欐埅鍙�
+ if (byteData.Length > this.m_MaxByte)
+ {
+ //鎴彇鎸囧畾鐨刡yte瀛楄妭
+ var newValue = Encoding.UTF8.GetString(byteData, 0, this.m_MaxByte);
+ //鏈�鍚庝竴浣嶄笉瑕�,鍥犱负鎴彇鐨勬渶鍚庝竴浣嶅彲鑳芥槸涔辩爜
+ newValue = newValue.Substring(0, newValue.Length - 1);
+ //鎷兼帴涓婂畠鐨勪笅涓�浣�,鐒跺悗妫�娴�
+ var checkValue = newValue + value[newValue.Length];
+ if (Encoding.UTF8.GetBytes(checkValue).Length <= this.m_MaxByte)
+ {
+ //姝ｅソ鍖归厤byte鏁�
+ newValue = checkValue;
+ }
+ this.Text = newValue;
+#if Android
+ //灏嗗厜鏍囪嚦浜庢渶鍚�
+ this.SetSelectionEnd();
+#endif
+ }
+ }
+
#endregion
#region 鈻� 妫�娴嬮敊璇痏__________________________
@@ -287,17 +332,6 @@
/// <returns></returns>
private string CheckMaxByte()
{
- if (this.MaxByte != 0)
- {
- if (Encoding.UTF8.GetBytes(this.Text.Trim()).Length > this.MaxByte)
- {
- //杈撳叆鍐呭杩囬暱,鏈�澶0}瀛楄妭
- string msg = Language.StringByID(R.MyInternationalizationString.uInputContentIsOverLengthMsg);
- msg.Replace("{0}", this.MaxByte.ToString());
-
- return msg;
- }
- }
return null;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index 8bbe274..2ecd19d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -144,11 +144,15 @@
//鍙崇澶�
this.AddRightArrow();
- this.ButtonClickEvent += (sender, e) =>
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欓渶瑕佸鐞�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- //鍖哄煙閫夋嫨
- this.ShowSelectRoom(btnTextView, i_caption);
- };
+ this.ButtonClickEvent += (sender, e) =>
+ {
+ //鍖哄煙閫夋嫨
+ this.ShowSelectRoom(btnTextView, i_caption);
+ };
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
index f14f176..28d0d66 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
@@ -210,7 +210,9 @@
//婊戞潯鏈�宸﹁竟鐨勮窛绂�
int XX = this.X + this.m_SeekBarPadding;
//褰撳墠婊戞潯鎵�鍦ㄧ殑澶ц嚧鐧惧垎姣�
- decimal persent = (decimal)(this.Progress - this.m_MinValue) / (this.m_MaxValue - this.m_MinValue);
+ int tempValue = this.Progress - this.m_MinValue;
+ if (tempValue < 0) { tempValue = 0; }
+ decimal persent = (decimal)tempValue / (this.m_MaxValue - this.m_MinValue);
//褰撳墠婊戞潯鎵�鍦ㄧ殑澶ц嚧浣嶇疆
XX += (int)((this.Width - this.m_SeekBarPadding * 2) * persent);
//鍥犱负瑕佸眳涓�,鎵�浠ュ噺鎺夎嚜瀹氫箟鎺т欢鐨勫搴︾殑涓�鑸�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
index 1e70492..75a9421 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -74,7 +74,7 @@
|| this.device.Type == DeviceType.OnOffOutput)
{
//娌¤寮哄埗骞叉秹鐨勮瘽
- if (m_SetCanSelect == true)
+ if (m_SetCanSelect == true && Common.Config.Instance.Home.IsShowTemplate == false)
{
this.UseClickStatu = true;
//鍙崇澶�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index 3a1e9a5..cf828c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -290,7 +290,7 @@
}
//寮�鍚繘搴︽潯
- int listFileCount = listAllFile.Count;
+ int listFileCount = listPicFile.Count + listNormalFile.Count;
if (showBar == true)
{
//寮�鍚繘搴︽潯 姝ｅ湪涓婁紶澶囦唤鏂囦欢
@@ -794,6 +794,12 @@
//寮�鍚悗鍙拌皟璇旳pp鍔熻兘(Debug鐢�)
UserCenterResourse.HideOption.StartDebugApp = 1;
}
+ checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.CheckDeviceTypeFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
+ {
+ //寮�鍚娴嬭澶嘥ype鐨�(Debug鐢�)
+ UserCenterResourse.HideOption.CheckDeviceType = 1;
+ }
//鎭㈠
IMessageCommon.Current.IgnoreError = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index d799cb9..3fade11 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -197,33 +197,6 @@
}
/// <summary>
- ///璁惧缁戝畾銆愪竴瀵逛竴 缁戝畾锛屼竴涓寜閿洖璺彧鑳界粦瀹氫竴涓澶囥��
- /// </summary>
- public BindObj.AddedDeviceBindResponseAllData AddDeviceSingleBindAsync(BindObj.AddBindData addBindData)
- {
- //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
- if (Common.Config.Instance.Home.IsVirtually == true)
- {
- return ModelData.DeviceModelDataLogic.Current.AddDeviceBindList(addBindData, "Bind/GetDeviceBind");
- }
-
- var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
- //鑾峰彇鍙戦�佺殑鍛戒护瀛楃
- var sendData = this.GetAddDeviceListBindCommandText(addBindData);
- //鍙戦��
- var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Bind/SetSingleBind", sendData, "Bind/SetSingleBind_Respon", 20);
- if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
- {
- return null;
- }
- //淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);
-
- var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceBindResponseData>(result.ReceiptData);
- return new BindObj.AddedDeviceBindResponseAllData() { addedDeviceBindResponseData = tempData };
- }
-
- /// <summary>
/// 鑾峰彇娣诲姞璁惧缁戝畾鐨勫懡浠ゅ瓧绗�
/// </summary>
/// <param name="addBindData"></param>
@@ -252,6 +225,53 @@
return jObject.ToString();
}
+ /// <summary>
+ ///璁惧缁戝畾銆愪竴瀵逛竴 缁戝畾锛屼竴涓寜閿洖璺彧鑳界粦瀹氫竴涓澶囥��
+ /// </summary>
+ public BindObj.AddedDeviceSingleBindResponseAllData AddDeviceSingleBindAsync(BindObj.AddSingleBindData addSingleBindData)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(addSingleBindData.DeviceAddr, addSingleBindData.Epoint);
+ //鑾峰彇鍙戦�佺殑鍛戒护瀛楃
+ var sendData = this.GetAddDeviceListSingleBindCommandText(addSingleBindData);
+ //鍙戦��
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Bind/SetSingleBind", sendData, "Bind/SetSingleBind_Respon", 20);
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+ {
+ return null;
+ }
+
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceSingleBindResponseData>(result.ReceiptData);
+ return new BindObj.AddedDeviceSingleBindResponseAllData() { addedDeviceSingleBindResponseData = tempData };
+ }
+
+ /// <summary>
+ /// 鑾峰彇娣诲姞璁惧缁戝畾鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <param name="addBindData"></param>
+ /// <returns></returns>
+ public string GetAddDeviceListSingleBindCommandText(BindObj.AddSingleBindData addSingleBindData)
+ {
+ var jObject = new JObject { { "DeviceAddr", addSingleBindData.DeviceAddr }, { "Epoint", addSingleBindData.Epoint }, { "Cluster_ID", 0 }, { "Command", 5020 } };
+ var data = new JObject { };
+ var bindClusterList = new JArray { };
+ foreach (var cluster in addSingleBindData.BindClusterList)
+ {
+ bindClusterList.Add(cluster);
+ }
+ if (addSingleBindData.BindType == 0)
+ {
+ data = new JObject { { "BindName", addSingleBindData.BindName }, { "BindType", addSingleBindData.BindType }, { "BindClusterList", bindClusterList }, { "BindMacAddr", addSingleBindData.BindMacAddr }, { "BindEpoint", addSingleBindData.BindEpoint } };
+ }
+ else if (addSingleBindData.BindType == 1)
+ {
+ data = new JObject { { "BindName", addSingleBindData.BindName }, { "BindType", addSingleBindData.BindType }, { "BindClusterList", bindClusterList }, { "BindScenesId", addSingleBindData.BindScenesId } };
+
+ }
+ jObject.Add("Data", data);
+ return jObject.ToString();
+ }
+
+
#endregion
#region 鈻� 鍒犻櫎璁惧缁戝畾鐨勭洰鏍嘷________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs
index db5cd51..b5ff35b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs
@@ -31,70 +31,46 @@
}
}
- /// 闇�瑕佽幏鍙栧浐瀹氬睘鎬х殑瀵硅薄璁惧
- /// </summary>
- private HashSet<string> hsGetHardInfoDevice = new HashSet<string>();
-
#endregion
#region 鈻� 涓诲叆鍙ｅ嚱鏁癬________________________
/// <summary>
- /// 璇诲彇浠ュ強璁剧疆璁惧鍥哄畾灞炴��
+ /// 璇诲彇浠ュ強璁剧疆璁惧鍥哄畾灞炴��(false:涓嶉渶瑕佸彂閫佸懡浠�)
/// </summary>
- /// <param name="device">璁惧鍥炶矾</param>
- public void SetAllFixedAttributeToDevice(CommonDevice device)
+ /// <param name="i_device">璁惧鍥炶矾</param>
+ public bool SetAllFixedAttributeToDevice(CommonDevice i_device)
{
- if (device == null)
+ if (i_device == null)
{
- return;
+ return false;
}
- lock (this.hsGetHardInfoDevice)
+ var localDevice = Common.LocalDevice.Current.GetDevice(i_device.DeviceAddr, i_device.DeviceEpoint);
+ if (localDevice == null)
{
- //鍏堢Щ闄�
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.hsGetHardInfoDevice.Contains(mainKeys) == true)
- {
- this.hsGetHardInfoDevice.Remove(mainKeys);
- }
- if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceGetFixedAttribute") == false)
- {
- //娣诲姞浜嬩欢
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceGetFixedAttribute", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, this.SetFixedAttributeByInterfaceResult);
- }
- //鍙戦�佸懡浠�
- this.SeFixedAttributeComand(device);
+ //ota涔熶細璺戣繘鏉�
+ return false;
}
- }
- #endregion
-
- #region 鈻� 鍙戦�佸懡浠__________________________
-
- /// <summary>
- /// 鍙戦�佽幏鍙栧浐瀹氬睘鎬х殑鍛戒护
- /// </summary>
- /// <param name="device"></param>
- private void SeFixedAttributeComand(CommonDevice device)
- {
Newtonsoft.Json.Linq.JObject jObject = null;
Newtonsoft.Json.Linq.JArray attriBute = null;
//绐楀笜
- if (device.Type == DeviceType.WindowCoveringDevice)
+ if (localDevice.Type == DeviceType.WindowCoveringDevice
+ && ((Rollershade)localDevice).WcdType == -1)
{
- this.GetCurtainComand(device, ref jObject, ref attriBute);
+ this.GetCurtainComand(localDevice, ref jObject, ref attriBute);
}
if (jObject == null)
{
//涓嶉渶瑕佸彂閫�
- return;
+ return false;
}
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- this.hsGetHardInfoDevice.Add(mainkeys);
//鍙戦��
var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
jObject.Add("Data", data);
- device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+ localDevice.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+
+ return true;
}
#endregion
@@ -123,121 +99,6 @@
{ "AttriButeId", (int)AttriButeId.WindowCoveringType }
}
};
- }
-
- #endregion
-
- #region 鈻� 璁剧疆灞炴��(涓诲嚱鏁�)___________________
-
- /// <summary>
- /// 璁剧疆璁惧鐨勫浐瀹氬睘鎬� -1:寮傚父 0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄渶瑕佺殑 1:姝ｅ父
- /// </summary>
- /// <param name="report">涓婃姤淇℃伅</param>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- private int SetFixedAttribute(CommonDevice.DeviceStatusReportData report, CommonDevice device)
- {
- if (report == null)
- {
- return -1;
- }
- //绐楀笜
- if (device.Type == DeviceType.WindowCoveringDevice)
- {
- return this.SetCurtainAttribute(report, (Rollershade)device);
- }
- return 0;
- }
-
- #endregion
-
- #region 鈻� 璁剧疆绐楀笜灞炴�______________________
-
- /// <summary>
- /// 璁剧疆绐楀笜灞炴�� -1:寮傚父 0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄渶瑕佺殑 1:姝ｅ父
- /// </summary>
- /// <param name="report">涓婃姤淇℃伅</param>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- private int SetCurtainAttribute(CommonDevice.DeviceStatusReportData report, Rollershade device)
- {
- if (report.CluterID != (int)Cluster_ID.WindowCovering || device == null)
- {
- return -1;
- }
- //灞炴�ф槸鍚︽敼鍙�
- bool AttriButeChanged = false;
- int attriButeId = (int)AttriButeId.WindowCoveringType;
- foreach (var data in report.AttriBute)
- {
- if (data.AttributeId == attriButeId)
- {
- AttriButeChanged = true;
- device.WcdType = data.AttriButeData;
- }
- }
- if (AttriButeChanged == true)
- {
- //灞炴�у凡缁忔敼鍙�,鍒欎繚瀛�
- return 1;
- }
- return 0;
- }
-
- #endregion
-
- #region 鈻� 鎺ュ彛鎺ㄩ�佸鐞哶______________________
-
- /// <summary>
- /// 鏍规嵁鎺ュ彛鎺ㄩ�佺殑淇℃伅锛岃缃澶囩‖浠朵俊鎭�
- /// </summary>
- /// <param name="device"></param>
- private void SetFixedAttributeByInterfaceResult(CommonDevice device)
- {
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.hsGetHardInfoDevice.Contains(mainKeys) == false)
- {
- //鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄寚瀹氱殑璁惧
- return;
- }
- //璁剧疆璁惧纭欢淇℃伅
- var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
- if (localDevice == null)
- {
- return;
- }
- lock (hsGetHardInfoDevice)
- {
- //-1:寮傚父 0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄渶瑕佺殑 1:姝ｅ父
- if (this.SetFixedAttribute(device.DeviceStatusReport, localDevice) != 1)
- {
- return;
- }
- //淇濆瓨
- localDevice.ReSave();
- //绉婚櫎
- this.hsGetHardInfoDevice.Remove(mainKeys);
- }
- }
-
- #endregion
-
- #region 鈻� 绉婚櫎鐩戝惉绾跨▼_______________________
-
- /// <summary>
- /// 绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋�
- /// </summary>
- /// <param name="device"></param>
- public void RemoveDeviceHardInfoThread(CommonDevice device)
- {
- lock (hsGetHardInfoDevice)
- {
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.hsGetHardInfoDevice.Contains(mainKeys) == true)
- {
- this.hsGetHardInfoDevice.Remove(mainKeys);
- }
- }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs
index 03de7f2..ce0fe1a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs
@@ -31,14 +31,6 @@
}
}
- /// <summary>
- /// 璁惧鑾峰彇纭欢淇℃伅鍚庣殑鍥炶皟鍑芥暟
- /// </summary>
- private Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>> dicDeviceHardInfoBackAction = new Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>>();
- /// 鑾峰彇纭欢淇℃伅鐨勫璞¤澶�
- /// </summary>
- private HashSet<string> hsGetHardInfoDevice = new HashSet<string>();
-
#endregion
#region 鈻� 涓诲叆鍙ｅ嚱鏁癬________________________
@@ -48,55 +40,13 @@
/// </summary>
/// <param name="device">璁惧鍥炶矾</param>
/// <param name="backAction">鍥炶皟鍑芥暟</param>
- public void SetAllHardFirmwareInfoToDevice(CommonDevice device, Action<CommonDevice, CommonDevice.DeviceStatusReportData> backAction = null)
+ public void SetAllHardFirmwareInfoToDevice(CommonDevice device)
{
if (device == null)
{
return;
}
- lock (hsGetHardInfoDevice)
- {
- //鍏堢Щ闄�
- this.RemoveDeviceHardInfoThread(device);
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- this.hsGetHardInfoDevice.Add(mainkeys);
-
- if (backAction != null)
- {
- //鍥炶皟鍑芥暟
- this.dicDeviceHardInfoBackAction[mainkeys] = backAction;
- }
- //璁剧疆璁惧鐨勭‖浠朵俊鎭�(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- this.SetHardFirmwareInfoToDevice(device);
- }
- }
-
- /// <summary>
- /// 璁剧疆璁惧鐨勭‖浠朵俊鎭�(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- /// </summary>
- /// <param name="device"></param>
- private void SetHardFirmwareInfoToDevice(CommonDevice device)
- {
- if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceGetHardFirmwareInfo") == false)
- {
- //娣诲姞浜嬩欢
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceGetHardFirmwareInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, this.SetHardFirmwareInfoByInterfaceResult);
- }
- //鍙戦�佸懡浠�
- this.SetHardFirmwareInfoComand(device);
- }
-
- #endregion
-
- #region 鈻� 鍙戦�佸懡浠__________________________
-
- /// <summary>
- /// 鍙戦�佽幏鍙栫‖浠朵俊鎭殑鍛戒护
- /// </summary>
- /// <param name="device"></param>
- public void SetHardFirmwareInfoComand(CommonDevice device)
- {
var jObject = new Newtonsoft.Json.Linq.JObject
{
{ "DeviceAddr",device.DeviceAddr },
@@ -108,217 +58,28 @@
{
new Newtonsoft.Json.Linq.JObject
{
- { "AttriButeId", 4}
+ { "AttriButeId", 4}//鐢熶骇鍟嗗悕瀛�
},
new Newtonsoft.Json.Linq.JObject
{
- { "AttriButeId", 5}
+ { "AttriButeId", 5}//鍨嬪彿鐮�(涔熷彨妯″潡ID)
},
new Newtonsoft.Json.Linq.JObject
{
- { "AttriButeId", 6}
+ { "AttriButeId", 6}//鐢熶骇鏃ユ湡
},
new Newtonsoft.Json.Linq.JObject
{
- { "AttriButeId", 7}
+ { "AttriButeId", 7}//鐢垫簮
},
new Newtonsoft.Json.Linq.JObject
{
- { "AttriButeId", 13}
+ { "AttriButeId", 13}//搴忓垪鍙�
}
};
var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
jObject.Add("Data", data);
device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
- }
-
- #endregion
-
- #region 鈻� 璁剧疆灞炴�__________________________
-
- /// <summary>
- /// 璁剧疆璁惧鐨勭‖浠朵俊鎭� -1:寮傚父 0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄‖浠朵俊鎭� 1:姝ｅ父
- /// </summary>
- /// <param name="report">涓婃姤淇℃伅</param>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- public int SetHardFirmwareInfo(CommonDevice.DeviceStatusReportData report, CommonDevice device)
- {
- if (report == null)
- {
- return -1;
- }
- //灞炴�ф槸鍚︽敼鍙�
- bool AttriButeChanged = false;
- //鏄惁鏄纭殑鎺ㄩ�佹暟鎹�
- bool isRightData = false;
- foreach (var data in report.AttriBute)
- {
- //鐢熶骇鍟嗗悕瀛�
- if (data.AttributeId == 4)
- {
- isRightData = true;
- if (data.AttriButeDataHex.Length > 2)
- {
- var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
- if (device.ManufacturerName != value)
- {
- //灞炴�у彉鏇翠簡
- AttriButeChanged = true;
- }
- device.ManufacturerName = value;
- }
- }
- //鍨嬪彿鐮�(涔熷彨妯″潡ID)
- if (data.AttributeId == 5)
- {
- isRightData = true;
- if (data.AttriButeDataHex.Length > 2)
- {
- var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
- if (device.ModelIdentifier != value)
- {
- //灞炴�у彉鏇翠簡
- AttriButeChanged = true;
- }
- device.ModelIdentifier = value;
- }
- }
- //鐢熶骇鏃ユ湡
- if (data.AttributeId == 6)
- {
- isRightData = true;
- if (data.AttriButeDataHex.Length > 2)
- {
- var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
- if (device.ProductionDate != value)
- {
- //灞炴�у彉鏇翠簡
- AttriButeChanged = true;
- }
- device.ProductionDate = value;
- }
- }
- //鐢垫簮
- if (data.AttributeId == 7)
- {
- isRightData = true;
- device.PowerSource = data.AttriButeData;
- }
- //搴忓垪鍙�
- if (data.AttributeId == 13)
- {
- isRightData = true;
- if (data.AttriButeDataHex.Length > 2)
- {
- string value;
- if (Common.LocalDevice.Current.IsHdlDevice(device) == false)
- {
- //绗笁鏂硅澶�
- value = data.AttriButeDataHex.Substring(2);
- }
- else
- {
- //娌充笢璁惧
- value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
- }
- if (device.SerialNumber != value)
- {
- //灞炴�у彉鏇翠簡
- AttriButeChanged = true;
- }
- device.SerialNumber = value;
- }
- }
- }
- if (isRightData == false)
- {
- //杩欎釜涓嶆槸纭欢淇℃伅鐨勬帹閫�
- return 0;
- }
-
- //濡傛灉灞炴�у彉鏇翠簡
- if (AttriButeChanged == true)
- {
- if (device.IsCustomizeImage == false)
- {
- //UI閲嶆柊鐢熸垚
- device.IconPath = string.Empty;
- device.ReSave();
- }
- }
- return 1;
- }
-
- #endregion
-
- #region 鈻� 鎺ュ彛鎺ㄩ�佸鐞哶______________________
-
- /// <summary>
- /// 鏍规嵁鎺ュ彛鎺ㄩ�佺殑淇℃伅锛岃缃澶囩‖浠朵俊鎭�
- /// </summary>
- /// <param name="device"></param>
- private void SetHardFirmwareInfoByInterfaceResult(CommonDevice device)
- {
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.hsGetHardInfoDevice.Contains(mainKeys) == false)
- {
- //鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄寚瀹氱殑璁惧
- return;
- }
- //璁剧疆璁惧纭欢淇℃伅
- var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
- if (localDevice == null)
- {
- return;
- }
- lock (hsGetHardInfoDevice)
- {
- //-1:寮傚父 0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄‖浠朵俊鎭� 1:姝ｅ父
- if (this.SetHardFirmwareInfo(device.DeviceStatusReport, localDevice) != 1)
- {
- return;
- }
- localDevice.ReSave();
-
- this.hsGetHardInfoDevice.Remove(mainKeys);
- if (this.dicDeviceHardInfoBackAction.ContainsKey(mainKeys) == true)
- {
- var action = this.dicDeviceHardInfoBackAction[mainKeys];
- //璋冪敤鍥炶皟鍑芥暟
- action?.Invoke(device, device.DeviceStatusReport);
- //鐒跺悗绉婚櫎
- this.dicDeviceHardInfoBackAction.Remove(mainKeys);
- action = null;
- }
- }
- }
-
- #endregion
-
- #region 鈻� 绉婚櫎鐩戝惉绾跨▼_______________________
-
- /// <summary>
- /// 绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋�
- /// </summary>
- /// <param name="device"></param>
- public void RemoveDeviceHardInfoThread(CommonDevice device)
- {
- lock (hsGetHardInfoDevice)
- {
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.hsGetHardInfoDevice.Contains(mainKeys) == true)
- {
- this.hsGetHardInfoDevice.Remove(mainKeys);
- }
- if (this.dicDeviceHardInfoBackAction.ContainsKey(mainKeys) == true)
- {
- var action = this.dicDeviceHardInfoBackAction[mainKeys];
- //鐒跺悗绉婚櫎
- this.dicDeviceHardInfoBackAction.Remove(mainKeys);
- action = null;
- }
- }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
index 6dd6b98..6f42f2d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
@@ -31,55 +31,6 @@
}
}
- /// <summary>
- /// OTA璁惧鑾峰彇闀滃儚鍚庣殑鍥炶皟鍑芥暟
- /// </summary>
- private Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>> dicOtaBackAction = new Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>>();
-
- #endregion
-
- #region 鈻� 涓诲叆鍙ｅ嚱鏁癬________________________
-
- /// <summary>
- /// 璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
- /// </summary>
- /// <param name="tADevice"></param>
- /// <param name="backAction"></param>
- public void SetAllImageInfoToOtaDevice(OTADevice tADevice, Action<CommonDevice, CommonDevice.DeviceStatusReportData> backAction = null)
- {
- if (tADevice == null)
- {
- return;
- }
- lock (dicOtaBackAction)
- {
- //鍏堢Щ闄�
- this.RemoveDeviceFirmwareVersionThread(tADevice);
-
- if (backAction != null)
- {
- this.dicOtaBackAction[tADevice.DeviceAddr] = backAction;
- }
- //璁剧疆璁惧鐨勫浐浠剁増鏈彿(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- this.SetFirmwareVersionToOtaDevice(tADevice);
- }
- }
-
- /// <summary>
- /// 璁剧疆璁惧鐨勫浐浠剁増鏈彿(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- /// </summary>
- /// <param name="tADevice"></param>
- private void SetFirmwareVersionToOtaDevice(OTADevice tADevice)
- {
- if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceAutoGetFirmwareVersion") == false)
- {
- //娣诲姞浜嬩欢
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceAutoGetFirmwareVersion", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, this.SetFirmwareVersionByInterfaceResult);
- }
- //鍙戦�佸懡浠�
- this.SetFirmwareVersionComand(tADevice);
- }
-
#endregion
#region 鈻� 鍙戦�佸懡浠__________________________
@@ -115,106 +66,6 @@
var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
jObject.Add("Data", data);
device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
- }
-
- #endregion
-
- #region 鈻� 璁剧疆灞炴�__________________________
-
- /// <summary>
- /// 璁剧疆璁惧鐨勫浐浠剁増鏈� -1:寮傚父 0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄浐浠朵俊鎭� 1:姝ｅ父
- /// </summary>
- /// <param name="report">涓婃姤淇℃伅</param>
- /// <param name="device">闇�瑕佷慨鏀圭殑璁惧瀵硅薄</param>
- /// <returns></returns>
- public int SetFirmwareVersion(CommonDevice.DeviceStatusReportData report, CommonDevice device)
- {
- if (report == null)
- {
- return -1;
- }
-
- //鏄惁鏄纭殑鎺ㄩ�佹暟鎹�
- bool isRightData = false;
- foreach (var data in report.AttriBute)
- {
- //闀滃儚鐗堟湰
- if (data.AttributeId == (int)AttriButeId.ImgVersion)
- {
- isRightData = true;
- device.ImgVersion = data.AttriButeData;
- }
- //纭欢鐗堟湰
- if (data.AttributeId == (int)AttriButeId.mgHWversion)
- {
- isRightData = true;
- device.HwVersion = data.AttriButeData;
- }
- //闀滃儚ID
- if (data.AttributeId == (int)AttriButeId.ImgTypeId)
- {
- isRightData = true;
- device.ImgTypeId = data.AttriButeData;
- }
- }
- if (isRightData == false)
- {
- //杩欎釜涓嶆槸鍥轰欢淇℃伅鐨勬帹閫�
- return 0;
- }
- return 1;
- }
-
- #endregion
-
- #region 鈻� 鎺ュ彛鎺ㄩ�佸鐞哶______________________
-
- /// <summary>
- /// 鏍规嵁鎺ュ彛鎺ㄩ�佺殑淇℃伅锛岃缃浐浠剁増鏈彿
- /// </summary>
- /// <param name="device"></param>
- private void SetFirmwareVersionByInterfaceResult(CommonDevice device)
- {
- var otaDevice = Common.LocalDevice.Current.GetOTADevice(device.DeviceAddr, device.DeviceEpoint);
- if (otaDevice != null)
- {
- //璁剧疆鍥轰欢鐗堟湰淇℃伅
- this.SetFirmwareVersion(device.DeviceStatusReport, otaDevice);
- otaDevice.ReSave();
- }
- lock (dicOtaBackAction)
- {
- if (this.dicOtaBackAction.ContainsKey(device.DeviceAddr) == true)
- {
- var action = this.dicOtaBackAction[device.DeviceAddr];
- //璋冪敤鍥炶皟鍑芥暟
- action?.Invoke(device, device.DeviceStatusReport);
- //鐒跺悗绉婚櫎
- this.dicOtaBackAction.Remove(device.DeviceAddr);
- action = null;
- }
- }
- }
- #endregion
-
- #region 鈻� 绉婚櫎鐩戝惉绾跨▼_______________________
-
- /// <summary>
- /// 绉婚櫎鑾峰彇璁惧鍥轰欢淇℃伅鐨勭洃鍚嚎绋�
- /// </summary>
- /// <param name="device"></param>
- public void RemoveDeviceFirmwareVersionThread(CommonDevice device)
- {
- lock (dicOtaBackAction)
- {
- if (this.dicOtaBackAction.ContainsKey(device.DeviceAddr) == true)
- {
- var action = this.dicOtaBackAction[device.DeviceAddr];
- //鐒跺悗绉婚櫎
- this.dicOtaBackAction.Remove(device.DeviceAddr);
- action = null;
- }
- }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index be9bc0c..7ee279d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -156,11 +156,6 @@
}
else if (device.Type == DeviceType.PMSensor)
{
- //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
- if (device.HadReadDeviceStatu == false)
- {
- return Language.StringByID(R.MyInternationalizationString.uOffLine);
- }
//绌烘皵璐ㄩ噺
string curQuality = "";
//娓╁害
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
index 0420de5..a76bb38 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
@@ -556,11 +556,22 @@
{
System.Threading.Thread.Sleep(3000);
- //閲嶆柊鍒锋柊缂撳瓨
- HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(otaDevice, (device, reportData) =>
- {
- this.IsFinishUpdate = true;
- });
+ string checkKey = Common.LocalDevice.Current.GetDeviceMainKeys(otaDevice.DeviceAddr, otaDevice.DeviceEpoint);
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("HdlDeviceUpdate" + otaDevice.DeviceAddr, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ {
+ if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
+ {
+ string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
+ if (checkKey == mainKey)
+ {
+ //宸茬粡鎺ユ敹寰楀埌
+ this.IsFinishUpdate = true;
+ }
+ }
+ });
+
+ //鍙戦�佸懡浠�
+ HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(otaDevice);
System.Threading.Thread.Sleep(1500);
int count = 12;
@@ -572,7 +583,7 @@
count--;
}
//绉婚櫎浜嬩欢
- HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(otaDevice);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HdlDeviceUpdate");
//璁剧疆杩涘害鍊肩洿鎺ヤ负100%
this.ProgressEvent?.Invoke(100);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index a73caea..9c4f1dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -222,6 +222,7 @@
list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A3鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 1 });
list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A4鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 2 });
list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A绌鸿皟缃戝叧, RoomId = floorKey + "_KeTing", DeviceCount = 1 });
+ //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡, RoomId = floorKey + "_KeTing", DeviceCount = 1 });
//闃冲彴
list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A220pir浼犳劅鍣�, RoomId = floorKey + "_YangTai", DeviceCount = 1 });
@@ -894,6 +895,31 @@
}
}
+ public void Zigbee鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡(int i_DeviceCount, string i_RoomId)
+ {
+ for (int i = 0; i < i_DeviceCount; i++)
+ {
+ //4涓共鎺ョ偣
+ for (int j = 1; j <= 4; j++)
+ {
+ var device = new Panel() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = j };
+ //璁剧疆璁惧鐨勫熀鏈俊鎭�
+ this.SetBaseDataToDevice(device, 2000, 2000, "MLR0310-ZB.20", i_RoomId);
+ }
+ //3涓户鐢靛櫒
+ for (int j = 5; j <= 7; j++)
+ {
+ var device = new ToggleLight() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = j };
+ device.DfunctionType = DeviceFunctionType.A鐏厜;
+ //璁剧疆璁惧鐨勫熀鏈俊鎭�
+ this.SetBaseDataToDevice(device, 2000, 2000, "MLR0310-ZB.20", i_RoomId);
+ device.DeviceEpointName = Language.StringByID(R.MyInternationalizationString.uLight) + (j - 4);
+ }
+
+ this.DeviceNumber++;
+ }
+ }
+
/// <summary>
/// 璁剧疆璁惧鐨勫熀鏈俊鎭�
/// </summary>
@@ -976,6 +1002,7 @@
A鏂规偊鏂伴闈㈡澘 = 25,
A鏂规偊鏂伴灏忔ā鍧� = 26,
A鍚搁《鐕冩皵浼犳劅鍣� = 27,
+ A鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 = 28,
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index 93755be..45aed43 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -93,24 +93,24 @@
var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Linux, Pra);
return result;
}
- else if (levelType == FirmwareLevelType.Coordinator)
+ else if (levelType == FirmwareLevelType.A鍗忚皟鍣�)
{
//鍗忚皟鍣ㄦā鍧�
Pra.FirmwareManaFirstType = 1;
Pra.FirmwareManaSecondType = 1;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Coordinator, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.A鍗忚皟鍣�, Pra);
return result;
}
- else if (levelType == FirmwareLevelType.VirtualDevice)
+ else if (levelType == FirmwareLevelType.A铏氭嫙椹卞姩)
{
//铏氭嫙璁惧妯″潡
Pra.FirmwareManaFirstType = 1;
Pra.FirmwareManaSecondType = 2;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.VirtualDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.A铏氭嫙椹卞姩, Pra);
return result;
}
else
@@ -120,7 +120,7 @@
Pra.FirmwareManaSecondType = null;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.ZigbeeDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.A璁惧, Pra);
return result;
}
}
@@ -534,7 +534,7 @@
listVersion.Add(new TemplateDeviceVersion
{
FileDiv = "Device_",
- levelType = FirmwareLevelType.ZigbeeDevice,
+ levelType = FirmwareLevelType.A璁惧,
HwVersion = device.HwVersion.ToString(),
ImageType = device.ImgTypeId.ToString(),
FirmwareVersion = device.ImgVersion
@@ -567,7 +567,7 @@
listVersion.Add(new TemplateDeviceVersion
{
FileDiv = "Coordinator_",
- levelType = FirmwareLevelType.Coordinator,
+ levelType = FirmwareLevelType.A鍗忚皟鍣�,
HwVersion = gateway.CoordinatorHardVersion.ToString(),
ImageType = gateway.CoordinatorImageId.ToString(),
FirmwareVersion = gateway.CoordinatorFirmwareVersion
@@ -588,7 +588,7 @@
listVersion.Add(new TemplateDeviceVersion
{
FileDiv = "DriveCode_",
- levelType = FirmwareLevelType.VirtualDevice,
+ levelType = FirmwareLevelType.A铏氭嫙椹卞姩,
HwVersion = data.DriveHwVersion.ToString(),
ImageType = data.DriveImageType.ToString(),
FirmwareVersion = data.DriveFwVersion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 46d1dd1..9631ac2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -1574,7 +1574,7 @@
if (flage == 1)
{
//娌＄綉鐨勬椂鍊欎笉鍐嶅鐞�
- HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,
+ HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A鍗忚皟鍣�,
localWay.CoordinatorHardVersion.ToString(),
localWay.CoordinatorImageId.ToString());
}
@@ -1586,7 +1586,7 @@
localWay.LinuxFirmwareVersion);
//鍗忚皟鍣ㄧ増鏈�
- var coordinatorFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.Coordinator,
+ var coordinatorFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A鍗忚皟鍣�,
localWay.CoordinatorHardVersion.ToString(),
localWay.CoordinatorImageId.ToString(),
localWay.CoordinatorFirmwareVersion);
@@ -1604,13 +1604,13 @@
//娣诲姞铏氭嫙椹卞姩鐨勫崌绾у浐浠�(鎴愪笉鎴愬姛閮芥棤鎵�璋�) 蹇呴』鑳藉鑱旂綉鎵嶈
if (flage == 1)
{
- HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
+ HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A铏氭嫙椹卞姩,
data.DriveHwVersion.ToString(),
data.DriveImageType.ToString());
}
//铏氭嫙椹卞姩
- var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.VirtualDevice,
+ var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A铏氭嫙椹卞姩,
data.DriveHwVersion.ToString(),
data.DriveImageType.ToString(),
data.DriveFwVersion);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index a1d3219..b912a16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -466,11 +466,11 @@
//宸茬粡鎺ユ敹鍒扮姸鎬�
locadevice.HadReadDeviceStatu = true;
- if (locadevice is LightBase)
- {
- //褰撴帴鏀跺埌浜害鍊兼椂,榛樿鎵撳紑
- ((LightBase)locadevice).OnOffStatus = 1;
- }
+ //if (locadevice is LightBase)
+ //{
+ // //褰撴帴鏀跺埌浜害鍊兼椂,榛樿鎵撳紑
+ // ((LightBase)locadevice).OnOffStatus = 1;
+ //}
}
}
#endregion
@@ -635,8 +635,135 @@
}
#endregion
- }
+ #region 鈻� 璁惧鍩虹淇℃伅
+
+ else if (report.DeviceStatusReport.CluterID == 0)
+ {
+ var listLocalDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr, false);
+ //灞炴�ч兘鏄竴鏍风殑
+ foreach (var myDevice in listLocalDevice)
+ {
+ //灞炴�ф槸鍚︽敼鍙�
+ bool attriButeChanged = false;
+ foreach (var data in report.DeviceStatusReport.AttriBute)
+ {
+ //鐢熶骇鍟嗗悕瀛�
+ if (data.AttributeId == 4 && data.AttriButeDataHex.Length > 2)
+ {
+ if (data.AttriButeDataHex.Length > 2)
+ {
+ var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
+ if (myDevice.ManufacturerName != value)
+ {
+ //灞炴�у彉鏇翠簡
+ attriButeChanged = true;
+ }
+ myDevice.ManufacturerName = value;
+ }
+ }
+ //鍨嬪彿鐮�(涔熷彨妯″潡ID)
+ if (data.AttributeId == 5)
+ {
+ if (data.AttriButeDataHex.Length > 2)
+ {
+ var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
+ if (myDevice.ModelIdentifier != value)
+ {
+ //灞炴�у彉鏇翠簡
+ attriButeChanged = true;
+ }
+ myDevice.ModelIdentifier = value;
+ }
+ }
+ //鐢熶骇鏃ユ湡
+ if (data.AttributeId == 6)
+ {
+ if (data.AttriButeDataHex.Length > 2)
+ {
+ var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
+ if (myDevice.ProductionDate != value)
+ {
+ //灞炴�у彉鏇翠簡
+ attriButeChanged = true;
+ }
+ myDevice.ProductionDate = value;
+ }
+ }
+ //鐢垫簮
+ if (data.AttributeId == 7)
+ {
+ myDevice.PowerSource = data.AttriButeData;
+ }
+ //搴忓垪鍙�
+ if (data.AttributeId == 13)
+ {
+ if (data.AttriButeDataHex.Length > 2)
+ {
+ string value;
+ if (Common.LocalDevice.Current.IsHdlDevice(myDevice) == false)
+ {
+ //绗笁鏂硅澶�
+ value = data.AttriButeDataHex.Substring(2);
+ }
+ else
+ {
+ //娌充笢璁惧
+ value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));
+ }
+ if (myDevice.SerialNumber != value)
+ {
+ //灞炴�у彉鏇翠簡
+ attriButeChanged = true;
+ }
+ myDevice.SerialNumber = value;
+ }
+ }
+ }
+ //濡傛灉灞炴�у彉鏇翠簡
+ if (attriButeChanged == true && myDevice.IsCustomizeImage == false)
+ {
+ //UI閲嶆柊鐢熸垚
+ myDevice.IconPath = string.Empty;
+ myDevice.ReSave();
+ }
+ }
+ }
+
+ #endregion
+ }
+ else if (deviceEpoint == 200)
+ {
+ var localOta = Common.LocalDevice.Current.GetOTADevice(deviceAddr);
+ if (localOta != null)
+ {
+ #region 鈻� 鍥轰欢鐗堟湰
+ //鍥轰欢鐗堟湰
+ if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
+ {
+ foreach (var data in report.DeviceStatusReport.AttriBute)
+ {
+ //闀滃儚鐗堟湰
+ if (data.AttributeId == (int)AttriButeId.ImgVersion)
+ {
+ localOta.ImgVersion = data.AttriButeData;
+ }
+ //纭欢鐗堟湰
+ if (data.AttributeId == (int)AttriButeId.mgHWversion)
+ {
+ localOta.HwVersion = data.AttriButeData;
+ }
+ //闀滃儚ID
+ if (data.AttributeId == (int)AttriButeId.ImgTypeId)
+ {
+ localOta.ImgTypeId = data.AttriButeData;
+ }
+ }
+ localOta.ReSave();
+ }
+ #endregion
+ }
+ }
this.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
index ea27785..81fd930 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -954,7 +954,7 @@
//缃戝叧鍗囩骇
timeCount += 50;
//缃戝叧閲嶅惎
- timeCount += 180;
+ timeCount += 250;
}
return timeCount;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index b6d038d..69f5c4a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -229,7 +229,7 @@
try
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson), 5);
if (revertObj == null)
{
return null;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
old mode 100644
new mode 100755
index 7bd5ad8..c7bc442
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -185,6 +185,7 @@
tcpClient = new System.Net.Sockets.TcpClient();
tcpClient.Connect("192.168.8.1", 5000);
networkStream = tcpClient.GetStream();
+ networkStream.ReadTimeout = 1000;
//鍔犲瘑鏁版嵁
string sendDataMsg = "hdl1985.";
string DefaultdesKey = "hdl1985.";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 398a205..38dde63 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -907,6 +907,11 @@
}
//APP缂撳瓨鍔犺浇瀹屾垚
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (Shared.Phone.Device.Logic.Send.If_Exist == "1")
+ {
+ //浠ユ湰鍦扮姸鎬佷负涓绘墦寮�GPS鏈嶅姟
+ Application.StartGPSLocationService();
+ }
return true;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index d23232a..6661a1d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -285,6 +285,10 @@
/// </summary>
public const string StartDebugAppFile = "StartDebugAppFile";
/// <summary>
+ /// 寮�鍚娴嬭澶嘥ype鐨勩�愭爣璇嗘枃浠躲��,涓嶅姞瀵�
+ /// </summary>
+ public const string CheckDeviceTypeFile = "CheckDeviceTypeFile";
+ /// <summary>
/// 鍔熻兘澶囦唤鐨勫悕瀛� 杩欎釜涓滆タ涓嶅姞瀵�
/// </summary>
public const string OptionBackupName = "##Option##";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index 4cd1d83..d92d8ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
@@ -77,7 +77,7 @@
/// </summary>
private void InitAirConditioningModuleList(VerticalListControl listView)
{
- var list = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
+ var list = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
var listUpdate = new List<FirmwareVersionInfo>();
foreach (var data in list)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
index e0c6eb5..365b2d7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
@@ -107,27 +107,32 @@
btnOk.TextID = R.MyInternationalizationString.uSave;
bodyFrameLayout.AddChidren(btnOk);
btnOk.ButtonClickEvent += (sender, e) =>
- {
- if (this.oldReportValue == this.reportValue)
- {
+ {
+ if (this.oldReportValue == this.reportValue)
+ {
//鏁版嵁鐩稿悓,涓嶉渶瑕佷慨鏀�
this.CloseForm();
- return;
- }
- //灏嗕簩杩涘埗杞崲涓哄崄杩涘埗
- var data = Convert.ToInt32(this.fixValue + this.reportValue, 2);
- var result = HdlDeviceAirConditionerLogic.Current.SetAcModeSupport(deviceAc, data);
- if (result == true)
- {
- //鏇存敼缂撳瓨
- for (int i = 0; i < this.reportValue.Length; i++)
- {
- deviceAc.listSupportMode[i] = Convert.ToInt32(reportValue[i].ToString());
- }
- deviceAc.ReSave();
- this.CloseForm();
- }
- };
+ return;
+ }
+ //灏嗕簩杩涘埗杞崲涓哄崄杩涘埗
+ var data = Convert.ToInt32(this.fixValue + this.reportValue, 2);
+ var result = HdlDeviceAirConditionerLogic.Current.SetAcModeSupport(deviceAc, data);
+ if (result == true)
+ {
+ //鏇存敼缂撳瓨
+ for (int i = 0; i < this.reportValue.Length; i++)
+ {
+ deviceAc.listSupportMode[i] = Convert.ToInt32(reportValue[i].ToString());
+ }
+ deviceAc.ReSave();
+ this.CloseForm();
+ }
+ };
+ //濡傛灉鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnOk.CanClick = false;
+ }
});
});
}
@@ -174,6 +179,11 @@
this.reportValue = reportValue.Substring(0, div) + "0" + reportValue.Substring(div + 1);
}
};
+ //濡傛灉鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowFrame.CanClick = false;
+ }
}
#endregion
@@ -186,9 +196,9 @@
private void ReadAirConditionerModeSupport()
{
//濡傛灉鏄櫄鎷熶綇瀹�
- if (Common.Config.Instance.Home.IsVirtually == true)
+ if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
{
- var data = ModelData.DeviceModelDataLogic.Current.GetAcModeSupport(deviceAc);
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetAcModeSupport(deviceAc);
//杞崲涓轰簩杩涘埗
var value = Convert.ToString(data, 2).PadLeft(16, '0');
//杩欎簲涓缃槸鏀惧湪鍚庨潰鐨�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
index afd1449..867258a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
@@ -24,6 +24,10 @@
/// 婵�娲荤殑璁惧鍦板潃
/// </summary>
private string actionDeviceKeys = null;
+ /// <summary>
+ /// 鎺ユ敹鍥炲鐨勭鐐�
+ /// </summary>
+ private HashSet<int> listReceivePoint = new HashSet<int>();
#endregion
@@ -36,6 +40,11 @@
public void ShowForm(string i_diviceMac)
{
this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_diviceMac);
+ //鏀堕泦鍏ㄩ儴绔偣
+ foreach (var device in this.listDevice)
+ {
+ listReceivePoint.Add(device.DeviceEpoint);
+ }
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uIndoorUnitSettion));
@@ -242,15 +251,24 @@
}
HdlThreadLogic.Current.RunThread(() =>
{
- for (int i = 0; i < listDevice.Count; i++)
+ while (this.listReceivePoint.Count > 0 && this.Parent != null)
{
- if (this.Parent == null)
+ for (int i = 0; i < listDevice.Count; i++)
{
- return;
+ if (this.Parent == null)
+ {
+ return;
+ }
+ //宸茬粡鍙戦�佽繃浜�,灏变笉鐢ㄥ啀鍙戦��
+ if (this.listReceivePoint.Contains(listDevice[i].DeviceEpoint) == true)
+ {
+ //璇诲彇鐘舵��
+ HdlDeviceAttributeLogic.Current.SendThermostatStatuComand(listDevice[i]);
+ System.Threading.Thread.Sleep(200);
+ }
}
- //璇诲彇鐘舵��
- HdlDeviceAttributeLogic.Current.SendThermostatStatuComand(listDevice[i]);
- System.Threading.Thread.Sleep(200);
+ //3绉掑悗鍐嶆寰幆
+ System.Threading.Thread.Sleep(3000);
}
});
}
@@ -276,6 +294,8 @@
{
return;
}
+ //宸茬粡鎺ユ敹鍒版暟鎹�,鍒欑Щ闄ょ鐐�
+ this.listReceivePoint.Remove(device.DeviceEpoint);
var rowInfo = dicControl[mainkeys];
for (int i = 0; i < device.DeviceStatusReport.AttriBute.Count; i++)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
index 1875cda..f1d4cca 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
@@ -102,26 +102,31 @@
//鍒掔嚎
btnNote.AddBottomLine();
btnNote.txtInput.FinishInputEvent += () =>
- {
- string oldName = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);
- if (btnNote.Text.Trim() == string.Empty)
- {
- //灏嗗悕瀛楄繕鍘�
- btnNote.Text = oldName;
- }
- if (oldName != btnNote.Text)
- {
- //璁惧鍚嶇О淇敼
- var result = Common.LocalDevice.Current.ReName(deviceAc, btnNote.Text);
- if (result == false)
- {
- return;
- }
- //璁惧澶囨敞淇敼鎴愬姛!
- string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNoteSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
- }
- };
+ {
+ string oldName = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);
+ if (btnNote.Text.Trim() == string.Empty)
+ {
+ //灏嗗悕瀛楄繕鍘�
+ btnNote.Text = oldName;
+ }
+ if (oldName != btnNote.Text)
+ {
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
+ //璁惧鍚嶇О淇敼
+ var result = Common.LocalDevice.Current.ReName(deviceAc, btnNote.Text);
+ if (result == false)
+ {
+ return;
+ }
+ //璁惧澶囨敞淇敼鎴愬姛!
+ string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNoteSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
+ };
//璁惧绫诲瀷
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
@@ -215,6 +220,12 @@
}
this.CloseForm();
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFinish.CanClick = false;
+ btnSwingSwitch.CanClick = false;
+ }
}
#endregion
@@ -270,7 +281,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- var data = ModelData.DeviceModelDataLogic.Current.GetAcSwingModeSupport(deviceAc);
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetAcSwingModeSupport(deviceAc);
//杞崲涓轰簩杩涘埗
var value = Convert.ToString(data, 2).PadLeft(16, '0');
//杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index b041d38..63679cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -7,6 +7,9 @@
using static ZigBee.Device.Panel;
namespace Shared.Phone.UserCenter.DeviceBind
{
+ /// <summary>
+ /// 鏅�氶潰鏉跨殑缁戝畾璁惧鐣岄潰銆愬彲缁戝畾澶氫釜璁惧銆�
+ /// </summary>
public class AddDevicePage : BindCommonLayout
{
/// 鏋勯�犲嚱鏁�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
index e8fe358..5348f72 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -9,6 +9,9 @@
namespace Shared.Phone.UserCenter.DeviceBind
{
+ /// <summary>
+ /// 鏅�氶潰鏉跨殑缁戝畾鍦烘櫙鐣岄潰銆愬彧鍙粦瀹�1涓満鏅��
+ /// </summary>
public class AddScenePage : BindCommonLayout
{
/// 鏋勯�犲嚱鏁�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
index b25f90f..881efa8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -7,10 +7,6 @@
{
public class BindCommonLayout : FrameLayout
{
- public BindCommonLayout()
- {
-
- }
#region 鈼� 鍙橀噺鐢虫槑__________________________
/// <summary>
/// 妤煎眰鍥炶皟
@@ -539,6 +535,10 @@
sList.Add("5007_1:[0]鑾峰彇鎸夐敭缁戝畾琛ㄦ椂,缃戝叧娌″洖,缁撴灉鏄痆0]鑾峰彇澶氬姛鑳介潰鏉跨殑鐩爣涓暟涓嶅叏銆愬懡浠�5007銆�");
sList.Add("5007_2:[0]鑾峰彇鎸夐敭缁戝畾鐨勬俯搴︿紶鎰熷櫒澶辫触銆愬懡浠�5007銆�");
sList.Add("5007_3:[0]鑾峰彇鎸夐敭缁戝畾鐨勬箍搴﹀害浼犳劅鍣ㄥけ璐ャ�愬懡浠�5007銆�");
+ sList.Add("5020:[0]涓�瀵逛竴缁戝畾璁惧鏃�,缃戝叧娌″洖銆愬懡浠�5020銆�");
+ sList.Add("5020_1:[0]涓�瀵逛竴缁戝畾锛岃澶囨坊鍔犵粦瀹氱洰鏍囨椂,[0]缃戝叧缁戝畾鐩爣澶辫触锛岀粦瀹氳澶囦笉瀛樺湪銆愬懡浠�5020銆�");
+ sList.Add("5020_2:[0]涓�瀵逛竴缁戝畾锛岃澶囨坊鍔犵粦瀹氱洰鏍囨椂,缃戝叧缁戝畾鐩爣澶辫触锛孾0]缁戝畾鏈煡锛屽彲鑳芥槸绛夊緟鑺傜偣璁惧鍥炲銆愬懡浠�5020銆�");
+
return sList;
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 5d20fe7..1887e50 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -9,7 +9,7 @@
namespace Shared.Phone.UserCenter.DeviceBind
{
/// <summary>
- /// 鎸夐敭绠＄悊
+ /// 鏅�氶潰鏉跨殑缁戝畾鐣岄潰銆愬彲缁戝畾澶氫釜鐩爣銆�
/// </summary>
public class BindTargetsPage : BindCommonLayout
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
index 30314e1..e7f0c06 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -11,7 +11,9 @@
namespace Shared.Phone.UserCenter.Device.Bind
{
/// <summary>
- /// /鍙娇鐢ㄤ簬绠�绾﹀鍔熻兘闈㈡澘鐨勬柟娉�
+ /// 鍙娇鐢ㄤ簬绠�绾﹀鍔熻兘闈㈡澘鐨勬柟娉�
+ /// 銆愪竴涓寜閿彧鑳戒竴涓洰鏍囷紝涓�瀵逛竴缁戝畾銆備絾鏄鍔熻兘闈㈡澘60鎸夐敭锛屾渶澶氱粦瀹�60涓洰鏍囥��
+ /// 缁戝畾涓暟 鏈�澶�20涓満鏅紙鎸夐敭31锝�52锛� 鏈�澶�10涓紑鍏筹紙鎸夐敭52锝�61锛� 鏈�澶�10涓彃搴э紙鎸夐敭52锝�61锛� 鏈�澶�17涓伅鍏夛紙鎸夐敭52锝�61鎴栬��22锝�28锛� 鏈�澶�8涓伄闃筹紙鎸夐敭14锝�21锛� 鏈�澶�3涓┖璋冿紙鎸夐敭2锝�4锛� 鏈�澶�1涓柊椋庯紙鎸夐敭13锛�</param>
/// </summary>
public class MutilfunctionPanelMethod
{
@@ -21,29 +23,25 @@
/// </summary>
public static int curSwitchCount = 0;
/// <summary>
- /// 鎻掑骇鐨勪釜鏁奥�
+ /// 鎻掑骇鐨勪釜鏁奥燵姣忔杩涘叆鍒板鍔熻兘缁戝畾鐣岄潰锛岄兘瑕佽閲嶆柊鍙栧�糫
/// </summary>
public static int curSocketCount = 0;
/// <summary>
- /// 鐏厜涓暟聽[浠庣户鐢靛櫒涓垎閰嶇殑鍔熻兘绫诲瀷鏄伅鍏塢
+ /// 鐏厜涓暟聽[浠庣户鐢靛櫒涓垎閰嶇殑鍔熻兘绫诲瀷鏄伅鍏塢[姣忔杩涘叆鍒板鍔熻兘缁戝畾鐣岄潰锛岄兘瑕佽閲嶆柊鍙栧�糫
/// </summary>
public static int curLightFromRelayCount = 0;
/// <summary>
- /// 璋冨厜涓暟聽
+ /// 璋冨厜涓暟聽[姣忔杩涘叆鍒板鍔熻兘缁戝畾鐣岄潰锛岄兘瑕佽閲嶆柊鍙栧�糫
/// </summary>
public static int curLightCount = 0;
- /// <summary>
- /// 澶氬姛鑳介潰鏉夸腑琚粦瀹氱殑鐩爣
- /// </summary>
- public static System.Collections.Generic.Dictionary<string, List<BindListAllInfo>> bindTargetsFromMutilfunctionPanelList = new System.Collections.Generic.Dictionary<string, List<BindListAllInfo>>();
#endregion
/// <summary>
/// 鑾峰彇闈㈡澘宸茬粡缁戝畾鐨勫尮閰嶇被鍨嬬殑鍒楄〃
- /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
+ /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴 </param>
/// </summary>
/// <returns></returns>
- public static List<BindListAllInfo> GetMatchBindList(int curBindType)
+ public static List<BindListAllInfo> GetMatchBindList(Panel curControlDev, int curBindType)
{
var tempList = new List<BindListAllInfo>();
int count1 = 0;
@@ -63,9 +61,9 @@
break;
}
- foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+ foreach (var key in curControlDev.bindTargetsFromMutilfunctionPanelList.Keys)
{
- var bList = bindTargetsFromMutilfunctionPanelList[key];
+ var bList = curControlDev.bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
if (curBindType == 0)
@@ -177,7 +175,7 @@
/// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
/// </summary>
/// <returns></returns>
- public static void UpdateLightCount(int curBindType)
+ public static void UpdateLightCount(Panel curControlDev, int curBindType)
{
if (curBindType == 1 || curBindType == 2 || curBindType == 3)
@@ -187,9 +185,9 @@
curLightFromRelayCount = 0;
curLightCount = 0;
- foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+ foreach (var key in curControlDev.bindTargetsFromMutilfunctionPanelList.Keys)
{
- var bList = bindTargetsFromMutilfunctionPanelList[key];
+ var bList = curControlDev.bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
@@ -294,12 +292,12 @@
/// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
/// </summary>
/// <returns></returns>
- public static List<int> GetMatchEpointList(int curBindType)
+ public static List<int> GetMatchEpointList(Panel curControlDev, int curBindType)
{
var tempList = MatchEpointList(curBindType);
- foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+ foreach (var key in curControlDev.bindTargetsFromMutilfunctionPanelList.Keys)
{
- var bList = bindTargetsFromMutilfunctionPanelList[key];
+ var bList = curControlDev.bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
if (curBindType == 0)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index 31008e1..37af8dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -7,6 +7,9 @@
using static ZigBee.Device.Panel;
namespace Shared.Phone.UserCenter.Device.Bind
{
+ /// <summary>
+ /// 鐗规畩闈㈡澘鐨勭粦瀹氱晫闈€�愬彧鑳界粦瀹氱壒瀹氱被鍨嬶紝姣忕绫诲瀷鍙湁涓�涓洰鏍囥��
+ /// </summary>
public class PaneTargetsBaseForm : BindCommonLayout
{
#region 鏋勯�犲嚱鏁�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index d397cc4..9b337e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -190,6 +190,11 @@
curtainData.Direction = index == 0 ? false : true;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowDirection.CanClick = false;
+ }
}
#endregion
@@ -357,6 +362,15 @@
//鏁版嵁鍙樻洿,鐧惧垎姣�
curtainData.OpenLimitPersent = value;
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ openSeekBar.Enable = false;
+ btnMinus.CanClick = false;
+ btnPlus.CanClick = false;
+ btnSave.CanClick = false;
+ }
+
//铏氭嫙浣忓畢涓嶉渶瑕佺洃鍚�
if (Common.Config.Instance.Home.IsVirtually == true)
{
@@ -530,6 +544,14 @@
//鏁版嵁鍙樻洿,鐧惧垎姣�
curtainData.CloseLimitPersent = value;
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ closeSeekBar.Enable = false;
+ btnMinus.CanClick = false;
+ btnPlus.CanClick = false;
+ btnSave.CanClick = false;
+ }
//铏氭嫙浣忓畢涓嶉渶瑕佺洃鍚�
if (Common.Config.Instance.Home.IsVirtually == true)
{
@@ -666,7 +688,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- var data = ModelData.DeviceModelDataLogic.Current.GetCurtainLimitPoint(curtainDevice);
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);
curtainData.Direction = data.Direction;
curtainData.CurtainLength = data.curtainLength;
curtainData.OpenLimitValue = data.upLimit;
@@ -759,6 +781,11 @@
/// </summary>
private void ReceiveLimitData()
{
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欓渶瑕佸鐞�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
if (HdlGatewayReceiveLogic.Current.IsEsixt("ReceiveLimitData") == true)
{
HdlGatewayReceiveLogic.Current.RemoveEvent("ReceiveLimitData");
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
index e78ed9b..652c833 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
@@ -241,6 +241,11 @@
{
curtainDevice.CurtainUpDownStopControl(1);
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameIconback.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameIconback.SelectStatuEvent += (select) =>
{
@@ -265,6 +270,11 @@
await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit, -1, -1);
});
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameText.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameText.SelectStatuEvent += (select) =>
{
@@ -350,6 +360,11 @@
{
curtainDevice.CurtainUpDownStopControl(0);
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameIconback.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameIconback.SelectStatuEvent += (select) =>
{
@@ -374,6 +389,11 @@
await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit, -1, -1);
});
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameText.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameText.SelectStatuEvent += (select) =>
{
@@ -429,6 +449,11 @@
});
});
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ rowReset.CanClick = false;
+ }
}
#endregion
@@ -441,10 +466,17 @@
/// <returns></returns>
private bool InitCurtainDefultData()
{
+ this.curtainData = new CurtainData();
+ //濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);
+ curtainData.Direction = data.Direction;
+ return true;
+ }
+
//寮�鍚繘搴︽潯
this.ShowProgressBar();
-
- this.curtainData = new CurtainData();
bool receiptData = false;
string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index 2a11755..56a24fa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -29,7 +29,7 @@
/// <summary>
/// 璁惧澶囨敞鐨勬帶浠�
/// </summary>
- private FrameCaptionInputControl btnDeviceName = null;
+ private FrameCaptionInputControl frameDeviceName = null;
/// <summary>
/// 璁惧鐨勬煇涓�鍥炶矾
/// </summary>
@@ -98,7 +98,7 @@
btnFinish.ButtonClickEvent += (sender, e) =>
{
//璁板綍璧峰綋鍓嶆鍦ㄦ搷浣滅殑鍥炶矾鍚嶅瓧
- dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
+ dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();
//寮�鍚繘搴︽潯
this.ShowProgressBar();
foreach (var epoint in dicDeviceSaveName.Keys)
@@ -127,12 +127,17 @@
//鍏抽棴鑷韩
this.CloseForm();
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFinish.CanClick = false;
+ }
}
/// <summary>
/// 鍒濆鍖栬彍鍗曡
/// </summary>
- private async void InitMenuRow()
+ private void InitMenuRow()
{
this.listview.RemoveAll();
@@ -144,31 +149,36 @@
nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];
}
- this.btnDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
- listview.AddChidren(btnDeviceName);
- btnDeviceName.InitControl();
- btnDeviceName.AddBottomLine();
- btnDeviceName.txtInput.FinishInputEvent += () =>
+ this.frameDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
+ this.frameDeviceName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
+ listview.AddChidren(frameDeviceName);
+ frameDeviceName.InitControl();
+ frameDeviceName.AddBottomLine();
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
- if (btnDeviceName.Text.Trim() == string.Empty)
+ frameDeviceName.txtInput.FinishInputEvent += () =>
{
- //灏嗗悕瀛楄繕鍘�
- btnDeviceName.Text = oldName;
- }
- if (oldName != btnDeviceName.Text.Trim())
- {
- //璁惧鍚嶇О淇敼
- var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
- if (result == false)
+ string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
+ if (frameDeviceName.Text.Trim() == string.Empty)
{
- return;
+ //灏嗗悕瀛楄繕鍘�
+ frameDeviceName.Text = oldName;
}
- //骞叉帴鐐瑰娉ㄤ慨鏀规垚鍔�!
- string msg = Language.StringByID(R.MyInternationalizationString.uDryContactReNoteSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
- }
- };
+ if (oldName != frameDeviceName.Text.Trim())
+ {
+ //璁惧鍚嶇О淇敼
+ var result = Common.LocalDevice.Current.ReName(nowSelectDevice, frameDeviceName.Text.Trim());
+ if (result == false)
+ {
+ return;
+ }
+ //骞叉帴鐐瑰娉ㄤ慨鏀规垚鍔�!
+ string msg = Language.StringByID(R.MyInternationalizationString.uDryContactReNoteSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
+ };
+ }
//鎵�灞炲尯鍩�
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
@@ -190,8 +200,10 @@
if (isHdlDevice == true)
{
//濡傛灉鏄�3璺户鐢靛櫒鎴栬��1璺皟鍏夊櫒,骞朵笖鏄涓冨洖璺殑鏃跺��,瀹冨ソ鍍忓彲浠ユ敼鍙樼被鍨�
+ //濡傛灉鏄鏍�14璺共鎺ョ偣灏忔ā鍧�,骞朵笖鏄涓冨洖璺殑鏃跺��,瀹冨ソ鍍忓彲浠ユ敼鍙樼被鍨�
if ((deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_ThreeLoad && nowSelectDevice.DeviceEpoint == 10)
- || (deviceEnumInfo.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad && nowSelectDevice.DeviceEpoint == 7))
+ || (deviceEnumInfo.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad && nowSelectDevice.DeviceEpoint == 7)
+ || (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact && nowSelectDevice.DeviceEpoint == 7))
{
//杩欓噷鍏堝幓鑾峰彇瀹冪殑骞叉帴鐐圭被鍨�
this.ShowProgressBar();
@@ -228,7 +240,8 @@
private void InitTopRightMenu()
{
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
+ || Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
@@ -347,6 +360,11 @@
}
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFunction.CanClick = false;
+ }
}
}
@@ -409,7 +427,10 @@
var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
if (myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad
- || myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad)
+ || myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad
+ || myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA
+ || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA
+ || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact)
{
//鑳屽厜鐏�
string caption = Language.StringByID(R.MyInternationalizationString.uBackLight);
@@ -422,8 +443,20 @@
btnLight.AddRightArrow();
btnLight.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceRelay.RelayThreeLoadBackLightSettionForm();
- form.AddForm(deviceObj.DeviceAddr);
+ if (myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA
+ || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA
+ || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact)
+ {
+ //鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 鎴栬�� 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 鎴栬�� 娆ф爣14璺共鎺ョ偣灏忔ā鍧�
+ var form = new DeviceRelay.RelayNationalBackLightSettionForm();
+ form.AddForm(deviceObj.DeviceAddr);
+ }
+ else
+ {
+ //涓夎矾缁х數鍣�,鎴栬�呬竴璺皟鍏夊櫒
+ var form = new DeviceRelay.RelayThreeLoadBackLightSettionForm();
+ form.AddForm(deviceObj.DeviceAddr);
+ }
};
}
}
@@ -620,7 +653,7 @@
nowSelectControl.TextSize = 13;
nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor3;
//璁板綍瀹冪殑鍚嶅瓧
- dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
+ dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();
}
//閫夋嫨鐘舵��
nowContr.BorderColor = 0xfffb744a;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index f023899..223988d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -55,11 +55,18 @@
{
var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac);
//鑾峰彇璁惧鏈�鏂扮増鏈�
- this.deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+ this.deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString(),
oTADevice.ImgVersion);
+ //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,鎴栬�呮槸灞曠ず妯℃澘,鍒欐病鏈夋柊鐗堟湰鐨勮娉�
+ if (Common.Config.Instance.Home.IsVirtually == true
+ || Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ this.deviceFirmware = null;
+ }
+
if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)
{
//鎷ユ湁鏂扮増鏈�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
index ec57ceb..3b352d4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -27,7 +27,7 @@
/// <summary>
/// 璁惧澶囨敞鐨勬帶浠�
/// </summary>
- private FrameCaptionInputControl btnDeviceName = null;
+ private FrameCaptionInputControl frameDeviceName = null;
/// <summary>
/// 璁惧鐨勬煇涓�鍥炶矾
/// </summary>
@@ -103,7 +103,7 @@
btnFinish.ButtonClickEvent += (sender, e) =>
{
//璁板綍璧峰綋鍓嶆鍦ㄦ搷浣滅殑鍥炶矾鍚嶅瓧
- dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
+ dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();
foreach (var epoint in dicDeviceSaveName.Keys)
{
var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
@@ -127,6 +127,11 @@
//鍏抽棴鑷韩
this.CloseForm();
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFinish.CanClick = false;
+ }
}
/// <summary>
@@ -144,31 +149,36 @@
nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];
}
- this.btnDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
- listview.AddChidren(btnDeviceName);
- btnDeviceName.InitControl();
- btnDeviceName.AddBottomLine();
- btnDeviceName.txtInput.FinishInputEvent += () =>
+ this.frameDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
+ this.frameDeviceName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
+ listview.AddChidren(frameDeviceName);
+ frameDeviceName.InitControl();
+ frameDeviceName.AddBottomLine();
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欓渶瑕佸鐞�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
- if (btnDeviceName.Text.Trim() == string.Empty)
+ frameDeviceName.txtInput.FinishInputEvent += () =>
{
- //灏嗗悕瀛楄繕鍘�
- btnDeviceName.Text = oldName;
- }
- if (oldName != btnDeviceName.Text.Trim())
- {
- //璁惧鍚嶇О淇敼
- var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
- if (result == false)
+ string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
+ if (frameDeviceName.Text.Trim() == string.Empty)
{
- return;
+ //灏嗗悕瀛楄繕鍘�
+ frameDeviceName.Text = oldName;
}
- //鍥炶矾澶囨敞淇敼鎴愬姛!
- string msg = Language.StringByID(R.MyInternationalizationString.uDeviceEpointReNoteSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
- }
- };
+ if (oldName != frameDeviceName.Text.Trim())
+ {
+ //璁惧鍚嶇О淇敼
+ var result = Common.LocalDevice.Current.ReName(nowSelectDevice, frameDeviceName.Text.Trim());
+ if (result == false)
+ {
+ return;
+ }
+ //鍥炶矾澶囨敞淇敼鎴愬姛!
+ string msg = Language.StringByID(R.MyInternationalizationString.uDeviceEpointReNoteSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
+ };
+ }
//鎵�灞炲尯鍩�
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
@@ -198,7 +208,8 @@
private void InitTopRightMenu()
{
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
+ || Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
@@ -503,7 +514,7 @@
nowSelectControl.TextSize = 13;
nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor3;
//璁板綍瀹冪殑鍚嶅瓧
- dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
+ dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();
}
//閫夋嫨鐘舵��
nowContr.BorderColor = 0xfffb744a;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
index b63e4ef..335fd9b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
@@ -59,7 +59,7 @@
}
//鑾峰彇鍘嗗彶鐗堟湰
- var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice,
+ var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString());
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index db9912d..bc0a6b3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -309,7 +309,7 @@
return;
}
var listMacDevice = LocalDevice.Current.GetDevicesByMac(deviceMac, false);
- if (LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)
+ if (listMacDevice.Count > 0 && LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)
{
//mini澶滅伅鐨勫姛鑳借缃晫闈�
var room = HdlRoomLogic.Current.GetRoomByDevice(listMacDevice[0]);
@@ -979,10 +979,10 @@
return;
}
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
- var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+ var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
ota.HwVersion.ToString(),
ota.ImgTypeId.ToString(),
ota.ImgVersion);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
old mode 100644
new mode 100755
index e575691..402b3a6
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -36,19 +36,19 @@
/// </summary>
private NormalViewControl btnAirConditionerVersion = null;
/// <summary>
- /// 绠�绾﹂潰鏉跨粦瀹氱殑娓╁害鐩爣鍚嶅瓧
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾鐨勬俯搴︾洰鏍囧悕瀛�
/// </summary>
private string bindTemperatureName = string.Empty;
/// <summary>
- /// 绠�绾﹂潰鏉跨粦瀹氱殑婀垮害鐩爣鍚嶅瓧
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾鐨勬箍搴︾洰鏍囧悕瀛�
/// </summary>
private string bindHumidityName = string.Empty;
/// <summary>
- /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸娓╁害
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾琚粦鐩爣鏄俯搴�
/// </summary>
private CommonDevice bindTemperatureDev;
/// <summary>
- /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸婀垮害
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾琚粦鐩爣鏄箍搴�
/// </summary>
private CommonDevice bindHumidityDev;
/// <summary>
@@ -56,10 +56,13 @@
/// </summary>
private string deviceMacTemp = string.Empty;
// <summary>
- /// 绠�绾﹂潰鏉夸腑琚粦瀹氱殑娓╂箍搴︾洰鏍囧垪琛�
+ /// 绠�绾﹀鍔熻兘闈㈡澘涓缁戝畾鐨勬俯婀垮害鐩爣鍒楄〃
/// </summary>
private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
- #endregion
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘鐨勬帴杩戞劅搴旀暟鎹�
+ private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
+ #endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -107,7 +110,7 @@
var key = new ZigBee.Device.Panel();
key.DeviceAddr = deviceMac;
key.CurrentGateWayId = dev.CurrentGateWayId;
- InitBindInfo(key);
+ InitBindInfo(key);
}
}
}
@@ -139,6 +142,7 @@
string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+ btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
btnNote.InitControl();
//鍒掔嚎
@@ -152,6 +156,11 @@
}
if (oldName != btnNote.Text)
{
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
//淇敼鍚嶅瓧
this.DeviceReName(btnNote.Text, false);
}
@@ -173,6 +182,11 @@
rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
//搴曠嚎
rowBeloneArea.AddBottomLine();
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowBeloneArea.CanClick = false;
+ }
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
@@ -245,8 +259,8 @@
this.CloseForm();
}
};
- //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹呯殑璇�,璁╂墍鏈夎彍鍗曢兘涓嶈兘鐐瑰嚮
- if (Common.Config.Instance.Home.IsVirtually == true)
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
{
for (int i = 0; i < listview.ChildrenCount; i++)
{
@@ -289,11 +303,13 @@
}
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
- //绠�绾﹀鍔熻兘闈㈡澘
+ //绠�绾﹀鍔熻兘闈㈡澘
this.AddIBindRow(deviceMacTemp);
- this.AddFunctionSettionRow();
+ this.AddProximitySensorsRow(deviceMacTemp);
+ this.AddFunctionSettionRow();
this.AddHumiditySourceRow(deviceMacTemp);
this.AddTemperatureSensorRow(deviceMacTemp);
+ this.DataCorrectionRow(deviceMacTemp);
}
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
{
@@ -943,10 +959,17 @@
btnSwitch.IsSelected = statu;
}
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+ return;
+ }
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- btnSwitch.IsSelected = ModelData.DeviceModelDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+ btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
return;
}
@@ -1010,7 +1033,7 @@
}
#endregion
- #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
+ #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
/// <summary>
/// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
/// </summary>
@@ -1026,12 +1049,88 @@
btnBindTargets.AddBottomLine();
btnBindTargets.ButtonClickEvent += (sender, e) =>
{
- var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- simpleMutilfunctionTargetsPage.Show();
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
+ if (dev != null)
+ {
+ var curControlDev = dev as Panel;
+ var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ simpleMutilfunctionTargetsPage.Show();
+ }
};
}
+
+ #region 鈻� 鎺ヨ繎鎰熷簲___________________________
+
+ /// <summary>
+ /// 鎺ヨ繎鎰熷簲琛�
+ /// </summary>
+ private void AddProximitySensorsRow(string deviceMac)
+ {
+ string proximity = Language.StringByID(R.MyInternationalizationString.ProximitySensors);
+ var proximitySensors = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(proximitySensors);
+ proximitySensors.AddLeftCaption(proximity, 400);
+
+ //鎺ヨ繎鎰熷簲
+ proximitySensors.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
+ //寮�鍏虫帶浠�
+ var btnSwitch = proximitySensors.AddMostRightSwitchIcon();
+ //搴曠嚎
+ proximitySensors.AddBottomLine();
+
+ btnSwitch.ButtonClickEvent +=async (sender, e) =>
+ {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ proximitySensorsInfo.enable = btnSwitch.IsSelected;
+
+ //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+ if (dev != null)
+ {
+ var key = new ZigBee.Device.Panel();
+ key.DeviceAddr = deviceMac;
+ key.CurrentGateWayId = dev.CurrentGateWayId;
+ SetProximitySensor(key);
+ }
+ };
+ if (proximitySensorsInfo.enable == true)
+ {
+ btnSwitch.IsSelected = true;
+ }
+ }
+ #endregion
+
+ #region 鈻� 鏁版嵁鐭_________________________
+ /// <summary>
+ /// 鏁版嵁鐭琛�
+ /// </summary>
+ private void DataCorrectionRow(string deviceMac)
+ {
+ //鏁版嵁鐭
+ var rowLight = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowLight);
+ rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.DataCorrection), 600);
+ //搴曠嚎
+ rowLight.AddBottomLine();
+ //鍙崇澶�
+ rowLight.AddRightArrow();
+ rowLight.ButtonClickEvent += (sender, e) =>
+ {
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var device = new CommonDevice();
+ if (dev != null)
+ {
+ device.CurrentGateWayId = dev.CurrentGateWayId;
+ }
+ device.DeviceAddr = deviceMac;
+ device.DeviceEpoint = 65;
+ var form = new Shared.Phone.UserCenter.DevicePanel.DataCorrectionForm();
+ form.AddForm(device);
+ };
+ }
+ #endregion
/// <summary>
/// 婀垮害鏉ユ簮琛�
@@ -1063,7 +1162,7 @@
}
device.Type = DeviceType.OnOffSwitch;
device.DeviceAddr = deviceMac;
- device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾
+ device.DeviceEpoint = 1;//鑳界粦瀹氭箍搴︾殑鍥炶矾
var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1114,7 +1213,7 @@
}
device.Type = DeviceType.OnOffSwitch;
device.DeviceAddr = deviceMac;
- device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾
+ device.DeviceEpoint = 1;//鑳界粦瀹氭俯搴︾殑鍥炶矾
var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1137,7 +1236,7 @@
}
/// <summary>
- ///璇绘俯婀垮害鏁版嵁
+ ///鍒濆鍖栨暟鎹�
/// </summary>
void InitBindInfo(CommonDevice curControlDev)
{
@@ -1149,8 +1248,8 @@
{
CommonPage.Loading.Start("");
});
- //1銆佽幏鍘荤粦瀹氱殑娓╁害浼犳劅鍣�
- curControlDev.DeviceEpoint = 64;
+ //璇绘俯婀垮害鏁版嵁
+ curControlDev.DeviceEpoint = 1;
var result = await GetBindName(curControlDev);
if (!result)
{
@@ -1160,17 +1259,16 @@
});
return;
}
-
- //2銆佽幏鍘荤粦瀹氱殑婀垮害搴︿紶鎰熷櫒
- curControlDev.DeviceEpoint = 65;
- var result2 = await GetBindName(curControlDev);
- if (!result2)
+
+ //2銆佽幏璁惧鎺ヨ繎鎰熷簲鍒濆鏁版嵁
+ //鎺ヨ繎鎰熷簲(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+ proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev);
+ if (proximitySensorsInfo == null)
{
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- return;
+ proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return ;
}
}
catch (Exception ex)
@@ -1181,6 +1279,8 @@
{
Application.RunOnMainThread(() =>
{
+ //鍒濆鍖栧彸涓婅鑿滃崟
+ this.InitTopRightMenu();
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
CommonPage.Loading.Hide();
@@ -1255,6 +1355,43 @@
}
return result;
}
+
+ #region 鈻� 璁剧疆鏁版嵁___________________________
+
+ /// <summary>
+ /// 璁剧疆闈㈡澘鎺ヨ繎鎰熷簲鏁版嵁
+ /// </summary>
+ private void SetProximitySensor(CommonDevice curControlDev)
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Start("");
+ });
+ //鎺ヨ繎鎰熷簲(鎻愪緵璁惧鐨勫悓浜嬭闅忎究涓�涓洖璺氨琛�)
+ var result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(curControlDev, proximitySensorsInfo.enable);
+ if (result == false)
+ {
+ return;
+ }
+ } catch (Exception ex)
+ {
+ var mess = ex.Message;
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+
+ #endregion
#endregion
#region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________
@@ -1281,6 +1418,11 @@
rowFunction.InitControl();
//搴曠嚎
rowFunction.AddBottomLine();
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowFunction.CanClick = false;
+ }
}
#endregion
@@ -1327,7 +1469,11 @@
listview.AddChidren(rowVersion);
rowVersion.AddLeftCaption(caption, 600);
//鐗堟湰
- this.btnAirConditionerVersion = rowVersion.AddMostRightView(((AC)this.listNewDevice[0]).AcModelVersion, 800);
+ this.btnAirConditionerVersion = rowVersion.AddMostRightView(string.Empty, 900);
+ if (this.listNewDevice[0] is AC)
+ {
+ this.btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;
+ }
//搴曠嚎
rowVersion.AddBottomLine();
@@ -1387,7 +1533,8 @@
};
//濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
- if (Common.Config.Instance.Home.IsVirtually == false)
+ if (Config.Instance.Home.IsVirtually == false
+ && Config.Instance.Home.IsShowTemplate == false)
{
//璁剧疆璁惧鐨勭増鏈俊鎭�
this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
@@ -1405,10 +1552,22 @@
{
bool receiveImageInfo = false;
//璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
- HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) =>
+ string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
- receiveImageInfo = true;
+ if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
+ {
+ string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
+ if (checkKey == mainKey)
+ {
+ //宸茬粡鎺ユ敹寰楀埌
+ receiveImageInfo = true;
+ }
+ }
});
+ //鍙戦�佸懡浠�
+ HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
+
int count = 5;
while (receiveImageInfo == false && count > 0)
{
@@ -1417,14 +1576,14 @@
count--;
}
//绉婚櫎浜嬩欢
- HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
- var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+ var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString(),
oTADevice.ImgVersion);
@@ -1481,6 +1640,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -1616,8 +1780,7 @@
public override void CloseFormBefore()
{
HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
- //绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋�
- HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
//璁惧鏂板叆缃�
if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
@@ -1637,21 +1800,13 @@
/// </summary>
private void RefreshHardFirmwareInfo()
{
- if (listNewDevice[0].DriveCode > 0)
+ if (listNewDevice[0].DriveCode > 0 || Common.Config.Instance.Home.IsShowTemplate == true)
{
//铏氭嫙璁惧娌℃湁杩欑鎿嶄綔
return;
}
//閲嶆柊鑾峰彇纭欢淇℃伅
- HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0], (device, reportData) =>
- {
- for (int i = 1; i < listNewDevice.Count; i++)
- {
- //鍏ㄩ儴鍥炶矾鐨勪俊鎭兘鏄竴鑷寸殑
- HdlDeviceHardInfoLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, listNewDevice[i]);
- listNewDevice[i].ReSave();
- }
- });
+ HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
}
#endregion
@@ -1688,7 +1843,11 @@
return;
}
- bool notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;
+ bool notVersion = true;
+ if (this.listNewDevice[0] is AC)
+ {
+ notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;
+ }
if (notVersion == true)
{
//鑾峰彇涓�
@@ -1699,21 +1858,26 @@
//璇诲彇绌鸿皟妯″潡鐗堟湰
var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);
if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)
- {
- if (notVersion == true)
- {
- //鑾峰彇澶辫触
- HdlThreadLogic.Current.RunMain(() =>
- {
- btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
- });
+ {
+ if (notVersion == true)
+ {
+ //鑾峰彇澶辫触
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
+ });
}
return;
}
HdlThreadLogic.Current.RunMain(() =>
{
- ((AC)this.listNewDevice[0]).AcModelVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
- btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;
+ string strVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
+ if (this.listNewDevice[0] is AC)
+ {
+ ((AC)this.listNewDevice[0]).AcModelVersion = strVersion;
+ this.listNewDevice[0].ReSave();
+ }
+ btnAirConditionerVersion.Text = strVersion;
});
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index acfd8f6..e29dbd2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -237,9 +237,12 @@
//璁剧疆璁惧鍔熻兘绫诲瀷 (涓嶈兘鍦ㄦ帴鏀跺洖璺殑鍦版柟鍐欏叆,涓嶇劧缃戝叧鍙兘浼氳秴璐熻嵎)
Common.LocalDevice.Current.RefreshDeviceFunctionType(device, device, true);
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(200);
//鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
- HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
+ if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
+ {
+ System.Threading.Thread.Sleep(200);
+ }
}
//鐩墠灏卞紕涓�涓�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
index 30231b7..29a8dfa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
@@ -61,7 +61,7 @@
//鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑�
//杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄
//鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
- string[] msgArry = Language.StringByID(R.MyInternationalizationString.AddFreshAirPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddFangyueEnvironmentPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
msg1.Y = Application.GetRealHeight(1037);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
index d0abc06..a3e829a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
@@ -21,6 +21,14 @@
/// 鏍℃婀垮害鍊�
/// </summary>
double correctHValue = 0;
+ /// <summary>
+ /// 鏈夋晥鏂囨湰
+ /// </summary>
+ private string invalidText1 = "";
+ /// <summary>
+ /// 鏈夋晥鏂囨湰
+ /// </summary>
+ private string invalidText2 = "";
#endregion
#region 鈻� 鍒濆鍖朹___________________________
@@ -179,35 +187,66 @@
correctHValue = curV;
}
}
+ if (curIndex == 0)
+ {
+ invalidText1 = btnNum.Text;
+ }
+ else
+ {
+ invalidText2 = btnNum.Text;
+ }
+
};
btnReduction.MouseDownEventHandler += async (sender, e) =>
{
- double vTemp = double.Parse(btnNum.Text);
- vTemp -= 0.1;
- btnNum.Text = vTemp.ToString();
+ if(!string.IsNullOrEmpty(btnNum.Text))
+ {
+ double vTemp = double.Parse(btnNum.Text);
+ vTemp -= 0.1;
+ btnNum.Text = vTemp.ToString();
+ if (curIndex == 0)
+ {
+ correctTValue = double.Parse(btnNum.Text);
+ }
+ else
+ {
+ correctHValue = double.Parse(btnNum.Text);
+ }
+ }
if (curIndex == 0)
- {
- correctTValue = double.Parse(btnNum.Text);
+ {
+ invalidText1 = btnNum.Text;
}
else
- {
- correctHValue = double.Parse(btnNum.Text);
- }
+ {
+ invalidText2 = btnNum.Text;
+ }
};
btnAdd.MouseDownEventHandler += async (sender, e) =>
{
- double vTemp = double.Parse(btnNum.Text);
- vTemp += 0.1;
- btnNum.Text = vTemp.ToString();
+ if (!string.IsNullOrEmpty(btnNum.Text))
+ {
+ double vTemp = double.Parse(btnNum.Text);
+ vTemp += 0.1;
+ btnNum.Text = vTemp.ToString();
+ if (curIndex == 0)
+ {
+ correctTValue = double.Parse(btnNum.Text);
+ }
+ else
+ {
+ correctHValue = double.Parse(btnNum.Text);
+ }
+ }
if (curIndex == 0)
- {
- correctTValue = double.Parse(btnNum.Text);
+ {
+ invalidText1 = btnNum.Text;
}
else
- {
- correctHValue = double.Parse(btnNum.Text);
+ {
+ invalidText2 = btnNum.Text;
}
};
}
@@ -281,6 +320,22 @@
{
try
{
+ if (string.IsNullOrEmpty(invalidText1) )
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.TNumTip), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
+ if ( string.IsNullOrEmpty(invalidText2))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.HNumTip), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Start();
@@ -340,8 +395,6 @@
catch { }
});
}
- #endregion
-
-
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index b0bccec..6a47662 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -92,6 +92,11 @@
//淇濆瓨闈㈡澘鏁版嵁
this.SavePanelData();
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSave.CanClick = false;
+ }
});
}
@@ -201,6 +206,12 @@
btnProgressView1.Visible = true;
btnProgress1.Visible = true;
+ }
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ seekBar1.Enable = false;
}
}
@@ -344,6 +355,12 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ frameColor.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -486,6 +503,12 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ frameColor.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index fb3e925..1f40a4c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -126,6 +126,11 @@
//鍏抽棴鑷韩
this.CloseForm();
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFinish.CanClick = false;
+ }
}
/// <summary>
@@ -147,27 +152,31 @@
listview.AddChidren(btnDeviceName);
btnDeviceName.InitControl();
btnDeviceName.AddBottomLine();
- btnDeviceName.txtInput.FinishInputEvent += () =>
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
- if (btnDeviceName.Text.Trim() == string.Empty)
+ btnDeviceName.txtInput.FinishInputEvent += () =>
{
- //灏嗗悕瀛楄繕鍘�
- btnDeviceName.Text = oldName;
- }
- if (oldName != btnDeviceName.Text.Trim())
- {
- //璁惧鍚嶇О淇敼
- var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
- if (result == false)
+ string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
+ if (btnDeviceName.Text.Trim() == string.Empty)
{
- return;
+ //灏嗗悕瀛楄繕鍘�
+ btnDeviceName.Text = oldName;
}
- //鎸夐敭澶囨敞淇敼鎴愬姛!
- string msg = Language.StringByID(R.MyInternationalizationString.uPanelButtonReNoteSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
- }
- };
+ if (oldName != btnDeviceName.Text.Trim())
+ {
+ //璁惧鍚嶇О淇敼
+ var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
+ if (result == false)
+ {
+ return;
+ }
+ //鎸夐敭澶囨敞淇敼鎴愬姛!
+ string msg = Language.StringByID(R.MyInternationalizationString.uPanelButtonReNoteSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
+ };
+ }
//鎵�灞炲尯鍩�
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
@@ -202,7 +211,8 @@
private void InitTopRightMenu()
{
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
+ || Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
@@ -373,6 +383,11 @@
btnSwitch.CanClick = true;
});
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ }
if (hadReadVibrationInfo == true)
{
//涓嶅啀璇诲彇
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index 2b149e4..b355398 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -113,6 +113,11 @@
//鍏抽棴鑷韩
this.CloseForm();
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFinish.CanClick = false;
+ }
}
/// <summary>
@@ -134,27 +139,31 @@
listview.AddChidren(btnDeviceName);
btnDeviceName.InitControl();
btnDeviceName.AddBottomLine();
- btnDeviceName.txtInput.FinishInputEvent += () =>
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
- if (btnDeviceName.Text.Trim() == string.Empty)
+ btnDeviceName.txtInput.FinishInputEvent += () =>
{
- //灏嗗悕瀛楄繕鍘�
- btnDeviceName.Text = oldName;
- }
- if (oldName != btnDeviceName.Text.Trim())
- {
- //璁惧鍚嶇О淇敼
- var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
- if (result == false)
+ string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
+ if (btnDeviceName.Text.Trim() == string.Empty)
{
- return;
+ //灏嗗悕瀛楄繕鍘�
+ btnDeviceName.Text = oldName;
}
- //鍥炶矾澶囨敞淇敼鎴愬姛!
- string msg = Language.StringByID(R.MyInternationalizationString.uDeviceEpointReNoteSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
- }
- };
+ if (oldName != btnDeviceName.Text.Trim())
+ {
+ //璁惧鍚嶇О淇敼
+ var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
+ if (result == false)
+ {
+ return;
+ }
+ //鍥炶矾澶囨敞淇敼鎴愬姛!
+ string msg = Language.StringByID(R.MyInternationalizationString.uDeviceEpointReNoteSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
+ };
+ }
//鎵�灞炲尯鍩�
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
@@ -184,7 +193,8 @@
private void InitTopRightMenu()
{
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
+ || Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
index 8dae4d2..efbd993 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
@@ -170,7 +170,7 @@
this.AddTemperatureSensorRow();
//娣诲姞婀垮害鏉ユ簮
this.AddHumiditySourceRow();
- //浜害璋冭妭
+ //鏁版嵁鐭
this.DataCorrectionRow();
//浜害璋冭妭
this.AddLevelRow();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
index 7b10608..a308a49 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
@@ -14,17 +14,10 @@
/// </summary>
/// <param name="device"></param>
/// <param name="deviceBindType">0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
- public PanelSimpleMutilfunctionAddTargetsForm(string deviceMac, int deviceBindType)
+ public PanelSimpleMutilfunctionAddTargetsForm(Panel controlDev, int deviceBindType)
{
- curControlDev = new Panel();
- var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
- if (dev != null)
- {
- curControlDev.CurrentGateWayId = dev.CurrentGateWayId;
- }
- curControlDev.Type = DeviceType.OnOffSwitch;
- curControlDev.DeviceAddr = deviceMac;
- curBindType = deviceBindType;
+ this.curControlDev = controlDev;
+ this.curBindType = deviceBindType;
}
#endregion
@@ -146,6 +139,11 @@
//棣栨鍒濆鍖栨暟鎹�
CommonPage.Loading.Start("");
InitData();
+
+ //澶囨敞寮圭獥鎻愮ず
+ string msg = Language.StringByID(R.MyInternationalizationString.BindRemarkTip1).Replace("{0}", "\r\n");
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.Iknown));
+ alert.Show();
}
/// <summary>
@@ -607,6 +605,13 @@
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
+ //鐩爣澶囨敞澶勭悊
+ var localName = System.Text.Encoding.UTF8.GetBytes(Common.LocalDevice.Current.GetDeviceEpointName(device));
+ if (localName.Length > 20)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindRemarkTip2), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ return;
+ }
btnChoose.IsSelected = !btnChoose.IsSelected;
if (curBindType != 6)
{
@@ -838,6 +843,18 @@
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
+
+ //鐩爣澶囨敞澶勭悊
+ if (!string.IsNullOrEmpty(scene.Name))
+ {
+ var localName = System.Text.Encoding.UTF8.GetBytes(scene.Name);
+ if (localName.Length > 20)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindRemarkTip2), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ return;
+ }
+ }
+
btnChoose.IsSelected = !btnChoose.IsSelected;
if (curSupportBindEpointList.Count == 0)
@@ -904,7 +921,7 @@
supportRoomList = BindInfo.GetSupportRoomList();
//鑾峰彇闈㈡澘宸茬粡缁戝畾鐨勫尮閰嶇被鍨嬬殑鍒楄〃
- curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
+ curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curControlDev, curBindType);
if (curBindType == 0)
{
@@ -920,7 +937,7 @@
undistributeDevList = MutilfunctionPanelMethod.GetUndistributeDeviceList(undistributeDevList, curBindTypeList, curBindType);
}
//鑾峰彇褰撳墠鏀寔鐨勭鐐圭粦瀹氳〃
- curSupportBindEpointList = MutilfunctionPanelMethod.GetMatchEpointList(curBindType);
+ curSupportBindEpointList = MutilfunctionPanelMethod.GetMatchEpointList(curControlDev, curBindType);
if (curBindType == 3)
{
foreach (var ep in curSupportBindEpointList)
@@ -1026,22 +1043,20 @@
for (int i = 0; i < targetScList.Count; i++)
{
//缁戝畾鏂扮殑鏁版嵁
- var addBindeDev = new AddBindData();
- addBindeDev.DeviceAddr = curControlDev.DeviceAddr;
+ var addSingleBindData = new AddSingleBindData();
+ addSingleBindData.DeviceAddr = curControlDev.DeviceAddr;
for (int j = 0; j < curSupportBindEpointList.Count; j++)
{
curSendEpointList.Add(curSupportBindEpointList[0]);
- addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportBindEpointList[0];
+ addSingleBindData.Epoint = curControlDev.DeviceEpoint = curSupportBindEpointList[0];
break;
}
var de = targetScList[i];
- var addBindInfo = new AddBindListObj();
- addBindInfo.BindType = 1;
- addBindInfo.BindCluster = 6;
- addBindInfo.BindScenesId = de.Id;
- addBindeDev.BindList.Add(addBindInfo);
+ addSingleBindData.BindType = 1;
+ addSingleBindData.BindClusterList.Add(6);
+ addSingleBindData.BindScenesId = de.Id;
- var resT = AddDeviceBind(addBindeDev, targetSendCount, ref targetRecCount);
+ var resT = AddDeviceBind(addSingleBindData, targetSendCount, ref targetRecCount);
if (!resT)
{
break;
@@ -1070,8 +1085,8 @@
foreach (var de in targetList)
{
//缁戝畾鏂扮殑鏁版嵁
- var addBindeDev = new AddBindData();
- addBindeDev.DeviceAddr = curControlDev.DeviceAddr;
+ var addSingleBindData = new AddSingleBindData();
+ addSingleBindData.DeviceAddr = curControlDev.DeviceAddr;
if (curBindType == 3)
{
@@ -1080,7 +1095,7 @@
for (int j = 0; j < curSupportDimmerEpointList.Count; j++)
{
curSendEpointList.Add(curSupportDimmerEpointList[0]);
- addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportDimmerEpointList[0];
+ addSingleBindData.Epoint = curControlDev.DeviceEpoint = curSupportDimmerEpointList[0];
break;
}
}
@@ -1090,7 +1105,7 @@
for (int j = 0; j < curSupportLightEpointList.Count; j++)
{
curSendEpointList.Add(curSupportLightEpointList[0]);
- addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportLightEpointList[0];
+ addSingleBindData.Epoint = curControlDev.DeviceEpoint = curSupportLightEpointList[0];
break;
}
}
@@ -1100,68 +1115,48 @@
for (int j = 0; j < curSupportBindEpointList.Count; j++)
{
curSendEpointList.Add(curSupportBindEpointList[0]);
- addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportBindEpointList[0];
+ addSingleBindData.Epoint = curControlDev.DeviceEpoint = curSupportBindEpointList[0];
break;
}
}
- var addBindInfo = new AddBindListObj();
- addBindInfo.BindType = 0;
- addBindInfo.BindMacAddr = de.DeviceAddr;
- addBindInfo.BindEpoint = de.DeviceEpoint;
+ addSingleBindData.BindType = 0;
+ addSingleBindData.BindMacAddr = de.DeviceAddr;
+ addSingleBindData.BindEpoint = de.DeviceEpoint;
switch (curBindType)
{
case 0:
- addBindInfo.BindCluster = 6;
- break;
case 1:
- addBindInfo.BindCluster = 6;
- break;
case 2:
- addBindInfo.BindCluster = 6;
+ addSingleBindData.BindClusterList.Add(6);
break;
case 3:
- addBindInfo.BindCluster = 6;
- break;
- case 4:
- addBindInfo.BindCluster = 258;
- break;
- case 5:
- addBindInfo.BindCluster = 513;
- break;
- case 6:
- addBindInfo.BindCluster = 514;
- break;
- }
- addBindeDev.BindList.Add(addBindInfo);
-
- //閮ㄥ垎鐩爣闇�瑕佷簩娆＄粦瀹氱浜岀鍔熻兘
- var addBindInfo2 = new AddBindListObj();
- addBindInfo2.BindType = 0;
- addBindInfo2.BindMacAddr = de.DeviceAddr;
- addBindInfo2.BindEpoint = de.DeviceEpoint;
- switch (curBindType)
- {
- case 3:
+ addSingleBindData.BindClusterList.Add(6);
var device = LocalDevice.Current.GetDevice(de.DeviceAddr, de.DeviceEpoint);
if (device != null)
{
if (device.Type == DeviceType.DimmableLight)
{
//鐏厜涓鸿皟鍏夋椂闇�瑕佺粦瀹�6锛�8
- addBindInfo2.BindCluster = 8;
- addBindeDev.BindList.Add(addBindInfo2);
+ addSingleBindData.BindClusterList.Add(8);
}
}
break;
+ case 4:
+ addSingleBindData.BindClusterList.Add(258);
+ break;
case 5:
//瑕佺粦瀹氱┖璋冿細闇�瑕佺粦瀹�513锛�514
- addBindInfo2.BindCluster = 514;
- addBindeDev.BindList.Add(addBindInfo2);
+ addSingleBindData.BindClusterList.Add(513);
+ addSingleBindData.BindClusterList.Add(514);
+ break;
+ case 6:
+ addSingleBindData.BindClusterList.Add(514);
break;
}
- var resT = AddDeviceBind(addBindeDev, targetSendCount, ref targetRecCount);
+
+ var resT = AddDeviceBind(addSingleBindData, targetSendCount, ref targetRecCount);
if (!resT)
{
break;
@@ -1185,53 +1180,53 @@
/// <summary>
/// AddDeviceBind
/// </summary>
- /// <param name="addBindeDev"></param>
+ /// <param name="addSingleBindData"></param>
/// <param name="targetSendCount"></param>
/// <param name="targetRecCount"></param>
/// <returns></returns>
- private bool AddDeviceBind(AddBindData addBindeDev, int targetSendCount, ref int targetRecCount)
+ private bool AddDeviceBind(AddSingleBindData addSingleBindData, int targetSendCount, ref int targetRecCount)
{
var addSuccess = false;
- var dev = HdlDeviceBindLogic.Current.AddDeviceBindAsync(addBindeDev);
- if (dev != null && dev.addedDeviceBindResponseData != null)
+ var dev = HdlDeviceBindLogic.Current.AddDeviceSingleBindAsync(addSingleBindData);
+ if (dev != null && dev.addedDeviceSingleBindResponseData != null)
{
addSuccess = true;
targetRecCount++;
- if (dev.addedDeviceBindResponseData.Result == 0)
+ if (dev.addedDeviceSingleBindResponseData.Result == 0)
{
var countTotal = targetRecCount;
-
var bList = new List<BindListAllInfo>();
- foreach (var devB in dev.addedDeviceBindResponseData.BindList)
+ foreach (var cluster in dev.addedDeviceSingleBindResponseData.BindClusterList)
{
var curD = new BindListAllInfo();
curD.KeyMacAddr = curControlDev.DeviceAddr;
curD.KeyEpoint = curControlDev.DeviceEpoint;
- curD.BindCluster = devB.BindCluster;
- curD.BindScenesId = devB.BindScenesId;
- curD.BindMacAddr = devB.BindMacAddr;
- curD.BindEpoint = devB.BindEpoint;
- curD.ESName = devB.ESName;
- curD.BindType = devB.BindType;
+ curD.BindCluster = cluster;
+ curD.BindScenesId = dev.addedDeviceSingleBindResponseData.BindScenesId;
+ curD.BindMacAddr = dev.addedDeviceSingleBindResponseData.BindMacAddr;
+ curD.BindEpoint = dev.addedDeviceSingleBindResponseData.BindEpoint;
+ curD.ESName = dev.addedDeviceSingleBindResponseData.ESName;
+ curD.BindType = dev.addedDeviceSingleBindResponseData.BindType;
bList.Add(curD);
}
- if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(curControlDev.DeviceAddr + curControlDev.DeviceEpoint))
+
+ if (curControlDev.bindTargetsFromMutilfunctionPanelList.ContainsKey(curControlDev.DeviceAddr + curControlDev.DeviceEpoint))
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList[curControlDev.DeviceAddr + curControlDev.DeviceEpoint] = bList;
+ curControlDev.bindTargetsFromMutilfunctionPanelList[curControlDev.DeviceAddr + curControlDev.DeviceEpoint] = bList;
}
else
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
}
if (curBindType == 3)
{
- if (addBindeDev.Epoint >= 22 && addBindeDev.Epoint <= 28)
+ if (addSingleBindData.Epoint >= 22 && addSingleBindData.Epoint <= 28)
{
curSupportDimmerEpointList.RemoveAt(0);
}
- if (addBindeDev.Epoint >= 52 && addBindeDev.Epoint <= 61)
+ if (addSingleBindData.Epoint >= 52 && addSingleBindData.Epoint <= 61)
{
curSupportLightEpointList.RemoveAt(0);
}
@@ -1256,7 +1251,7 @@
}
});
}
- else if (dev.addedDeviceBindResponseData.Result == 1)
+ else if (dev.addedDeviceSingleBindResponseData.Result == 1)
{
Application.RunOnMainThread(() =>
{
@@ -1267,7 +1262,7 @@
new Tip()
{
MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5001_1" + ")",
+ Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5020_1" + ")",
Direction = AMPopTipDirection.Up,
CloseTime = 1
}.Show(btnFinifh);
@@ -1284,7 +1279,7 @@
new Tip()
{
MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5001_2" + ")",
+ Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5020_2" + ")",
Direction = AMPopTipDirection.Up,
CloseTime = 1
}.Show(btnFinifh);
@@ -1298,6 +1293,13 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
RefreshRoomList();
+ new Tip()
+ {
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5020" + ")",
+ Direction = AMPopTipDirection.Up,
+ CloseTime = 1
+ }.Show(btnFinifh);
CommonPage.Loading.Hide();
GetEpointData();
});
@@ -1365,17 +1367,17 @@
}
//鏇存柊bindTargetsFromMutilfunctionPanelList
- if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(curControlDev.DeviceAddr + curControlDev.DeviceEpoint))
+ if (curControlDev.bindTargetsFromMutilfunctionPanelList.ContainsKey(curControlDev.DeviceAddr + curControlDev.DeviceEpoint))
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList[curControlDev.DeviceAddr + curControlDev.DeviceEpoint] = bList;
+ curControlDev.bindTargetsFromMutilfunctionPanelList[curControlDev.DeviceAddr + curControlDev.DeviceEpoint] = bList;
}
else
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
}
//鏇存柊褰撳墠鏀寔鐨勭鐐圭粦瀹氳〃
- curSupportBindEpointList = MutilfunctionPanelMethod.GetMatchEpointList(curBindType);
+ curSupportBindEpointList = MutilfunctionPanelMethod.GetMatchEpointList(curControlDev, curBindType);
if (curBindType == 3)
{
foreach (var ep in curSupportBindEpointList)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index aaab4fc..043f611 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -21,16 +21,9 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="deviceMac">绠�绾﹀鍔熻兘闈㈡澘Mac</param>
- public PanelSimpleMutilfunctionTargetsForm(string deviceMac)
+ public PanelSimpleMutilfunctionTargetsForm(Panel controlDev)
{
- curControlDev = new Panel();
- var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
- if (dev != null)
- {
- curControlDev.CurrentGateWayId = dev.CurrentGateWayId;
- }
- curControlDev.Type = DeviceType.OnOffSwitch;
- curControlDev.DeviceAddr = deviceMac;
+ this.curControlDev = controlDev;
}
#endregion
@@ -88,8 +81,6 @@
/// 鐗规畩绫诲瀷鐨勪釜鏁般�愬紑鍏�/鎻掑骇/鐏厜銆戦渶瑕佽绠楁樉绀虹殑涓暟聽
/// </summary>
int specialTypeCount = 0;
-
- private Action bindReceiveAction = null;
/// <summary>
/// 鍥炶皟缁戝畾鐩爣椤甸潰鍒锋柊
/// </summary>
@@ -111,7 +102,7 @@
CommonPage.Loading.Start("");
InitLocalDeviceList();
- if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Count == 0)
+ if (curControlDev.bindTargetsFromMutilfunctionPanelList.Count == 0)
{
IsRead = true;
}
@@ -157,7 +148,7 @@
btnAddFrameLayout.AddChidren(btnBindAdd);
EventHandler<MouseEventArgs> eHandlerAdd = (sender, e) =>
{
- var simpleMutilfunctionBindTargetsForm = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionAddTargetsForm(curControlDev.DeviceAddr, curBindType);
+ var simpleMutilfunctionBindTargetsForm = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionAddTargetsForm(curControlDev, curBindType);
Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionBindTargetsForm);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
simpleMutilfunctionBindTargetsForm.Show();
@@ -374,23 +365,23 @@
void RefreshBindListUI()
{
midVerticalScrolViewLayout.RemoveAll();
- curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
+ curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curControlDev, curBindType);
//娉ㄦ剰锛佸悓涓寜閿鐐瑰鏋滄敮鎸佺粦瀹氬绉嶅姛鑳界被鍨嬶紝闇�瑕佹敞鎰忓涓嬪鐞�
//褰撴洿鎹㈣澶囧姛鑳界被鍨嬪悗
// 缁戝畾鐨勫紑鍏炽�佹彃搴с�佺伅鍏夋墍鐢ㄧ殑鎸夐敭鍥炶矾浜掔浉鍏宠仈锛屾墍浠ヨ繖閲岄噸鏂拌幏鍙栧皢杩欎笁绉嶇被鍨嬬殑鍏朵粬2绉嶏紝涓轰簡鑾峰彇姝ｇ‘鐨勫紑鍏炽�佹彃搴с�佺伅鍏夌粦瀹氱殑涓暟
switch (curBindType)
{
case 1:
- MutilfunctionPanelMethod.GetMatchBindList(2);
- MutilfunctionPanelMethod.GetMatchBindList(3);
+ MutilfunctionPanelMethod.GetMatchBindList(curControlDev, 2);
+ MutilfunctionPanelMethod.GetMatchBindList(curControlDev, 3);
break;
case 2:
- MutilfunctionPanelMethod.GetMatchBindList(1);
- MutilfunctionPanelMethod.GetMatchBindList(3);
+ MutilfunctionPanelMethod.GetMatchBindList(curControlDev, 1);
+ MutilfunctionPanelMethod.GetMatchBindList(curControlDev, 3);
break;
case 3:
- MutilfunctionPanelMethod.GetMatchBindList(1);
- MutilfunctionPanelMethod.GetMatchBindList(2);
+ MutilfunctionPanelMethod.GetMatchBindList(curControlDev, 1);
+ MutilfunctionPanelMethod.GetMatchBindList(curControlDev, 2);
break;
}
int curIndex = 0;
@@ -546,7 +537,7 @@
var btnDel = rowLayout.AddDeleteControl();
btnDel.ButtonClickEvent += (sender, e) =>
{
- RemoveTargets(bindObj, btnDel);
+ ClearTargets(bindObj);
};
#endregion
}
@@ -600,7 +591,7 @@
GetDeviceBindResponseAllData getBindList = null;
if (IsRead)
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Clear();
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Clear();
var epointList = new List<int>();
for (int i = 2; i < 62; i++)
{
@@ -636,7 +627,7 @@
curD.BindType = dev.BindType;
bList.Add(curD);
}
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
oldReadEpoint++;
}
@@ -665,7 +656,7 @@
//鑾峰彇鎵�鏈夌被鍨嬬殑缁戝畾鐩爣涓暟
for (int i = 0; i < 7; i++)
{
- curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(i);
+ curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curControlDev, i);
}
Application.RunOnMainThread(() =>
@@ -706,7 +697,7 @@
/// <param name="bindDevice"></param>
/// <param name="btnDel"></param>
/// <returns></returns>
- private void RemoveTargets(BindListAllInfo bindDevice, Button btnDel)
+ private void RemoveTargets(BindListAllInfo bindDevice)
{
var delDevice = new DelDeviceBindData();
delDevice.DeviceAddr = bindDevice.KeyMacAddr;
@@ -789,9 +780,9 @@
{
if (d.Result == 0 || d.Result == 1)
{
- if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
+ if (curControlDev.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
}
Application.RunOnMainThread(() =>
{
@@ -824,9 +815,9 @@
{
if (delResult.removeBindResultResponseData.Result == 0)
{
- if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
+ if (curControlDev.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
{
- MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
}
Application.RunOnMainThread(() =>
{
@@ -857,7 +848,68 @@
});
}
-
+ /// <summary>
+ /// 娓呴櫎澶氬姛鑳介潰鏉跨殑鐩爣
+ /// </summary>
+ /// <param name="bindDevice"></param>
+ /// <param name="btnDel"></param>
+ /// <returns></returns>
+ private void ClearTargets(BindListAllInfo bindDevice)
+ {
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Start("");
+ });
+ var currentKey = new Panel();
+ currentKey.DeviceAddr = bindDevice.KeyMacAddr;
+ currentKey.DeviceEpoint = bindDevice.KeyEpoint;
+ currentKey.CurrentGateWayId = curControlDev.CurrentGateWayId;
+ var bindResult = HdlDeviceBindLogic.Current.ClearBindInfoAsync(currentKey);
+ if (bindResult != null && bindResult.clearBindInfoResponseData != null)
+ {
+ if (bindResult.clearBindInfoResponseData.Result != 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(CommonPage.Instance);
+ CommonPage.Loading.Hide();
+ });
+ }
+ else
+ {
+ if (curControlDev.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
+ {
+ curControlDev.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ RefreshBindListUI();
+ CommonPage.Loading.Hide();
+ });
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
+ });
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
/// <summary>
/// 鍖归厤鐨勭被鍨嬪垪琛�
@@ -876,148 +928,6 @@
return textTypelist;
}
- #endregion
-
- #region 鍏朵粬鏂规硶
- /// <summary>
- /// 鏄剧ず缁戝畾璁惧绾跨▼鏄惁宸茬粡寮�鍚�
- /// </summary>
- private bool isDeviceThreadStart = false;
- /// <summary>
- /// 涓婚瓒呮椂鐨勭嚎绋嬫槸鍚﹀紑鍚�
- /// </summary>
- private bool isTopicTimeOutThreadStart = false;
- /// <summary>
- /// 绛夊緟璁惧鐨勫洖棣堢殑瓒呮椂鏃堕棿(鍗曚綅锛氱櫨姣)
- /// </summary>
- private int waitDeviceTimeOut = 20;
- /// <summary>
- /// 缃戝叧ID
- /// </summary>
- private string gatewayId = string.Empty;
- /// <summary>
- /// 鎺ユ敹涓暟
- /// </summary>
- private int countBind = 0;
- /// <summary>
- /// 鏂颁笂鎶ョ殑璁惧
- /// </summary>
- private Dictionary<int, GetPanelBindResponseDataByMac> dicPanelResInfo = new Dictionary<int, GetPanelBindResponseDataByMac>();
-
- ///<summary >
- /// 鍙戦�佽幏鍙栭潰鏉垮懡浠閫氳繃DeviceAddr鑾峰彇]
- /// </summary>
- private void SendPanelCommand()
- {
- var jObject = new JObject { { "DeviceAddr", curControlDev.DeviceAddr }, { "Cluster_ID", 0 }, { "Command", 5009 } };
- curControlDev.Gateway.Send(("SearchNewDevice"), jObject.ToString());
- }
-
- /// <summary>
- /// 妫�娴嬭澶囩粦瀹氱殑涓婚
- /// </summary>
- /// <param name="topic"></param>
- /// <param name="resultData"></param>
- /// <returns></returns>
- public bool CheckIsDeviceBindTopic(string topic)
- {
- if (topic == gatewayId + "Bind/GetDeviceLocalBind_Respon")
- {
- return true;
- }
- return false;
- }
-
- /// <summary>
- /// 澶勭悊闈㈡澘缁戝畾鐨勮澶囷紝鍜岀鐐规病鏈夊叧绯�
- /// </summary>
- /// <param name="topic">涓婚</param>
- /// <param name="resultData">涓婃姤鏁版嵁</param>
- private void AdjustGatewayResultData(string topic, string resultData)
- {
-
- //鎺ユ敹缁戝畾璁惧锛屽紑鍚帴鏀剁粦瀹氳澶囦俊鎭殑绾跨▼(閲岄潰浼氱瓑寰呬笁绉掕繖鏍�)
- this.ReceiveSuccessFormThread();
-
- var result = this.CheckIsDeviceBindTopic(topic);
- if (result)
- {
- lock (dicPanelResInfo)
- {
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(resultData);
- var info = Newtonsoft.Json.JsonConvert.DeserializeObject<GetPanelBindResponseDataByMac>(jobject["Data"].ToString());
- countBind = info.MaxNumItems;
- if (info != null)
- {
- foreach (var bDev in info.BindList)
- {
- if (this.dicPanelResInfo.ContainsKey(bDev.ControllerEpoint) == false)
- {
- this.dicPanelResInfo[bDev.ControllerEpoint] = info;
- }
- }
- }
-
- if (this.dicPanelResInfo.Count == countBind)
- {
- //鍋滄鎺ユ敹
- curControlDev.Gateway.GwResDataAction -= this.AdjustGatewayResultData;
- //鍒锋柊瓒呮椂鏃堕棿
- this.waitDeviceTimeOut = -1;
- }
- else
- {
- //鍒锋柊瓒呮椂鏃堕棿
- this.waitDeviceTimeOut = 20;
- }
- }
- }
- }
-
- /// <summary>
- /// 寮�鍚帴鏀剁粦瀹氳澶囩殑瓒呮椂绾跨▼
- /// </summary>
- private void ReceiveSuccessFormThread()
- {
- if (this.isDeviceThreadStart == true)
- {
- //绾跨▼宸茬粡寮�鍚�
- return;
- }
- this.isDeviceThreadStart = true;
-
- HdlThreadLogic.Current.RunThread(() =>
- {
- System.Console.WriteLine($"1AAAAA");
- while (this.waitDeviceTimeOut >= 0)
- {
- //绛夊緟涓嬩竴涓洖璺�
- System.Threading.Thread.Sleep(100);
- this.waitDeviceTimeOut--;
- System.Console.WriteLine($"2AAAAA");
- }
- System.Console.WriteLine($"3AAAAA");
- //鍋滄鎺ユ敹
- bindReceiveAction.Invoke();
- curControlDev.Gateway.GwResDataAction -= this.AdjustGatewayResultData;
- System.Console.WriteLine($"4AAAAA");
- System.Threading.Thread.Sleep(200);
- System.Console.WriteLine($"5AAAAA");
-
- //鐩墠灏卞紕涓�涓�
- Application.RunOnMainThread(() =>
- {
- if (this.dicPanelResInfo.Count < countBind)
- {
- //鍝嶅簲瓒呮椂,璇烽噸鏂颁笅鎷夊埛鏂拌幏鍙栫粦瀹氫俊鎭�
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.uResponseTimeoutsAndReAccessNetwork), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- //鍋滄鎺ユ敹
- curControlDev.Gateway.GwResDataAction -= this.AdjustGatewayResultData;
- }
- System.Console.WriteLine($"6AAAAA");
- });
- });
- }
#endregion
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 55dbad5..61e4bf4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
@@ -102,6 +102,11 @@
var btnLux = frameNowLinght.AddLeftCaption(txtValue + "锛�" + pirLuxValue + "lux", 900);
HdlThreadLogic.Current.RunThread(async () =>
{
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
while (this.Parent != null)
{
//浠栦滑璇磋繖涓笢瑗胯2绉掑埛鏂颁竴娆� 鑾峰彇PIR浼犳劅鍣ㄧ殑銆恖ux鍊笺��
@@ -233,6 +238,14 @@
this.pirConfigure.levelSize = seekBar.Progress;
btnLightValue.Text = this.pirConfigure.levelSize.ToString() + "lux";
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ seekBar.Enable = false;
+ btnMinus.CanClick = false;
+ btnPlus.CanClick = false;
+ }
//鏆�
var btnDark = new NormalViewControl(120, 50, true);
@@ -388,8 +401,12 @@
{
this.ShowDelayListTime(btnDelayView);
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowDelay.CanClick = false;
+ }
}
-
//淇濆瓨
var btnSave = new BottomClickButton();
btnSave.TextID = R.MyInternationalizationString.uSave;
@@ -402,6 +419,11 @@
this.SavePirSensorData();
});
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSave.CanClick = false;
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
index 068bec2..3bf2b16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
@@ -123,6 +123,11 @@
//鐣岄潰鍏抽棴
this.CloseForm();
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnOk.CanClick = false;
+ }
}
else
{
@@ -288,6 +293,11 @@
listEsixtDevice.Remove(mainKey);
}
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowDevice.CanClick = false;
+ }
}
listDevice = null;
//璋冩暣鎺т欢鐪熷疄楂樺害
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
index 70d9c84..428221f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
@@ -103,6 +103,11 @@
this.SavePirSensorData();
});
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSave.CanClick = false;
+ }
}
#endregion
@@ -141,6 +146,11 @@
this.pirConfigure.mode = value == 0 ? 1 : 0;
};
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ row1.CanClick = false;
+ }
}
#endregion
@@ -185,6 +195,11 @@
}
};
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ row2.CanClick = false;
+ }
}
#endregion
@@ -227,6 +242,11 @@
Language.StringByID(R.MyInternationalizationString.uFinish),
Language.StringByID(R.MyInternationalizationString.uCancel));
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ row3.CanClick = false;
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
new file mode 100755
index 0000000..4688951
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
@@ -0,0 +1,495 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.DeviceRelay
+{
+ /// <summary>
+ /// 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡,娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 鐨勮儗鍏夌伅璁剧疆
+ /// </summary>
+ public class RelayNationalBackLightSettionForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 浜害璋冭妭鐨勪俊鎭�
+ /// </summary>
+ private Panel.PanelSwitchLevelInfo linghtLevelInfo = null;
+ /// <summary>
+ /// 鑺傝兘妯″紡
+ /// </summary>
+ private Panel.PanelSaveEnergyModeInfo energyModeInfo = null;
+ /// <summary>
+ /// 璁惧鍒楄〃
+ /// </summary>
+ private List<CommonDevice> listDevice = null;
+ /// <summary>
+ /// 鏁版嵁鏄惁鍙樻洿
+ /// </summary>
+ private bool valueChanged = false;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm(string i_deviceMac)
+ {
+ this.ScrollEnabled = false;
+
+ this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //鑾峰彇璁惧鍒濆鏁版嵁
+ var result = this.GetDeviceDefultData();
+ if (result == false)
+ {
+ return;
+ }
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鐐瑰嚮鐘舵��
+ var btnClickStatu = new NormalViewControl(600, 49, true);
+ btnClickStatu.X = ControlCommonResourse.XXLeft;
+ btnClickStatu.Y = Application.GetRealHeight(207);
+ btnClickStatu.TextSize = 12;
+ btnClickStatu.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnClickStatu.TextID = R.MyInternationalizationString.uClickStatu;
+ bodyFrameLayout.AddChidren(btnClickStatu);
+
+ //鍚勭鑳屽厜鐏殑瀹瑰櫒
+ var frameLinght = new FrameLayout();
+ frameLinght.Height = Application.GetRealHeight(748);
+ frameLinght.Y = Application.GetRealHeight(279);
+ frameLinght.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameLinght);
+
+ //娣诲姞1-6骞叉帴鐐圭殑鑳屽厜鐏繘搴︽潯
+ this.AddSixDryContactProgress(frameLinght);
+ //绗竷骞叉帴鐐圭殑鑳屽厜鐏繘搴︽潯
+ this.AddSevenDryContactProgress(frameLinght);
+ //娣诲姞鑺傝兘妯″紡
+ this.AddEnergyConservationRow(btnClickStatu, frameLinght);
+
+ //淇濆瓨
+ var btnSave = new BottomClickButton();
+ btnSave.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnSave);
+ btnSave.ButtonClickEvent += (sender, e) =>
+ {
+ if (valueChanged == true)
+ {
+ this.ShowProgressBar();
+ //浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
+ result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+ if (result == false)
+ {
+ this.CloseProgressBar();
+ return;
+ }
+ //鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
+ result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ }
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鑺傝兘妯″紡琛宊________________________
+
+ /// <summary>
+ /// 娣诲姞鑺傝兘妯″紡琛�
+ /// </summary>
+ /// <param name="btnClickStatu">鐐瑰嚮鐘舵�佹帶浠�(鎺т欢浼哥缉浣跨敤)</param>
+ /// <param name="frameLinght">鍚勭鑳屽厜鐏殑瀹瑰櫒(鎺т欢浼哥缉浣跨敤)</param>
+ private void AddEnergyConservationRow(NormalViewControl btnClickStatu, FrameLayout frameLinght)
+ {
+ //缂╁皬:170 鎵╁ぇ:429+RowHeight+23
+ var frameBack = new FrameRowControl();
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ frameBack.UseClickStatu = false;
+ frameBack.Height = Application.GetRealHeight(170);
+ bodyFrameLayout.AddChidren(frameBack);
+
+ //褰撳墠浜害(鍏堝０鏄�,涓轰簡瀵瑰簲IOS鐨勬姌鍙犲悗,娌℃湁瀹屽叏閬尅鐨勯棶棰�)
+ var btnProgressView1 = new NormalViewControl(200, 49, true);
+ var btnProgress1 = new NormalViewControl(200, 49, true);
+
+ //鑺傝兘妯″紡
+ frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
+ //寮�鍏虫帶浠�
+ var btnSwitch = frameBack.AddMostRightSwitchIcon();
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ energyModeInfo.enable = btnSwitch.IsSelected;
+ //灞曞紑鎴栬�呯缉灏忕殑楂樺害
+ var value = Application.GetRealHeight(259 + 23) + ControlCommonResourse.ListViewRowHeight;
+ if (btnSwitch.IsSelected == true)
+ {
+ frameBack.Height += value;
+ btnClickStatu.Y += value;
+ frameLinght.Y += value;
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
+ }
+ else
+ {
+ frameBack.Height -= value;
+ btnClickStatu.Y -= value;
+ frameLinght.Y -= value;
+ btnProgressView1.Visible = false;
+ btnProgress1.Visible = false;
+ }
+ //鏁版嵁鍙樻洿
+ valueChanged = true;
+ };
+ if (energyModeInfo.enable == true)
+ {
+ btnSwitch.IsSelected = true;
+ }
+
+ //褰撳墠浜害
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.Y = Application.GetRealHeight(161);
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+ frameBack.AddChidren(btnProgressView1);
+ btnProgressView1.Visible = false;
+ btnProgress1.X = Application.GetRealWidth(222);
+ btnProgress1.Y = Application.GetRealHeight(158);
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = energyModeInfo.level + "%";
+ frameBack.AddChidren(btnProgress1);
+ btnProgress1.Visible = false;
+
+ //杩涘害鏉�
+ var seekBar1 = new SeekBarControl();
+ seekBar1.Y = Application.GetRealHeight(253);
+ seekBar1.ProgressBarColor = 0xff3e99f4;
+ frameBack.AddChidren(seekBar1);
+ seekBar1.ProgressChangedEvent += (div, value) =>
+ {
+ btnProgress1.Text = value + "%";
+ //鏁版嵁鍙樻洿
+ energyModeInfo.level = value;
+ valueChanged = true;
+ };
+ seekBar1.Progress = energyModeInfo.level;
+
+ var btnTemp1 = new NormalViewControl(200, 49, true);
+ btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.Y = Application.GetRealHeight(325);
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
+ frameBack.AddChidren(btnTemp1);
+
+ var btnTemp2 = new NormalViewControl(200, 49, true);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.Y = Application.GetRealHeight(325);
+ btnTemp2.TextAlignment = TextAlignment.CenterRight;
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
+ frameBack.AddChidren(btnTemp2);
+
+ if (energyModeInfo.enable == true)
+ {
+ //灞曞紑鎴栬�呯缉灏忕殑楂樺害
+ var value = Application.GetRealHeight(259 + 23) + ControlCommonResourse.ListViewRowHeight;
+ frameBack.Height += value;
+ btnClickStatu.Y += value;
+ frameLinght.Y += value;
+
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
+ }
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ seekBar1.Enable = false;
+ btnSwitch.CanClick = false;
+ }
+
+ //娣诲姞鐫＄湢鏃堕棿琛�
+ this.AddSleepTimeRow(frameBack, btnTemp1.Bottom);
+ }
+
+ #endregion
+
+ #region 鈻� 鐫＄湢鏃堕棿___________________________
+
+ /// <summary>
+ /// 娣诲姞鐫＄湢鏃堕棿琛�
+ /// </summary>
+ /// <param name="frameBack">鐧借壊鍖哄煙瀹瑰櫒鎺т欢</param>
+ /// <param name="i_bottom">鍙傜収鐗╂帶浠剁殑搴曢儴鍧愭爣</param>
+ private void AddSleepTimeRow(FrameRowControl frameBack, int i_bottom)
+ {
+ var row = new FrameRowControl();
+ row.Y = i_bottom + Application.GetRealHeight(23);
+ frameBack.AddChidren(row, ChidrenBindMode.NotBind);
+ //鐫＄湢鏃堕棿
+ row.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SleepTime), 500);
+ //鍙崇澶�
+ row.AddRightArrow();
+ //鐘舵��
+ var btnStatu = row.AddMostRightView(string.Empty, 400);
+ //搴曠嚎
+ row.AddBottomLine();
+
+ int selectIndex = -1;
+ if (this.energyModeInfo.time == 15)
+ {
+ selectIndex = 0;
+ btnStatu.Text = "15" + Language.StringByID(R.MyInternationalizationString.uSecond) + Language.StringByID(R.MyInternationalizationString.Later);
+ }
+ else if (this.energyModeInfo.time == 60)
+ {
+ selectIndex = 1;
+ btnStatu.Text = "1min" + Language.StringByID(R.MyInternationalizationString.Later);
+ }
+ else if (this.energyModeInfo.time == 300)
+ {
+ selectIndex = 2;
+ btnStatu.Text = "5min" + Language.StringByID(R.MyInternationalizationString.Later);
+ }
+
+ //濡傛灉褰撳墠涓嶆槸灞曠ず妯℃澘
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
+ {
+ row.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず鐫＄湢鏃堕棿鍒楄〃
+ var listText = new List<string>();
+ //15绉掑悗
+ listText.Add("15s" + Language.StringByID(R.MyInternationalizationString.Later));
+ //1min鍚�
+ listText.Add("1min" + Language.StringByID(R.MyInternationalizationString.Later));
+ //5min鍚�
+ listText.Add("5min" + Language.StringByID(R.MyInternationalizationString.Later));
+
+ var form = new BottomItemSelectForm();
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uAutomaticTimingOff), listText, null, selectIndex);
+ form.FinishSelectEvent += (index) =>
+ {
+ selectIndex = index;
+ btnStatu.Text = listText[index];
+
+ if (selectIndex == 0)
+ {
+ //淇敼缂撳瓨
+ energyModeInfo.time = 15;
+ }
+ else
+ {
+ //淇敼缂撳瓨
+ energyModeInfo.time = selectIndex == 1 ? 60 : 300;
+ }
+ };
+ };
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 1-6骞叉帴鐐圭殑鑳屽厜鐏痏_________________
+
+ /// <summary>
+ /// 娣诲姞1-6骞叉帴鐐圭殑鑳屽厜鐏繘搴︽潯锛堣繖涓搴旂殑鏄�愭寚绀虹伅浜害銆戯級
+ /// </summary>
+ /// <param name="frameLinght">鍚勭鑳屽厜鐏殑瀹瑰櫒</param>
+ private void AddSixDryContactProgress(FrameLayout frameLinght)
+ {
+ var btnProgressView1 = new NormalViewControl(200, 49, true);
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.Y = Application.GetRealHeight(29);
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.Text = "Dry1-6";
+ frameLinght.AddChidren(btnProgressView1);
+ var btnProgress1 = new NormalViewControl(200, 49, true);
+ btnProgress1.X = Application.GetRealWidth(204);
+ btnProgress1.Y = Application.GetRealHeight(29);
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+ frameLinght.AddChidren(btnProgress1);
+
+ //杩涘害鏉�
+ var seekBar1 = new SeekBarControl();
+ seekBar1.Y = Application.GetRealHeight(124);
+ seekBar1.ProgressBarColor = 0xfffdb500;
+ frameLinght.AddChidren(seekBar1);
+ seekBar1.ProgressChangedEvent += (div, value) =>
+ {
+ btnProgress1.Text = value + "%";
+ //鏁版嵁鍙樻洿
+ linghtLevelInfo.panelBacklightLevel = value;
+ valueChanged = true;
+ };
+ seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
+
+ var btnTemp1 = new NormalViewControl(200, 49, true);
+ btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.Y = Application.GetRealHeight(193);
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
+ frameLinght.AddChidren(btnTemp1);
+
+ var btnTemp2 = new NormalViewControl(200, 49, true);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.Y = Application.GetRealHeight(193);
+ btnTemp2.TextAlignment = TextAlignment.CenterRight;
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
+ frameLinght.AddChidren(btnTemp2);
+
+ //绾�
+ var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
+ btnLine.Y = Application.GetRealHeight(311);
+ btnLine.Gravity = Gravity.CenterHorizontal;
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ frameLinght.AddChidren(btnLine);
+
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ seekBar1.Enable = false;
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 绗竷骞叉帴鐐圭殑鑳屽厜鐏痏________________
+
+ /// <summary>
+ /// 娣诲姞绗竷骞叉帴鐐圭殑鑳屽厜鐏繘搴︽潯锛堣繖涓搴旂殑鏄�愯儗鍏夌伅浜害銆戯級
+ /// </summary>
+ /// <param name="frameLinght">鍚勭鑳屽厜鐏殑瀹瑰櫒</param>
+ private void AddSevenDryContactProgress(FrameLayout frameLinght)
+ {
+ var btnProgressView1 = new NormalViewControl(200, 49, true);
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.Y = Application.GetRealHeight(369);
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.Text = "Dry7";
+ frameLinght.AddChidren(btnProgressView1);
+ var btnProgress1 = new NormalViewControl(200, 49, true);
+ btnProgress1.X = Application.GetRealWidth(161);
+ btnProgress1.Y = Application.GetRealHeight(369);
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+ frameLinght.AddChidren(btnProgress1);
+
+ //杩涘害鏉�
+ var seekBar1 = new SeekBarControl();
+ seekBar1.Y = Application.GetRealHeight(464);
+ seekBar1.ProgressBarColor = 0xfffdb500;
+ frameLinght.AddChidren(seekBar1);
+ seekBar1.ProgressChangedEvent += (div, value) =>
+ {
+ btnProgress1.Text = value + "%";
+ //鏁版嵁鍙樻洿
+ linghtLevelInfo.panelDirectionsLevel = value;
+ valueChanged = true;
+ };
+ seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
+
+ var btnTemp1 = new NormalViewControl(200, 49, true);
+ btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.Y = Application.GetRealHeight(533);
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
+ frameLinght.AddChidren(btnTemp1);
+
+ var btnTemp2 = new NormalViewControl(200, 49, true);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.Y = Application.GetRealHeight(533);
+ btnTemp2.TextAlignment = TextAlignment.CenterRight;
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
+ frameLinght.AddChidren(btnTemp2);
+
+ //绾�
+ var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
+ btnLine.Gravity = Gravity.CenterHorizontal;
+ btnLine.Y = Application.GetRealHeight(651);
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ frameLinght.AddChidren(btnLine);
+
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ seekBar1.Enable = false;
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇鍒濆鏁版嵁_______________________
+
+ /// <summary>
+ /// 鑾峰彇璁惧鍒濆鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ private bool GetDeviceDefultData()
+ {
+ //寮�鍚繘搴︽潯
+ this.ShowProgressBar();
+ //浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+ linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
+ if (linghtLevelInfo == null)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return false;
+ }
+ //鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+ energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
+ if (energyModeInfo == null)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return false;
+ }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+
+ return true;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 3b8d198..1207a80 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -14,10 +14,6 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 璁惧Mac鍦板潃
- /// </summary>
- private string deviceMac = string.Empty;
- /// <summary>
/// 浜害璋冭妭鐨勪俊鎭�
/// </summary>
private Panel.PanelSwitchLevelInfo linghtLevelInfo = null;
@@ -45,7 +41,6 @@
{
this.ScrollEnabled = false;
- this.deviceMac = i_deviceMac;
this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
//璁剧疆澶撮儴淇℃伅
@@ -235,6 +230,12 @@
btnProgressView1.Visible = true;
btnProgress1.Visible = true;
}
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ seekBar1.Enable = false;
+ btnSwitch.CanClick = false;
+ }
}
#endregion
@@ -299,6 +300,12 @@
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameLinght.AddChidren(btnLine);
+
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -363,6 +370,12 @@
btnLine.Y = Application.GetRealHeight(651);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameLinght.AddChidren(btnLine);
+
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ seekBar1.Enable = false;
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 61e1041..09c372e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -1140,6 +1140,16 @@
return password;
}
+ //// <summary>
+ /// 鍙栧緱鏌愭湀鐨勬渶鍚庝竴澶�
+ /// </summary>
+ /// <param name="datetime">瑕佸彇寰楁湀浠芥渶鍚庝竴澶╃殑鏃堕棿</param>
+ /// <returns></returns>
+ public static DateTime LastDayOfMonth(DateTime datetime)
+ {
+ return datetime.AddDays(1 - datetime.Day).AddMonths(1).AddDays(-1);
+ }
+
/// <summary>
/// 灏哢NIX鏃堕棿鎴宠浆鎹㈡垚绯荤粺鏃堕棿(绮剧‘鍒扮)
/// <returns></returns>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index 071fe66..c4005af 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -944,6 +944,7 @@
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = InValidTime.Month;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = InValidTime.Day;
+
//doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
index 13eee70..a499562 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
@@ -92,36 +92,40 @@
var btnMac = rowMac.AddMostRightView("", 600);
rowMac.AddBottomLine();
- //鍗忚鍣ㄤ俊閬�
- var rowChannel = new FrameRowControl(listView.rowSpace / 2);
- rowChannel.UseClickStatu = false;
- listView.AddChidren(rowChannel);
- rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
- var btnChannel = rowChannel.AddMostRightView("", 600);
- rowChannel.AddBottomLine();
-
- //鍗忚鍣≒anID
- var rowPanid = new FrameRowControl(listView.rowSpace / 2);
- rowPanid.UseClickStatu = false;
- listView.AddChidren(rowPanid);
- rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
- var btnPanId = rowPanid.AddMostRightView("", 600);
- rowPanid.AddBottomLine();
-
- //鍒堕�犲晢
- var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
- rowProtuct.UseClickStatu = false;
- listView.AddChidren(rowProtuct);
- rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
- rowProtuct.AddMostRightView("骞垮窞娌充笢绉戞妧鏈夐檺鍏徃", 600);
-
- listView.AdjustRealHeight(Application.GetRealHeight(23));
-
- HdlThreadLogic.Current.RunThread(() =>
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉挎垨鑰呰櫄鎷熶綇瀹�,鍒欎笉澶勭悊
+ if (Common.Config.Instance.Home.IsShowTemplate == false
+ && Common.Config.Instance.Home.IsVirtually == false)
{
- //鑾峰彇缃戝叧鏁版嵁
- this.GetGatewayData(i_gateway, btnMac, btnChannel, btnPanId);
- });
+ //鍗忚鍣ㄤ俊閬�
+ var rowChannel = new FrameRowControl(listView.rowSpace / 2);
+ rowChannel.UseClickStatu = false;
+ listView.AddChidren(rowChannel);
+ rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
+ var btnChannel = rowChannel.AddMostRightView("", 600);
+ rowChannel.AddBottomLine();
+
+ //鍗忚鍣≒anID
+ var rowPanid = new FrameRowControl(listView.rowSpace / 2);
+ rowPanid.UseClickStatu = false;
+ listView.AddChidren(rowPanid);
+ rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
+ var btnPanId = rowPanid.AddMostRightView("", 600);
+ rowPanid.AddBottomLine();
+
+ //鍒堕�犲晢
+ var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
+ rowProtuct.UseClickStatu = false;
+ listView.AddChidren(rowProtuct);
+ rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
+ rowProtuct.AddMostRightView("骞垮窞娌充笢绉戞妧鏈夐檺鍏徃", 600);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇缃戝叧鏁版嵁
+ this.GetGatewayData(i_gateway, btnMac, btnChannel, btnPanId);
+ });
+ }
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index fb1d954..8236ea9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -74,19 +74,23 @@
btnNote.InitControl();
//鍒掔嚎
btnNote.AddBottomLine();
- btnNote.txtInput.FinishInputEvent += () =>
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- string oldName = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
- if (btnNote.Text == string.Empty)
+ btnNote.txtInput.FinishInputEvent += () =>
{
- btnNote.Text = oldName;
- }
- if (oldName != btnNote.Text)
- {
- //淇敼鍚嶅瓧
- this.SetGatewayName(btnNote.Text, false);
- }
- };
+ string oldName = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
+ if (btnNote.Text == string.Empty)
+ {
+ btnNote.Text = oldName;
+ }
+ if (oldName != btnNote.Text)
+ {
+ //淇敼鍚嶅瓧
+ this.SetGatewayName(btnNote.Text, false);
+ }
+ };
+ }
//璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧)
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
@@ -109,6 +113,11 @@
//鍙樻洿缃戝叧鎴块棿
HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
};
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowBeloneArea.CanClick = false;
+ }
//鎵�灞炰綇瀹�
caption = Language.StringByID(R.MyInternationalizationString.uBelongResidence);
@@ -145,11 +154,15 @@
rowFunction.frameTable.AddRightArrow();
//搴曠嚎
rowFunction.frameTable.AddBottomLine();
- rowFunction.frameTable.ButtonClickEvent += (sender, e) =>
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- var form = new DeviceLight.MiniNightLightFunctionSettionForm();
- form.AddForm(miniDevice);
- };
+ rowFunction.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceLight.MiniNightLightFunctionSettionForm();
+ form.AddForm(miniDevice);
+ };
+ }
}
}
@@ -161,11 +174,15 @@
rowData.frameTable.AddRightArrow();
//搴曠嚎
rowData.frameTable.AddBottomLine();
- rowData.frameTable.ButtonClickEvent += (sender, e) =>
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- var form = new GatewayUploadAndDownLoadForm();
- form.AddForm(this.zbGateway.GwId);
- };
+ rowData.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new GatewayUploadAndDownLoadForm();
+ form.AddForm(this.zbGateway.GwId);
+ };
+ }
//閫氱敤淇℃伅
var btnGeneral = new FrameRowControl(listview.rowSpace / 2);
@@ -211,6 +228,11 @@
var btnFinish = new BottomClickButton();
btnFinish.TextID = R.MyInternationalizationString.uSave;
bodyFrameLayout.AddChidren(btnFinish);
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnFinish.CanClick = false;
+ }
btnFinish.ButtonClickEvent += (sender, e) =>
{
string oldName = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
@@ -230,11 +252,15 @@
}
};
- HdlThreadLogic.Current.RunThread(() =>
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶉渶瑕佹娴�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- //妫�娴嬫柊鐗堟湰
- this.CheckNewVersion(btnNewVersion);
- });
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //妫�娴嬫柊鐗堟湰
+ this.CheckNewVersion(btnNewVersion);
+ });
+ }
}
#endregion
@@ -246,6 +272,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
index d0b5faf..0277750 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
@@ -2,7 +2,6 @@
using System;
using System.Collections.Generic;
using System.Text;
-using System.Threading.Tasks;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.GatewayManage
@@ -39,16 +38,20 @@
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGatewayManagement));
- //娣诲姞鍥炬爣
- var btnAdd = new MostRightIconControl(69, 69);
- btnAdd.UnSelectedImagePath = "Item/Add.png";
- topFrameLayout.AddChidren(btnAdd);
- btnAdd.InitControl();
- btnAdd.ButtonClickEvent += (sender, e) =>
+ //灞曠ず妯℃澘涓嶅厑璁哥紪杈�
+ if (Config.Instance.Home.IsShowTemplate == false)
{
- var form = new GatewayAdd.NewGateWayMenuSelectForm();
- form.AddForm();
- };
+ //娣诲姞鍥炬爣
+ var btnAdd = new MostRightIconControl(69, 69);
+ btnAdd.UnSelectedImagePath = "Item/Add.png";
+ topFrameLayout.AddChidren(btnAdd);
+ btnAdd.InitControl();
+ btnAdd.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new GatewayAdd.NewGateWayMenuSelectForm();
+ form.AddForm();
+ };
+ }
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
@@ -101,8 +104,12 @@
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
this.listview.AdjustRealHeight(Application.GetRealHeight(23));
- //寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼
- this.StartGatewayOnlieCheckThread(listway);
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶉渶瑕佹娴�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
+ {
+ //寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼
+ this.StartGatewayOnlieCheckThread(listway);
+ }
}
#endregion
@@ -146,36 +153,46 @@
form.AddForm(gateway);
};
- //鍒囨崲
- var btnSwitch = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
- btnSwitch.BackgroundColor = 0xfffb744a;
- btnSwitch.TextAlignment = TextAlignment.Center;
- btnSwitch.TextColor = UserCenterColor.Current.White;
- btnSwitch.TextSize = 12;
- btnSwitch.TextID = R.MyInternationalizationString.uSwitch1;
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
{
- btnSwitch.TextID = R.MyInternationalizationString.uRefresh;
+ return;
}
- gatewayRow.AddRightView(btnSwitch);
- btnSwitch.ButtonClickEvent += (sender, e) =>
+
+ //闈炶櫄鎷熶綇瀹�,鎵嶆湁杩欎釜鍔熻兘
+ if (Common.Config.Instance.Home.IsVirtually == false)
{
- //鏄惁鍒囨崲鍒皗0}缃戝叧?
- string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ //鍒囨崲
+ var btnSwitch = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
+ btnSwitch.BackgroundColor = 0xfffb744a;
+ btnSwitch.TextAlignment = TextAlignment.Center;
+ btnSwitch.TextColor = UserCenterColor.Current.White;
+ btnSwitch.TextSize = 12;
+ btnSwitch.TextID = R.MyInternationalizationString.uSwitch1;
if (strWayId == GatewayResourse.AppOldSelectGatewayId)
{
- //鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
- msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ btnSwitch.TextID = R.MyInternationalizationString.uRefresh;
}
- this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ gatewayRow.AddRightView(btnSwitch);
+ btnSwitch.ButtonClickEvent += (sender, e) =>
{
- HdlThreadLogic.Current.RunThread(() =>
+ //鏄惁鍒囨崲鍒皗0}缃戝叧?
+ string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ if (strWayId == GatewayResourse.AppOldSelectGatewayId)
{
- //鎵ц鍒囨崲缃戝叧鎿嶄綔
- this.DoSwitchGateway(strWayId);
+ //鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
+ msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ }
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鎵ц鍒囨崲缃戝叧鎿嶄綔
+ this.DoSwitchGateway(strWayId);
+ });
});
- });
- };
+ };
+ }
//瀹氫綅
var btnPosition = gatewayRow.AddEditorControl(false);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index ae56315..ae0c5ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -82,7 +82,7 @@
upDatezbGateway.LinuxImageType.ToString());
//鍗忚皟鍣�
- var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
+ var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A鍗忚皟鍣�,
upDatezbGateway.CoordinatorHardVersion.ToString(),
upDatezbGateway.CoordinatorImageId.ToString());
@@ -91,7 +91,7 @@
if (this.listVode != null && this.listVode.Count > 0)
{
//濡傛灉杩欎釜缃戝叧瑕佹湁铏氭嫙椹卞姩杩欎釜涓滆タ鐨勬椂鍊欐墠鑰冭檻
- listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.VirtualDevice,
+ listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A铏氭嫙椹卞姩,
this.listVode[0].DriveHwVersion.ToString(),
this.listVode[0].DriveImageType.ToString());
}
@@ -131,7 +131,7 @@
this.AddTitleRowlayout("鍗忚皟鍣ㄦā鍧�");
canAddTitle = false;
}
- this.AddRowlayout(data, FirmwareLevelType.Coordinator);
+ this.AddRowlayout(data, FirmwareLevelType.A鍗忚皟鍣�);
}
canAddTitle = true;
@@ -148,7 +148,7 @@
this.AddTitleRowlayout("铏氭嫙璁惧妯″潡");
canAddTitle = false;
}
- this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
+ this.AddRowlayout(data, FirmwareLevelType.A铏氭嫙椹卞姩);
}
listView.AdjustRealHeight(Application.GetRealHeight(23));
});
@@ -192,11 +192,11 @@
{
this.gatewayFirmware = info;
}
- else if (levelType == FirmwareLevelType.Coordinator)
+ else if (levelType == FirmwareLevelType.A鍗忚皟鍣�)
{
this.coordinatorFirmware = info;
}
- else if (levelType == FirmwareLevelType.VirtualDevice)
+ else if (levelType == FirmwareLevelType.A铏氭嫙椹卞姩)
{
this.virtualFirmware = info;
this.virtualFirmware.VirtualCode = this.listVode[0].DriveCode;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs
index 91d8619..89cf08e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs
@@ -106,7 +106,7 @@
{
//鎴愬憳涓嶅瓨鍦�
var form = new MemberNotEsixtForm();
- form.AddForm();
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uMemberInformation));
});
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index d730def..3075b58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
@@ -437,7 +437,7 @@
{
//鎴愬憳涓嶅瓨鍦�
var form = new MemberNotEsixtForm();
- form.AddForm();
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uMemberInformation));
});
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberNotEsixtForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberNotEsixtForm.cs
index 8108950..bc949d3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberNotEsixtForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberNotEsixtForm.cs
@@ -18,10 +18,11 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- public void ShowForm()
+ /// <param name="i_titleText">鏍囬淇℃伅</param>
+ public void ShowForm(string i_titleText)
{
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uMemberInformation));
+ base.SetTitleText(i_titleText);
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 3038ab9..17f8556 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -123,6 +123,7 @@
//銆愭埧闂村悕绉般��
var txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), string.Empty, this.listview.rowSpace / 2);
txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
+ txtRoomName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(txtRoomName);
txtRoomName.InitControl();
//搴曠嚎
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 3634974..87177a9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -109,7 +109,7 @@
btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
listBackControl.frameTable.AddChidren(btnZhezhao);
//鍒嗕韩鐨勬埧闂翠笉鑳界紪杈�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
@@ -140,6 +140,7 @@
{
txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), this.cloneRoom.Name, this.listview.rowSpace / 2);
txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
+ txtRoomName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(txtRoomName);
txtRoomName.InitControl();
//搴曠嚎
@@ -166,7 +167,7 @@
//搴曠嚎
btnBelone.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鍙崇澶�
btnBelone.AddRightArrow();
@@ -188,7 +189,8 @@
//搴曠嚎
rowTemperature.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowTemperature.ButtonClickEvent += (sender, e) =>
{
@@ -196,7 +198,8 @@
this.ShowTemperatrueDevice(btnTemper);
};
}
- if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇娓╁害
this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);
@@ -212,7 +215,8 @@
//搴曠嚎
rowHumidity.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowHumidity.ButtonClickEvent += (sender, e) =>
{
@@ -220,7 +224,8 @@
this.ShowHumidityDevice(btnHumi);
};
}
- if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇婀垮害
this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);
@@ -231,7 +236,7 @@
tableContr = null;
//鍒嗕韩鐨勬埧闂翠笉鑳戒繚瀛�
- if (this.editorRoom.IsSharedRoom == true)
+ if (this.editorRoom.IsSharedRoom == true|| Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 3558710..62f2ef3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -37,15 +37,19 @@
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
- var btnIcon = new MostRightIconControl(69, 69);
- btnIcon.UnSelectedImagePath = "Item/Add.png";
- topFrameLayout.AddChidren(btnIcon);
- btnIcon.InitControl();
- btnIcon.ButtonClickEvent += ((sender, e) =>
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- var form = new AddNewRoomForm();
- form.AddForm(i_floor);
- });
+ var btnIcon = new MostRightIconControl(69, 69);
+ btnIcon.UnSelectedImagePath = "Item/Add.png";
+ topFrameLayout.AddChidren(btnIcon);
+ btnIcon.InitControl();
+ btnIcon.ButtonClickEvent += ((sender, e) =>
+ {
+ var form = new AddNewRoomForm();
+ form.AddForm(i_floor);
+ });
+ }
}
//鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -135,6 +139,12 @@
var form = new EditorRoomInforForm();
form.AddForm(room);
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnEditor.Text = Language.StringByID(R.MyInternationalizationString.uSearch1);
+ return;
+ }
//鍒犻櫎
var btnDelete = frameRow.AddDeleteControl();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index b274703..50c2d74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -250,6 +250,14 @@
//鍒嗕韩鐨�,涓嶈兘鏇存敼
return;
}
+ //杩囨埛
+ var btnTransfer = rowLayout.AddDeleteControl();
+ btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
+ btnTransfer.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new TransferResidenceMainForm();
+ form.AddForm();
+ };
//鏇存敼
var btnChanged = rowLayout.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 1f94ca2..76cb9dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -44,8 +44,12 @@
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
- //鍒濆鍖栧彸涓婅鑿滃崟
- this.InitTopRightMenu();
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
+ {
+ //鍒濆鍖栧彸涓婅鑿滃崟
+ this.InitTopRightMenu();
+ }
}
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame(i_CanDeleteResidence);
@@ -102,27 +106,19 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
rowHome.frameTable.UseClickStatu = true;
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowHome.frameTable.CanClick = false;
+ }
rowHome.frameTable.ButtonClickEvent += (sender, e) =>
{
- //榛樿鍊� 23.134421,113.267189
- double latitude = Common.Config.Instance.Home.Latitude;
- double longitude = Common.Config.Instance.Home.Longitude;
- //鍦板浘
- GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
- {
- HdlThreadLogic.Current.RunThread(() =>
- {
- //淇濆瓨浣忓畢鍦板潃
- this.SaveResidenceAdrress(btnLocation, mLatitude, mLongitude, name);
- });
- },
- Language.StringByID(R.MyInternationalizationString.uSelectAdrress),
- Language.StringByID(R.MyInternationalizationString.uSave),
- true, latitude, longitude, 100);
+ //妫�娴嬫潈闄�,鐒跺悗鏄剧ず鍦板浘
+ this.CheckAuthorityAndShowMap(btnLocation);
};
}
- if (i_CanDeleteResidence == true)
+ if (i_CanDeleteResidence == true && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鍒犻櫎
var btnDelete = new NormalViewControl(Application.GetRealWidth(184), rowHome.Height, false);
@@ -326,6 +322,11 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
//鏇存敼
var btnChanged = frameRow.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
@@ -460,13 +461,14 @@
{
keys = Guid.NewGuid().ToString();
}
- if (Common.Config.Instance.Home.CurrentFloorId == string.Empty)
+ bool hadFloor = Common.Config.Instance.Home.CurrentFloorId != string.Empty;
+ Common.Config.Instance.Home.FloorDics[keys] = textValue;
+ Common.Config.Instance.Home.Save();
+ if (hadFloor == false)
{
//鍒涘缓绗竴涓柊鐨勬ゼ灞傜殑璇�,闇�瑕佸幓鍒锋柊涓婚〉宸﹁竟鐨勬埧闂村垪琛�
HdlRoomLogic.Current.RefreshRoomListView();
}
- Common.Config.Instance.Home.FloorDics[keys] = textValue;
- Common.Config.Instance.Home.Save();
if (btnFloor != null)
{
@@ -581,7 +583,12 @@
btnName.Text = roomName;
};
};
-
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnEditor.Text = Language.StringByID(R.MyInternationalizationString.uSearch1);
+ return;
+ }
//鍒犻櫎
var btnDelete = frameRow.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
@@ -694,7 +701,7 @@
var myHouse = HdlResidenceLogic.Current.GetHouseByFilePath(Common.Config.Instance.HomeFilePathList[index]);
//鍒囨崲浣忓畢
Common.Config.Instance.HomeId = myHouse.Id;
- Common.Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(myHouse.Id);
+ Common.Config.Instance.Home = myHouse;
Common.Global.CreateHomeDirectory(myHouse.Id);
Common.Config.Instance.Save();
@@ -718,6 +725,66 @@
#endregion
+ #region 鈻� 鏄剧ず鍦板浘___________________________
+
+ /// <summary>
+ /// 妫�娴嬫潈闄�,鐒跺悗鏄剧ず鍦板浘
+ /// </summary>
+ /// <param name="btnLocation">鍦板潃鏄剧ず鎺т欢</param>
+ private void CheckAuthorityAndShowMap(NormalViewControl btnLocation)
+ {
+#if Android
+ //鏄剧ず鍦板浘
+ this.ShowMap(btnLocation);
+ ////鐢宠瀹氫綅鏉冮檺
+ //((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
+ //{
+ // if (result1 == false) { return; }
+ // //鐢宠璇绘潈闄�
+ // ((BaseActivity)Application.Activity).ReadWriteContact((result2) =>
+ // {
+ // if (result2 == false) { return; }
+ // //鐢宠璇诲彇鎵嬫満鍙锋潈闄�
+ // ((BaseActivity)Application.Activity).SetPermission((result3) =>
+ // {
+ // if (result3 == false) { return; }
+ // //鏄剧ず鍦板浘
+ // this.ShowMap(btnLocation);
+ // }, "android.permission.READ_PHONE_STATE");
+ // });
+ //});
+#endif
+#if iOS
+ //鏄剧ず鍦板浘
+ this.ShowMap(btnLocation);
+#endif
+ }
+
+ /// <summary>
+ /// 鏄剧ず鍦板浘
+ /// </summary>
+ /// <param name="btnLocation">鍦板潃鏄剧ず鎺т欢</param>
+ private void ShowMap(NormalViewControl btnLocation)
+ {
+ //榛樿鍊� 23.134421,113.267189
+ double latitude = Common.Config.Instance.Home.Latitude;
+ double longitude = Common.Config.Instance.Home.Longitude;
+ //鍦板浘
+ GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //淇濆瓨浣忓畢鍦板潃
+ this.SaveResidenceAdrress(btnLocation, mLatitude, mLongitude, name);
+ });
+ },
+ Language.StringByID(R.MyInternationalizationString.uSelectAdrress),
+ Language.StringByID(R.MyInternationalizationString.uSave),
+ true, latitude, longitude, 100);
+ }
+
+ #endregion
+
#region 鈻� 淇濆瓨浣忓畢鍦板浘鍦板潃___________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferOfResidenceMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferOfResidenceMainForm.cs
deleted file mode 100755
index bcd8887..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferOfResidenceMainForm.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter.Residence
-{
- /// <summary>
- /// 浣忓畢杩囨埛鐨勪富鐣岄潰
- /// </summary>
- public class TransferOfResidenceMainForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uTransferOfResidence));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs
new file mode 100755
index 0000000..5a1117c
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs
@@ -0,0 +1,135 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.Residence
+{
+ /// <summary>
+ /// 鏍规嵁璐﹀彿鍚嶈繃鎴风殑鐢婚潰
+ /// </summary>
+ public class TransferResidenceByIdForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uTransferResidenceAccount));
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ var frame = new FrameLayout();
+ frame.Height = Application.GetRealHeight(248);
+ frame.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frame);
+
+ var rowAccount = new FrameRowControl();
+ rowAccount.UseClickStatu = false;
+ rowAccount.Y = Application.GetRealHeight(23);
+ frame.AddChidren(rowAccount);
+ //搴曠嚎
+ var btnLine = rowAccount.AddBottomLine();
+
+ //璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+ var txtCode = new TextInputControl(Application.GetRealWidth(900), rowAccount.Height, false);
+ txtCode.MustInput = true;
+ txtCode.X = ControlCommonResourse.XXLeft;
+ txtCode.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputReceiverPhoneOrEmail);
+ rowAccount.AddChidren(txtCode, ChidrenBindMode.NotBind);
+ //鑱斿姩绾跨殑鐘舵��
+ txtCode.btnLine = btnLine;
+
+ //涓嬩竴姝�
+ var btnBottom = new BottomClickButton(688);
+ btnBottom.Y = Application.GetRealHeight(706);
+ btnBottom.TextID = R.MyInternationalizationString.uNextway;
+ btnBottom.CheckForm = true;
+ bodyFrameLayout.AddChidren(btnBottom);
+ btnBottom.ButtonClickEvent += ((sender, e) =>
+ {
+ //鎴愬憳ID妫�娴�
+ if (this.CheckAccountId(txtCode.Text.Trim()) == false)
+ {
+ return;
+ }
+ //妫�绱㈡垚鍛樹俊鎭�
+ string strCode = txtCode.Text.Trim();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.SearchMemberInfo(strCode);
+ });
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鎼滅储ID_____________________________
+
+ /// <summary>
+ /// 鎼滅储鎸囧畾ID鐨勪俊鎭�
+ /// </summary>
+ /// <param name="accountId">鎴愬憳ID</param>
+ /// <param name="txtMsg">淇℃伅鎺т欢</param>
+ private void SearchMemberInfo(string accountId)
+ {
+ //寮�鍚繘搴︽潯
+ this.ShowProgressBar();
+
+ var pra = new AccountInfoPra();
+ pra.Account = accountId;
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new System.Collections.Generic.List<string>() { "AccountNoExists" });
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+
+ if (byteData == null)
+ {
+ //寮傚父
+ return;
+ }
+ var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(System.Text.Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode == "AccountNoExists")
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璐﹀彿淇℃伅
+ var form = new Member.MemberNotEsixtForm();
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uAccountInfo));
+ });
+
+ return;
+ }
+
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
+ infoResult.Account = accountId;
+ }
+
+ /// <summary>
+ /// 妫�鏌ヨ緭鍏ョ殑鎴愬憳ID
+ /// </summary>
+ /// <param name="accountId"></param>
+ /// <returns></returns>
+ private bool CheckAccountId(string accountId)
+ {
+ return true;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs
new file mode 100755
index 0000000..54270de
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs
@@ -0,0 +1,172 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.Residence
+{
+ /// <summary>
+ /// 浣忓畢杩囨埛鐨勪富鐣岄潰
+ /// </summary>
+ public class TransferResidenceMainForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uTransferOfResidence));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //杞Щ鍥剧墖
+ var btnPictrue = new PicViewControl(804, 268);
+ btnPictrue.Gravity = Gravity.CenterHorizontal;
+ btnPictrue.Y = Application.GetRealHeight(222);
+ btnPictrue.UnSelectedImagePath = "Item/TransferOfResidence.png";
+ bodyFrameLayout.AddChidren(btnPictrue);
+
+ //杞Щ浣忓畢鍒板叾浠朎voyo Home璐﹀彿
+ var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(90), false);
+ btnMsg1.Y = Application.GetRealHeight(593);
+ btnMsg1.TextSize = 20;
+ btnMsg1.IsBold = true;
+ btnMsg1.TextAlignment = TextAlignment.Center;
+ btnMsg1.TextID = R.MyInternationalizationString.uTransferOfResidenceToOtherEvoyoAccount1;
+ bodyFrameLayout.AddChidren(btnMsg1);
+ var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(90), false);
+ btnMsg2.Y = btnMsg1.Bottom;
+ btnMsg2.TextSize = 20;
+ btnMsg2.IsBold = true;
+ btnMsg2.TextAlignment = TextAlignment.Center;
+ btnMsg2.TextID = R.MyInternationalizationString.uTransferOfResidenceToOtherEvoyoAccount2;
+ bodyFrameLayout.AddChidren(btnMsg2);
+
+ //璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+ var btnTip = new NormalViewControl(900, 60, true);
+ btnTip.X = Application.GetRealWidth(135);
+ btnTip.Y = btnMsg2.Bottom + Application.GetRealHeight(167);
+ btnTip.TextID = R.MyInternationalizationString.uThisOperationIsIrreversiblePleaseNote;
+ bodyFrameLayout.AddChidren(btnTip);
+ //1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+ var btnTipMsg1 = new NormalViewControl(900, 55, true);
+ btnTipMsg1.X = btnTip.X;
+ btnTipMsg1.Y = btnTip.Bottom + Application.GetRealHeight(30);
+ btnTipMsg1.TextSize = 12;
+ btnTipMsg1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTipMsg1.TextID = R.MyInternationalizationString.uTheReceiverIsValidAccountForEvoyoHome;
+ bodyFrameLayout.AddChidren(btnTipMsg1);
+ //2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+ var btnTipMsg2 = new NormalViewControl(900, 55, true);
+ btnTipMsg2.X = btnTip.X;
+ btnTipMsg2.Y = btnTipMsg1.Bottom + Application.GetRealHeight(30);
+ btnTipMsg2.TextSize = 12;
+ btnTipMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTipMsg2.TextID = R.MyInternationalizationString.uTheReceiverAndTheTransferPartyCannotBeTheSameAccount;
+ bodyFrameLayout.AddChidren(btnTipMsg2);
+ //3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+ var btnTipMsg3 = new NormalViewControl(900, 55, true);
+ btnTipMsg3.X = btnTip.X;
+ btnTipMsg3.Y = btnTipMsg2.Bottom + Application.GetRealHeight(30);
+ btnTipMsg3.TextSize = 12;
+ btnTipMsg3.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTipMsg3.TextID = R.MyInternationalizationString.uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled;
+ bodyFrameLayout.AddChidren(btnTipMsg3);
+
+ //杈撳叆璐﹀彿
+ var btnInputAccount = new BottomClickButton(372);
+ btnInputAccount.Gravity = Gravity.Frame;
+ btnInputAccount.X = Application.GetRealWidth(115);
+ btnInputAccount.TextID = R.MyInternationalizationString.uInputAccount;
+ bodyFrameLayout.AddChidren(btnInputAccount);
+ btnInputAccount.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new TransferResidenceByIdForm();
+ form.AddForm();
+ };
+
+ //鎵弿浜岀淮鐮佺殑鑳屾櫙
+ var btnScanGroud = new NormalViewControl(429, 184, true);
+ btnScanGroud.Y = Application.GetRealHeight(1454);
+ btnScanGroud.X = btnInputAccount.Right + Application.GetRealWidth(78);
+ btnScanGroud.UnSelectedImagePath = "Item/ScanQrCodeGroud.png";
+ bodyFrameLayout.AddChidren(btnScanGroud);
+ //鎵弿浜岀淮鐮�
+ var btnScanQrCode = new BottomClickButton(372);
+ btnScanQrCode.Gravity = Gravity.Frame;
+ btnScanQrCode.X = btnScanGroud.X + Application.GetRealWidth(28);
+ btnScanQrCode.TextID = R.MyInternationalizationString.uScanQRcode;
+ btnScanQrCode.BackgroundColor = UserCenterColor.Current.Transparent;
+ btnScanQrCode.UseClickStatu = false;
+ bodyFrameLayout.AddChidren(btnScanQrCode);
+ btnScanQrCode.ButtonClickEvent += (sender, e) =>
+ {
+ QRCode.ScanQRcode((qrCode) =>
+ {
+ if (string.IsNullOrEmpty(qrCode) == true)
+ {
+ return;
+ }
+ //鎼滅储ID
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.SearchMemberInfo(qrCode);
+ });
+ },
+ Language.StringByID(R.MyInternationalizationString.uCancel),
+ Language.StringByID(R.MyInternationalizationString.uFlashlamp),
+ Language.StringByID(R.MyInternationalizationString.uScanQRcode));
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鎼滅储ID_____________________________
+
+ /// <summary>
+ /// 鎼滅储鎸囧畾ID鐨勪俊鎭�
+ /// </summary>
+ /// <param name="accountId">鎴愬憳ID</param>
+ /// <param name="txtMsg">淇℃伅鎺т欢</param>
+ private void SearchMemberInfo(string accountId)
+ {
+ var pra = new AccountInfoPra();
+ pra.Account = accountId;
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "AccountNoExists" });
+ if (byteData == null)
+ {
+ //寮傚父
+ return;
+ }
+ var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(System.Text.Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode == "AccountNoExists")
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璐﹀彿淇℃伅
+ var form = new Member.MemberNotEsixtForm();
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uAccountInfo));
+ });
+ return;
+ }
+
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
+ infoResult.Account = accountId;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
old mode 100755
new mode 100644
index 2e36d6f..e388a4f
--- a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
@@ -74,21 +74,35 @@
txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uYouSuggestionMsg);
frameInput.AddChidren(txtInput);
txtInput.InitIosPlaceholderUILabelWithHeight(Application.GetRealHeight(60));
- txtInput.TextChangeEventHandler += (sender, txtvalue) =>
+ //杈撳叆鍊兼敼鍙樹簨浠�
+ Action<View, string> txtInputChangedEvent = (sender, txtValue) =>
{
if (this.suggestionCount <= 0)
{
return;
}
- int length = txtvalue.Length;
+ var newValue = txtValue;
+ //濡傛灉杈撳叆鐨勫��,宸茬粡澶т簬鎸囧畾鐨勬暟,鍒欐埅鍙�
+ if (newValue.Length > 500)
+ {
+ //鎴彇鎸囧畾鐨刡yte瀛楄妭
+ newValue = newValue.Substring(0, 500);
+ txtInput.Text = newValue;
+#if Android
+ //灏嗗厜鏍囪嚦浜庢渶鍚�
+ txtInput.SetSelectionEnd();
+#endif
+ }
+
+ int length = newValue.Length;
if (length == 0)
{
if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
}
else
{
- if (btnSubmit.CanClick == false)
+ if (btnSubmit.CanClick == false)
{
//鍙樼伆鑹插瓧浣�
btnFild.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -96,17 +110,8 @@
}
}
btnFild.Text = (500 - length).ToString();
-
- if (length > 500)
- {
- if (btnSubmit.CanClick == true)
- {
- btnSubmit.CanClick = false;
- //鍙樼孩鑹插瓧浣�
- btnFild.TextColor = Common.ZigbeeColor.Current.GXCTextRed;
- }
- }
};
+ txtInput.TextChangeEventHandler += txtInputChangedEvent;
var framType = new FrameLayout();
framType.Height = Application.GetRealHeight(150);
@@ -260,9 +265,9 @@
}
}
- #endregion
+#endregion
- #region 鈻� 涓婁紶鎰忚___________________________
+#region 鈻� 涓婁紶鎰忚___________________________
/// <summary>
/// 涓婁紶鎰忚
@@ -343,6 +348,6 @@
});
}
- #endregion
+#endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index 21b346c..d914a28 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -82,7 +82,7 @@
{
frameMiddleBack = new NormalFrameLayout();
frameMiddleBack.Y = Application.GetRealHeight(363);
- frameMiddleBack.Height = Application.GetRealHeight(1008);
+ frameMiddleBack.Height = Application.GetRealHeight(1008) - ControlCommonResourse.ListViewRowHeight - Application.GetRealHeight(12);
frameMiddleBack.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(frameMiddleBack);
}
@@ -228,7 +228,7 @@
var rowOther = new FrameRowControl(listMidFrame.rowSpace / 2);
- listMidFrame.AddChidren(rowOther);
+ //listMidFrame.AddChidren(rowOther);
//绗笁鏂硅处鍙�
rowOther.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uAuthenticatedOtherPartyAccount), 400);
//搴曠嚎
@@ -285,7 +285,7 @@
{
var specialFrame = new FrameLayout();
specialFrame.Height = ControlCommonResourse.ListViewRowHeight;
- specialFrame.Y = Application.GetRealHeight(1394);
+ specialFrame.Y = Application.GetRealHeight(1394) - ControlCommonResourse.ListViewRowHeight - Application.GetRealHeight(12);
specialFrame.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(specialFrame);
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs
index f17793b..4ebcf61 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs
@@ -6,6 +6,18 @@
public class OwnCodes
{
+ /// <summary>
+ /// 灏哛GB杞崲涓洪鑹层�傘�傘��
+ /// </summary>
+ /// <param name="R"></param>
+ /// <param name="G"></param>
+ /// <param name="B"></param>
+ /// <returns></returns>
+ private uint GetColorByRGB(byte R, byte G, byte B)
+ {
+ return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
+ }
+
#region set/get
[Newtonsoft.Json.JsonIgnore]
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index 63162da..c7ded70 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -19,6 +19,15 @@
}
[System.Serializable]
+ public class AddedDeviceSingleBindResponseAllData : ErrorResponCommon
+ {
+ /// <summary>
+ /// 缃戝叧鐩存帴鍙嶉缁戝畾璁惧淇℃伅
+ /// </summary>
+ public AddedDeviceSingleBindResponseData addedDeviceSingleBindResponseData;
+ }
+
+ [System.Serializable]
public class AddedDeviceBindResponseData
{
/// <summary>
@@ -35,6 +44,56 @@
/// </summary>
public int Result = -1;
}
+
+ [System.Serializable]
+ public class AddedDeviceSingleBindResponseData
+ {
+ /// <summary>
+ /// 鎺у埗璁惧鑺傜偣鐨刴ac鍦板潃
+ /// </summary>
+ public string DeviceAddr;
+ /// <summary>
+ /// 鎺у埗璁惧鑺傜偣鐨勭鍙ｅ彿
+ /// </summary>
+ public int Epoint;
+ /// <summary>
+ ///缁戝畾鍚嶇О
+ /// </summary>
+ public string BindName;
+ /// <summary>
+ /// 0锛氭垚鍔燂紝閽堝鍦烘櫙鍜岃法缃戝叧缁戝畾
+ ///<para>1锛氬け璐ワ紝鑺傜偣璁惧鎴栧満鏅笉瀛樺湪銆�</para>
+ ///<para>2锛氬悓缃戝叧璁惧缁戝畾锛岀瓑寰呮帶鍒舵簮璁惧鍐欏叆鍙嶉缁撴灉锛涗互涓嬮潰涓婚缁撴灉涓哄噯</para>
+ /// </summary>
+ public int Result = -1;
+ /// <summary>
+ /// 缁戝畾绫诲瀷
+ ///<para>0锛氱粦瀹氳澶� </para>
+ ///<para>1锛氱粦瀹氬満鏅�</para>
+ /// </summary>
+ public int BindType;
+ /// <summary>
+ ///缁戝畾鐨刢luster鏁扮粍
+ /// </summary>
+ public List<int> BindClusterList = new List<int>();
+ /// <summary>
+ /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+ /// </summary>
+ public string BindMacAddr;
+ /// <summary>
+ /// 缁戝畾璁惧鐨勭鍙ｅ彿锛屽綋BindType=0鏃跺瓨鍦�
+ /// </summary>
+ public int BindEpoint;
+ /// <summary>
+ /// 缁戝畾鍦烘櫙锛屽綋BindType=2鏃跺瓨鍦�
+ /// </summary>
+ public int BindScenesId;
+ /// <summary>
+ ///缁戝畾鐨勮澶囨垨鍦烘櫙鐨勫悕绉�
+ /// </summary>
+ public string ESName;
+ }
+
/// <summary>
/// 缁戝畾鍒楄〃鐨勪俊鎭�
@@ -166,10 +225,9 @@
/// </summary>
public int BindType;
/// <summary>
- /// 缁戝畾鐨刢luster,闇�瑕佹帶鍒惰澶囩殑OutCluster鍒楄〃涓瓨鍦ㄨcluster銆�
- ///濡傜粦瀹氭煇涓澶囩殑on/off锛屼负6銆�
+ ///缁戝畾鐨刢lusters鏁扮粍锛岄渶瑕佹帶鍒惰澶囩殑OutCluster鍒楄〃涓瓨鍦ㄨcluster銆傚缁戝畾鏌愪釜璁惧鐨刼n/off锛屼负6銆傚缁戝畾鍦烘櫙锛屽～鏃廔d涓�6
/// </summary>
- public int BindCluster;
+ public List<int> BindClusterList = new List<int>();
/// <summary>
/// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
/// </summary>
@@ -184,10 +242,11 @@
public int BindScenesId;
}
+
#endregion
#region 瑙ｉ櫎缁戝畾
-
+
/// <summary>
///瑙ｉ櫎缁戝畾鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 329f3db..bda2e51 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -369,6 +369,11 @@
/// </summary>
public void ReSave()
{
+ if (Shared.Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ //灞曠ず妯℃澘鏃�,涓嶅厑璁镐繚瀛樻枃浠�(闃叉灞炴�т笂鎶ョ敤鐨�)
+ return;
+ }
if (IconPath == string.Empty)
{
//淇濆瓨璁惧鍥炬爣(杩欓噷浼氫繚瀛樹竴娆�,涓嬮潰灏变笉鐢ㄤ繚瀛樹簡)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs
index 9edb5f8..e228756 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs
@@ -27,15 +27,14 @@
///璁剧疆璁惧浜害锛圠evel锛�
///<para>value:浜害鍊煎彇鍊艰寖鍥达細0-254</para>
///<para>command 0锛歁ove to Level Command</para>
- ///<para>command 4锛歁ove to Level Command锛坵ith On/ Off锛�</para>
/// </summary>
- public void SetLevel(int value, int command = 4)
+ public void SetLevel(int value)
{
var jObject = new JObject {
{ "DeviceAddr", DeviceAddr},
{ "Epoint", DeviceEpoint},
{ "Cluster_ID", 8 },
- { "Command", command},
+ { "Command", 4},
{ "SendMode", 2 }
};
var data = new JObject {
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
index ae70ba4..5c61200 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -24,7 +24,6 @@
/// <summary>
/// 褰撳墠PM2.5鍊�
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public int currentPmData = 0;
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index 440f8f0..26aad3f 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -15,6 +15,11 @@
this.Type = DeviceType.OnOffSwitch;
}
/// <summary>
+ /// 澶氬姛鑳介潰鏉夸腑琚粦瀹氱殑鐩爣
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public System.Collections.Generic.Dictionary<string, List<BindListAllInfo>> bindTargetsFromMutilfunctionPanelList = new System.Collections.Generic.Dictionary<string, List<BindListAllInfo>>();
+ /// <summary>
/// 鎸夐敭妯″紡锛堢鏈夊姛鑳斤級
/// </summary>
public int panelMode = 65535;
@@ -1533,7 +1538,7 @@
/// 浼犳劅鍣ㄤ娇鑳�
///false-disable true-enable
/// </summary>
- public bool enable;
+ public bool enable= false;
/// <summary>
///浼犳劅鍣ㄨ窛绂�
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 5802128..92b8ced 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -3537,6 +3537,11 @@
/// </summary>
public void ReSave()
{
+ if (Shared.Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ //灞曠ず妯℃澘鏃�,涓嶅厑璁镐繚瀛樻枃浠�(闃叉灞炴�т笂鎶ョ敤鐨�)
+ return;
+ }
Global.WriteFileByBytesByHomeId(FilePath, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
}
#endregion
@@ -3553,7 +3558,7 @@
#if DEBUG
if (flage == true)
{
- if (msg.Contains("DeviceStatusReport") == false)
+ //if (msg.Contains("DeviceStatusReport") == false)
{
System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
}
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 7ba6d03..1d4ae1d 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -678,6 +678,26 @@
/// 341=璇疯緭鍏ユ纭殑鏁板��
/// </summary>
public const int NumTip = 341;
+ /// <summary>
+ /// 342=璇疯緭鍏ユ纭殑娓╁害鍊�
+ /// </summary>
+ public const int TNumTip = 342;
+ /// <summary>
+ /// 343=璇疯緭鍏ユ纭殑婀垮害鍊�
+ /// </summary>
+ public const int HNumTip = 343;
+ /// <summary>
+ /// 344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+ /// </summary>
+ public const int BindRemarkTip1 = 344;
+ /// <summary>
+ /// 345=鐩爣鍚嶇О澶暱
+ /// </summary>
+ public const int BindRemarkTip2 = 345;
+ /// <summary>
+ /// 346=鐭ラ亾浜�
+ /// </summary>
+ public const int Iknown = 346;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -5886,6 +5906,50 @@
/// 浣忓畢杩囨埛
/// </summary>
public const int uTransferOfResidence = 16149;
+ /// <summary>
+ /// 杞Щ浣忓畢鍒板叾浠朎voyo
+ /// </summary>
+ public const int uTransferOfResidenceToOtherEvoyoAccount1 = 16150;
+ /// <summary>
+ /// Home璐﹀彿
+ /// </summary>
+ public const int uTransferOfResidenceToOtherEvoyoAccount2 = 16151;
+ /// <summary>
+ /// 璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+ /// </summary>
+ public const int uThisOperationIsIrreversiblePleaseNote = 16152;
+ /// <summary>
+ /// 1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+ /// </summary>
+ public const int uTheReceiverIsValidAccountForEvoyoHome = 16153;
+ /// <summary>
+ /// 2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+ /// </summary>
+ public const int uTheReceiverAndTheTransferPartyCannotBeTheSameAccount = 16154;
+ /// <summary>
+ /// 3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+ /// </summary>
+ public const int uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled = 16155;
+ /// <summary>
+ /// 杩囨埛璐﹀彿
+ /// </summary>
+ public const int uTransferResidenceAccount = 16156;
+ /// <summary>
+ /// 璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+ /// </summary>
+ public const int uPleaseInputReceiverPhoneOrEmail = 16157;
+ /// <summary>
+ /// 鏌ョ湅
+ /// </summary>
+ public const int uSearch1 = 16158;
+ /// <summary>
+ /// 瀹氭椂鑷姩鍏抽棴
+ /// </summary>
+ public const int uAutomaticTimingOff = 16159;
+ /// <summary>
+ /// 涓嶅叧闂�
+ /// </summary>
+ public const int uNotClose = 16160;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index c71ebf3..c60f196 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -127,8 +127,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\SafetyShortcutControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\SceneCardControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\HomeMainPageForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ModelData\DeviceModelDataLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ModelData\ModelDataCommon.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\SmartSound\Forms\SmartSoundContentForDevice.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\SmartSound\Forms\SmartSoundContentForDeviceChange.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\SmartSound\Forms\SmartSoundControlContentForm.cs" />
@@ -246,6 +244,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorDimmingModeForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorTargetSelectForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorWorkModeMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Relay\RelayNationalBackLightSettionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethod.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethodTip.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonInfo.cs" />
@@ -313,7 +312,8 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomDeviceListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceManagementForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\TransferOfResidenceMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\TransferResidenceByIdForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\TransferResidenceMainForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectAcForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswAddNewForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswEditorForm.cs" />
--
Gitblit v1.8.0